diff --git a/r8.jar b/r8.jar
index 19897a3..8ddd221 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index ee4f13f..85bb2c1 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,10 +1,10 @@
 # compiler: R8
-# compiler_version: 3.3.8-dev
+# compiler_version: 3.3.11-dev
 # compiler_hash: engineering
 # common_typos_disable
 # {"id":"com.android.tools.r8.mapping","version":"2.0"}
-# pg_map_id: 3.3.8-dev
-# pg_map_hash: SHA-256 7b4113a934aabb364e9a0dd31b1df8333a85672879902ef091995d1e048edc4d
+# pg_map_id: 3.3.11-dev
+# pg_map_hash: SHA-256 a350433e5961361fb5d2c0c09f5c50272fe5d0325415e1337df07a674f97f77e
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.g2:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():10:10 -> <clinit>
@@ -124,7 +124,6 @@
     1:1:com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope getScope():48:48 -> getScope
     1:1:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformation():44:44 -> getTransformation
     1:1:java.lang.String getValue():52:52 -> getValue
-com.android.tools.r8.AssertionsConfiguration$1 -> com.android.tools.r8.a:
 com.android.tools.r8.AssertionsConfiguration$AssertionTransformation -> com.android.tools.r8.AssertionsConfiguration$AssertionTransformation:
     com.android.tools.r8.AssertionsConfiguration$AssertionTransformation[] $VALUES -> b
     1:8:void <clinit>():16:23 -> <clinit>
@@ -261,7 +260,6 @@
     473:473:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):155:155 -> parse
     474:474:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):155:155 -> parse
     469:469:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):155:155 -> parse
-com.android.tools.r8.BackportedMethodListCommand$1 -> com.android.tools.r8.b:
 com.android.tools.r8.BackportedMethodListCommand$Builder -> com.android.tools.r8.BackportedMethodListCommand$Builder:
     java.util.List desugaredLibrarySpecificationResources -> c
     com.android.tools.r8.utils.AndroidApp$Builder app -> d
@@ -275,9 +273,9 @@
     3:3:void <init>():188:188 -> <init>
     4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):191:191 -> <init>
     5:18:void <init>(com.android.tools.r8.DiagnosticsHandler):180:193 -> <init>
-    1:1:void error(com.android.tools.r8.Diagnostic):304:304 -> a
-    1:1:void access$200(com.android.tools.r8.BackportedMethodListCommand$Builder,com.android.tools.r8.Diagnostic):177 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:void access$200(com.android.tools.r8.BackportedMethodListCommand$Builder,com.android.tools.r8.Diagnostic):177:177 -> a
+    2:2:void error(com.android.tools.r8.Diagnostic):304:304 -> a
+    2:2:void access$200(com.android.tools.r8.BackportedMethodListCommand$Builder,com.android.tools.r8.Diagnostic):177 -> a
     1:1:com.android.tools.r8.BackportedMethodListCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):218:218 -> addDesugaredLibraryConfiguration
     2:2:com.android.tools.r8.BackportedMethodListCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):225:225 -> addDesugaredLibraryConfiguration
     3:3:com.android.tools.r8.BackportedMethodListCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):224:224 -> addDesugaredLibraryConfiguration
@@ -305,12 +303,12 @@
     1:1:com.android.tools.r8.BackportedMethodListCommand$Builder setOutputPath(java.nio.file.Path):264:264 -> setOutputPath
     1:1:com.android.tools.r8.BackportedMethodListCommand$Builder setPrintHelp(boolean):288:288 -> setPrintHelp
     1:1:com.android.tools.r8.BackportedMethodListCommand$Builder setPrintVersion(boolean):299:299 -> setPrintVersion
-com.android.tools.r8.BackportedMethodListCommand$Builder$1 -> com.android.tools.r8.c:
+com.android.tools.r8.BackportedMethodListCommand$Builder$1 -> com.android.tools.r8.a:
     1:1:void <init>():188:188 -> <init>
-com.android.tools.r8.BackportedMethodListCommand$Builder$2 -> com.android.tools.r8.d:
+com.android.tools.r8.BackportedMethodListCommand$Builder$2 -> com.android.tools.r8.b:
     1:1:void <init>(com.android.tools.r8.BackportedMethodListCommand$Builder,java.nio.file.Path):265:265 -> <init>
     1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):268:269 -> accept
-com.android.tools.r8.BackportedMethodListCommand$Builder$3 -> com.android.tools.r8.e:
+com.android.tools.r8.BackportedMethodListCommand$Builder$3 -> com.android.tools.r8.c:
     1:1:void <init>(com.android.tools.r8.BackportedMethodListCommand$Builder):321:321 -> <init>
     1:1:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):324:324 -> accept
 com.android.tools.r8.BaseCommand -> com.android.tools.r8.BaseCommand:
@@ -388,7 +386,7 @@
     1:1:boolean isPrintVersion():330:330 -> isPrintVersion
     1:2:com.android.tools.r8.BaseCommand$Builder setPrintHelp(boolean):324:325 -> setPrintHelp
     1:2:com.android.tools.r8.BaseCommand$Builder setPrintVersion(boolean):335:336 -> setPrintVersion
-com.android.tools.r8.BaseCommand$InputFileOrigin -> com.android.tools.r8.f:
+com.android.tools.r8.BaseCommand$InputFileOrigin -> com.android.tools.r8.d:
     java.lang.String inputType -> h
     1:2:void <init>(java.lang.String,java.nio.file.Path):75:76 -> <init>
     1:1:java.lang.String part():81:81 -> part
@@ -397,9 +395,9 @@
     3:3:java.lang.String part():81:81 -> part
     4:4:java.lang.String part():81:81 -> part
     5:5:java.lang.String part():81:81 -> part
-com.android.tools.r8.BaseCommand$LibraryInputOrigin -> com.android.tools.r8.g:
+com.android.tools.r8.BaseCommand$LibraryInputOrigin -> com.android.tools.r8.e:
     1:1:void <init>(java.nio.file.Path):95:95 -> <init>
-com.android.tools.r8.BaseCommand$ProgramInputOrigin -> com.android.tools.r8.h:
+com.android.tools.r8.BaseCommand$ProgramInputOrigin -> com.android.tools.r8.f:
     1:1:void <init>(java.nio.file.Path):88:88 -> <init>
 com.android.tools.r8.BaseCompilerCommand -> com.android.tools.r8.BaseCompilerCommand:
     java.util.List outputInspections -> o
@@ -530,11 +528,11 @@
     1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):379:382 -> setProgramConsumer
     1:2:com.android.tools.r8.BaseCompilerCommand$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):332:333 -> setProguardMapConsumer
     1:2:com.android.tools.r8.BaseCompilerCommand$Builder setSourceFileProvider(com.android.tools.r8.SourceFileProvider):549:550 -> setSourceFileProvider
-com.android.tools.r8.BaseCompilerCommand$Builder$1 -> com.android.tools.r8.i:
+com.android.tools.r8.BaseCompilerCommand$Builder$1 -> com.android.tools.r8.g:
     1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):459:459 -> <init>
-com.android.tools.r8.BaseCompilerCommand$Builder$2 -> com.android.tools.r8.j:
+com.android.tools.r8.BaseCompilerCommand$Builder$2 -> com.android.tools.r8.h:
     1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):466:466 -> <init>
-com.android.tools.r8.BaseCompilerCommandParser -> com.android.tools.r8.k:
+com.android.tools.r8.BaseCompilerCommandParser -> com.android.tools.r8.i:
     boolean $assertionsDisabled -> e
     java.lang.Iterable MAP_DIAGNOSTICS_USAGE_MESSAGE -> c
     java.lang.Iterable THREAD_COUNT_USAGE_MESSAGE -> b
@@ -730,82 +728,84 @@
     12:17:void run(java.lang.String[]):134:139 -> a
     12:17:void lambda$main$2(java.lang.String[]):151 -> a
     21:22:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):156:157 -> a
-    23:28: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):171:176 -> a
-    29:29:java.lang.Boolean lambda$run$4(com.android.tools.r8.utils.InternalOptions):196:196 -> a
-    30:32:void lambda$run$5(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):212:214 -> a
-    33:33:void lambda$run$6(java.lang.String):244:244 -> a
-    34:54: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):354:374 -> a
-    55:60: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):371:376 -> a
-    61:61:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> a
-    61:61: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):376 -> a
-    62:81: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):377:396 -> a
-    82:82:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():219:219 -> a
-    82:82: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):396 -> a
-    83:85:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):402:404 -> a
+    23:23:java.lang.Boolean lambda$run$4(com.android.tools.r8.utils.InternalOptions):195:195 -> a
+    24:26:void lambda$run$5(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):211:213 -> a
+    27:27:void lambda$run$6(java.lang.String):243:243 -> 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):353:373 -> a
+    49:54: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):370:375 -> a
+    55:55:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> a
+    55:55: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):375 -> a
+    56: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):376:395 -> a
+    76:76:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():219:219 -> 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):395 -> a
+    77:79:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):401:403 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):123:123 -> b
     1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):161:163 -> c
-    1:6:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):181:186 -> d
+    1:6:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):180:185 -> d
     7:7:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":772,"2":773,"3":774}}
+    772:772:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):185:185 -> d
+    773:773:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):185:185 -> d
+    774:774:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):185:185 -> d
+    192:193:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):185:186 -> d
+    194:194:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":772,"2":773,"3":774}}
     772:772:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:186 -> d
     773:773:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:186 -> d
     774:774:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:186 -> d
-    193:194:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:187 -> d
-    195:195:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
+    380:381:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:187 -> d
+    382:382:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":772,"2":773,"3":774}}
     772:772:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:187 -> d
     773:773:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:187 -> d
     774:774:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:187 -> d
-    382:383:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:188 -> d
-    384:384:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":772,"2":773,"3":774}}
-    772:772:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:188 -> d
-    773:773:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:188 -> d
-    774:774:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:188 -> d
-    572:580:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:196 -> d
-    581:581:boolean com.android.tools.r8.utils.AssertionUtils.forTesting(com.android.tools.r8.utils.InternalOptions,java.util.function.Supplier):17:17 -> d
-    581:581:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):196 -> d
-    582:596:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):196:210 -> d
-    597:653:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):209:265 -> d
+    569:577:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:195 -> d
+    578:578:boolean com.android.tools.r8.utils.AssertionUtils.forTesting(com.android.tools.r8.utils.InternalOptions,java.util.function.Supplier):17:17 -> d
+    578:578:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):195 -> d
+    579:579:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):195:195 -> d
+    580:584: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):171:175 -> d
+    580:584:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):197 -> d
+    585:596:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):198:209 -> d
+    597:653:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):208:264 -> d
     654:657: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):29:32 -> d
-    654:657:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):265 -> d
-    658:658:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):266:266 -> d
+    654:657:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):264 -> d
+    658:658:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):265:265 -> d
     659:664: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):25:30 -> d
-    659:664:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):266 -> d
-    665:665:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> d
-    665:665:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):268 -> d
-    666:666:void finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.naming.NamingLens):340:340 -> d
-    666:666:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):269 -> d
-    667:667:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):270:270 -> d
-    668:668:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():492:492 -> d
-    668:668:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):271 -> d
-    669:690:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):271:292 -> d
-    691:703:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):286:298 -> d
-    704:708:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):295:299 -> d
-    709:710:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):275:276 -> d
+    659:664:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):265 -> d
+    665:665:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> d
+    665:665:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):267 -> d
+    666:666:void finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.naming.NamingLens):339:339 -> d
+    666:666:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):268 -> d
+    667:667:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):269:269 -> d
+    668:668:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():493:493 -> d
+    668:668:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):270 -> d
+    669:690:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):270:291 -> d
+    691:703:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):285:297 -> d
+    704:708:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):294:298 -> d
+    709:710:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):274:275 -> d
     711:711:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> d
-    711:711:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276 -> d
-    712:744:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):277:309 -> d
-    745:747:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):308:310 -> d
-    748:748:void finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.naming.NamingLens):340:340 -> d
-    748:748:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):312 -> d
-    749:764:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):314:329 -> d
+    711:711:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):275 -> d
+    712:744:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276:308 -> d
+    745:747:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):307:309 -> d
+    748:748:void finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.naming.NamingLens):339:339 -> d
+    748:748:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):311 -> d
+    749:764:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):313:328 -> d
     765:765:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> d
-    765:765:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):324 -> d
-    766:771:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):324:329 -> d
+    765:765:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):323 -> d
+    766:771:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):323:328 -> d
     1:4:void main(java.lang.String[]):148:151 -> main
     5:5:void main(java.lang.String[]):149:149 -> main
     1:5:void run(com.android.tools.r8.D8Command):96:100 -> run
     6:6:void run(com.android.tools.r8.D8Command):99:99 -> run
     7:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):118:121 -> run
     11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):120:120 -> run
-com.android.tools.r8.D8$ConvertedCfFiles -> com.android.tools.r8.l:
+com.android.tools.r8.D8$ConvertedCfFiles -> com.android.tools.r8.j:
     java.util.List resources -> a
-    1:3:void <init>():419:421 -> <init>
-    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):427:429 -> accept
-    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):428:428 -> accept
-    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):427:427 -> accept
-    1:1:java.util.Collection getProgramResources():434:434 -> getProgramResources
+    1:3:void <init>():418:420 -> <init>
+    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):426:428 -> accept
+    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):427:427 -> accept
+    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):426:426 -> accept
+    1:1:java.util.Collection getProgramResources():433:433 -> getProgramResources
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
     com.android.tools.r8.graph.DexItemFactory factory -> C
     boolean skipDump -> y
@@ -825,23 +825,22 @@
     30:40:void <init>(boolean,boolean):435:445 -> <init>
     1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):349:349 -> a
     1:4:com.android.tools.r8.utils.InternalOptions getInternalOptions():450:453 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> b
     5:5:com.android.tools.r8.utils.InternalOptions getInternalOptions():454 -> b
     6:14:com.android.tools.r8.utils.InternalOptions getInternalOptions():455:463 -> b
-    15:73:com.android.tools.r8.utils.InternalOptions getInternalOptions():462:520 -> b
-    74:74:com.android.tools.r8.DumpOptions dumpOptions():527:527 -> b
-    74:74:com.android.tools.r8.utils.InternalOptions getInternalOptions():521 -> b
-    75:79:void com.android.tools.r8.BaseCompilerCommand.dumpBaseCommandOptions(com.android.tools.r8.DumpOptions$Builder):127:131 -> b
-    75:79:com.android.tools.r8.DumpOptions dumpOptions():528 -> b
-    75:79:com.android.tools.r8.utils.InternalOptions getInternalOptions():521 -> b
-    80:84:com.android.tools.r8.DumpOptions dumpOptions():529:533 -> b
-    80:84:com.android.tools.r8.utils.InternalOptions getInternalOptions():521 -> b
-    85:85:com.android.tools.r8.utils.InternalOptions getInternalOptions():521:521 -> b
+    15:72:com.android.tools.r8.utils.InternalOptions getInternalOptions():462:519 -> b
+    73:73:com.android.tools.r8.DumpOptions dumpOptions():526:526 -> b
+    73:73:com.android.tools.r8.utils.InternalOptions getInternalOptions():520 -> b
+    74:78:void com.android.tools.r8.BaseCompilerCommand.dumpBaseCommandOptions(com.android.tools.r8.DumpOptions$Builder):127:131 -> b
+    74:78:com.android.tools.r8.DumpOptions dumpOptions():527 -> b
+    74:78:com.android.tools.r8.utils.InternalOptions getInternalOptions():520 -> b
+    79:83:com.android.tools.r8.DumpOptions dumpOptions():528:532 -> b
+    79:83:com.android.tools.r8.utils.InternalOptions getInternalOptions():520 -> b
+    84:84:com.android.tools.r8.utils.InternalOptions getInternalOptions():520:520 -> b
     1:1:com.android.tools.r8.D8Command$Builder builder():340:340 -> builder
     2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):344:344 -> builder
     1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):362:362 -> parse
     2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):376:376 -> parse
-com.android.tools.r8.D8Command$1 -> com.android.tools.r8.m:
 com.android.tools.r8.D8Command$Builder -> com.android.tools.r8.D8Command$Builder:
     boolean intermediate -> y
     java.util.List mainDexRules -> E
@@ -899,12 +898,12 @@
     1:1:com.android.tools.r8.D8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):161:161 -> setDesugaredLibraryKeepRuleConsumer
     1:1:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):150:150 -> setIntermediate
     1:1:com.android.tools.r8.D8Command$Builder setProguardInputMapFile(java.nio.file.Path):140:140 -> setProguardInputMapFile
-com.android.tools.r8.D8Command$DefaultD8DiagnosticsHandler -> com.android.tools.r8.n:
+com.android.tools.r8.D8Command$DefaultD8DiagnosticsHandler -> com.android.tools.r8.k:
     1:1:void <init>():59:59 -> <init>
     2:2:void <init>(com.android.tools.r8.D8Command$1):59:59 -> <init>
     1:6:void error(com.android.tools.r8.Diagnostic):63:68 -> error
     7:13:void error(com.android.tools.r8.Diagnostic):66:72 -> error
-com.android.tools.r8.D8CommandParser -> com.android.tools.r8.q:
+com.android.tools.r8.D8CommandParser -> com.android.tools.r8.m:
     java.lang.String USAGE_MESSAGE -> g
     java.util.Set OPTIONS_WITH_PARAMETER -> f
     1:86:void <clinit>():27:112 -> <clinit>
@@ -918,27 +917,26 @@
     255:255:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable[]):472:472 -> <clinit>
     255:255:void <clinit>():115 -> <clinit>
     256:256:void <clinit>():113:113 -> <clinit>
-    1:1:void <init>():25:25 -> <init>
     1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):164:164 -> a
     2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
     3:12:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):187:196 -> a
     13:13:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1072,"2":1073,"3":1074}}
-    1072:1072:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:196 -> a
-    1073:1073:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:196 -> a
-    1074:1074:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:196 -> a
-    209:209:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:196 -> a
-    210:210:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1075,"2":1076,"3":1077}}
     1075:1075:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:196 -> a
     1076:1076:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:196 -> a
     1077:1077:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:196 -> a
+    209:209:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:196 -> a
+    210:210:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1078,"2":1079,"3":1080}}
+    1078:1078:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:196 -> a
+    1079:1079:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:196 -> a
+    1080:1080:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:196 -> a
     406:441:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):196:231 -> a
     442:442:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1112,"2":1113,"3":1114}}
-    1112:1112:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):231:231 -> a
-    1113:1113:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):231:231 -> a
-    1114:1114:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):231:231 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1115,"2":1116,"3":1117}}
+    1115:1115:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):231:231 -> a
+    1116:1116:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):231:231 -> a
+    1117:1117:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):231:231 -> a
     675:675:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):233:233 -> a
     676:688:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):231:243 -> a
     689:692:boolean isArchive(java.nio.file.Path):45:48 -> a
@@ -947,19 +945,17 @@
     697:700:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):249:252 -> a
     701:755:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):244:298 -> a
     756:756:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1181,"2":1182,"3":1183,"4":1184,"5":1185}}
-    1181:1181:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):298:298 -> a
-    1182:1182:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):298:298 -> a
-    1183:1183:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):298:298 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1184,"2":1185,"3":1186,"4":1187,"5":1188}}
     1184:1184:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):298:298 -> a
     1185:1185:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):298:298 -> a
-    1054:1058:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):298:302 -> a
-    1059:1059:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():68:68 -> a
-    1059:1059:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):305 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1060:1071:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):306:317 -> a
-com.android.tools.r8.D8CommandParser$1 -> com.android.tools.r8.o:
-com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider -> com.android.tools.r8.p:
+    1186:1186:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):298:298 -> a
+    1187:1187:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):298:298 -> a
+    1188:1188:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):298:298 -> a
+    1054:1061:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):298:305 -> a
+    1062:1062:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():68:68 -> a
+    1062:1062:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):305 -> a
+    1063:1074:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):306:317 -> a
+com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider -> com.android.tools.r8.l:
     java.util.List providers -> b
     java.util.Set descriptors -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.D8CommandParser$1):51:51 -> <init>
@@ -969,7 +965,7 @@
     2:2:com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder builder():82:82 -> a
     1:1:java.util.Set getClassDescriptors():87:87 -> getClassDescriptors
     1:3:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):94:96 -> getProgramResource
-com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder -> com.android.tools.r8.p$a:
+com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder -> com.android.tools.r8.l$a:
     boolean empty -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder builder -> a
     1:4:void <init>():52:55 -> <init>
@@ -979,8 +975,7 @@
     1:2:com.android.tools.r8.DataDirectoryResource fromFile(java.nio.file.Path,java.nio.file.Path):23:24 -> fromFile
     1:1:com.android.tools.r8.DataDirectoryResource fromName(java.lang.String,com.android.tools.r8.origin.Origin):19:19 -> fromName
     1:1:com.android.tools.r8.DataDirectoryResource fromZip(java.util.zip.ZipFile,java.util.zip.ZipEntry):28:28 -> fromZip
-com.android.tools.r8.DataDirectoryResource$1 -> com.android.tools.r8.r:
-com.android.tools.r8.DataDirectoryResource$LocalDataDirectoryResource -> com.android.tools.r8.s:
+com.android.tools.r8.DataDirectoryResource$LocalDataDirectoryResource -> com.android.tools.r8.n:
     java.io.File file -> a
     java.lang.String relativePath -> b
     boolean $assertionsDisabled -> c
@@ -989,7 +984,7 @@
     2:6:void <init>(java.io.File,java.lang.String):79:83 -> <init>
     1:1:java.lang.String getName():93:93 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():88:88 -> getOrigin
-com.android.tools.r8.DataDirectoryResource$NamedDataDirectoryResource -> com.android.tools.r8.t:
+com.android.tools.r8.DataDirectoryResource$NamedDataDirectoryResource -> com.android.tools.r8.o:
     com.android.tools.r8.origin.Origin origin -> b
     java.lang.String name -> a
     boolean $assertionsDisabled -> c
@@ -998,7 +993,7 @@
     2:6:void <init>(java.lang.String,com.android.tools.r8.origin.Origin):35:39 -> <init>
     1:1:java.lang.String getName():49:49 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():44:44 -> getOrigin
-com.android.tools.r8.DataDirectoryResource$ZipDataDirectoryResource -> com.android.tools.r8.u:
+com.android.tools.r8.DataDirectoryResource$ZipDataDirectoryResource -> com.android.tools.r8.p:
     java.util.zip.ZipFile zip -> a
     boolean $assertionsDisabled -> c
     java.util.zip.ZipEntry entry -> b
@@ -1013,8 +1008,7 @@
     1:6:com.android.tools.r8.DataEntryResource fromString(java.lang.String,com.android.tools.r8.origin.Origin,java.lang.String[]):30:35 -> fromString
     1:1:com.android.tools.r8.DataEntryResource fromZip(java.util.zip.ZipFile,java.util.zip.ZipEntry):44:44 -> fromZip
     1:1:com.android.tools.r8.DataEntryResource withName(java.lang.String):48:48 -> withName
-com.android.tools.r8.DataEntryResource$1 -> com.android.tools.r8.v:
-com.android.tools.r8.DataEntryResource$ByteDataEntryResource -> com.android.tools.r8.internal.xe:
+com.android.tools.r8.DataEntryResource$ByteDataEntryResource -> com.android.tools.r8.internal.ce:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> c
     java.lang.String name -> b
@@ -1022,7 +1016,7 @@
     1:1:java.io.InputStream getByteStream():65:65 -> getByteStream
     1:1:java.lang.String getName():70:70 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():75:75 -> getOrigin
-com.android.tools.r8.DataEntryResource$LocalDataEntryResource -> com.android.tools.r8.w:
+com.android.tools.r8.DataEntryResource$LocalDataEntryResource -> com.android.tools.r8.q:
     java.io.File file -> a
     java.lang.String relativePath -> b
     boolean $assertionsDisabled -> c
@@ -1032,14 +1026,14 @@
     1:3:java.io.InputStream getByteStream():134:136 -> getByteStream
     1:1:java.lang.String getName():128:128 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():123:123 -> getOrigin
-com.android.tools.r8.DataEntryResource$NestedDataEntryResource -> com.android.tools.r8.internal.ye:
+com.android.tools.r8.DataEntryResource$NestedDataEntryResource -> com.android.tools.r8.internal.de:
     com.android.tools.r8.DataEntryResource resource -> b
     java.lang.String name -> a
     1:4:void <init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.DataEntryResource):150:153 -> <init>
     1:1:java.io.InputStream getByteStream():158:158 -> getByteStream
     1:1:java.lang.String getName():163:163 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():168:168 -> getOrigin
-com.android.tools.r8.DataEntryResource$ZipDataEntryResource -> com.android.tools.r8.x:
+com.android.tools.r8.DataEntryResource$ZipDataEntryResource -> com.android.tools.r8.r:
     java.util.zip.ZipFile zip -> a
     boolean $assertionsDisabled -> c
     java.util.zip.ZipEntry entry -> b
@@ -1049,35 +1043,34 @@
     1:3:java.io.InputStream getByteStream():103:105 -> getByteStream
     1:1:java.lang.String getName():97:97 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():92:92 -> getOrigin
-com.android.tools.r8.DexFileMergerHelper -> com.android.tools.r8.y:
+com.android.tools.r8.DexFileMergerHelper -> com.android.tools.r8.s:
     java.util.Map inputOrdering -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
     1:2:void <init>(java.util.Map):35:36 -> <init>
-    1:2:void run(com.android.tools.r8.D8Command,java.lang.Boolean,java.util.Map):65:66 -> a
-    3:3:void lambda$run$0(com.android.tools.r8.D8Command,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):68:68 -> a
-    4:16:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):77:89 -> a
-    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):134:134 -> 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:42:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):96:119 -> a
-    43:43:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
-    43:43:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):114 -> a
-    44:49:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):114:119 -> a
-    50:50:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    50:50:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    51:51:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:41 -> a
-    52:52:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    52:52:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    53:70:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42:59 -> a
-    71:71:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":129,"2":130,"3":131}}
-    129:129:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):46:46 -> a
-    130:130:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):46:46 -> a
-    131:131:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):47:47 -> a
-    120:128:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):49:57 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:41 -> a
+    2:2:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41 -> a
+    3:4:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:42 -> a
+    5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    5:5:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42 -> a
+    6:23:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42:59 -> a
+    24:24:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":82,"2":83,"3":84}}
+    82:82:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):46:46 -> a
+    83:83:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):46:46 -> a
+    84:84:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):47:47 -> a
+    73:81:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):49:57 -> a
+    85:86:void run(com.android.tools.r8.D8Command,java.lang.Boolean,java.util.Map):65:66 -> a
+    87:87:void lambda$run$0(com.android.tools.r8.D8Command,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):68:68 -> a
+    88:100:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):77:89 -> a
+    101:101: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):134:134 -> a
+    101:101:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):90 -> a
+    102:102:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):97:97 -> a
+    103:126:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):96:119 -> a
+    127:127:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
+    127:127:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):114 -> a
+    128:133:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):114:119 -> 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
@@ -1251,7 +1244,7 @@
     1:2:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):100:101 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):107:108 -> finished
     1:1:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():94:94 -> getDataResourceConsumer
-com.android.tools.r8.DexSegments -> com.android.tools.r8.A:
+com.android.tools.r8.DexSegments -> com.android.tools.r8.t:
     1:7:java.util.Map run(com.android.tools.r8.DexSegments$Command):107:113 -> a
     8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.<init>():175:175 -> a
     8:8:java.util.Map run(com.android.tools.r8.DexSegments$Command):113 -> a
@@ -1260,8 +1253,7 @@
     46:57:java.util.Map run(com.android.tools.r8.DexSegments$Command):138:149 -> a
     58:58:com.android.tools.r8.DexSegments$SegmentInfo lambda$run$1(java.lang.Integer):136:136 -> a
     1:1:com.android.tools.r8.DexSegments$SegmentInfo lambda$run$2(java.lang.Integer):144:144 -> b
-com.android.tools.r8.DexSegments$1 -> com.android.tools.r8.z:
-com.android.tools.r8.DexSegments$Command -> com.android.tools.r8.A$a:
+com.android.tools.r8.DexSegments$Command -> com.android.tools.r8.t$a:
     java.lang.String USAGE_MESSAGE -> e
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DexSegments$1):23:23 -> <init>
@@ -1270,12 +1262,12 @@
     4:4:void <init>(boolean):81:81 -> <init>
     1:1:com.android.tools.r8.utils.InternalOptions getInternalOptions():86:86 -> b
     1:1:com.android.tools.r8.DexSegments$Command$Builder builder():50:50 -> c
-com.android.tools.r8.DexSegments$Command$Builder -> com.android.tools.r8.A$a$a:
+com.android.tools.r8.DexSegments$Command$Builder -> com.android.tools.r8.t$a$a:
     1:1:void <init>():25:25 -> <init>
     1:4:com.android.tools.r8.DexSegments$Command makeCommand():36:39 -> c
     1:4:com.android.tools.r8.BaseCommand makeCommand():25 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-com.android.tools.r8.DexSegments$SegmentInfo -> com.android.tools.r8.A$b:
+com.android.tools.r8.DexSegments$SegmentInfo -> com.android.tools.r8.t$b:
     int size -> b
     int items -> a
     1:3:void <init>():157:159 -> <init>
@@ -1326,10 +1318,9 @@
     2:2:java.util.Set getClassDescriptors():38:38 -> getClassDescriptors
     1:6:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):63:68 -> getProgramResource
     1:1:java.nio.file.Path getRoot():73:73 -> getRoot
-com.android.tools.r8.Disassemble -> com.android.tools.r8.C:
+com.android.tools.r8.Disassemble -> com.android.tools.r8.u:
     1:19:void disassemble(com.android.tools.r8.Disassemble$DisassembleCommand):238:256 -> a
-com.android.tools.r8.Disassemble$1 -> com.android.tools.r8.B:
-com.android.tools.r8.Disassemble$DisassembleCommand -> com.android.tools.r8.C$a:
+com.android.tools.r8.Disassemble$DisassembleCommand -> com.android.tools.r8.u$a:
     java.nio.file.Path outputPath -> e
     boolean useIr -> i
     boolean noCode -> j
@@ -1348,7 +1339,7 @@
     1:1:boolean noCode():209:209 -> e
     1:1:boolean useIr():205:205 -> f
     1:1:boolean useSmali():201:201 -> g
-com.android.tools.r8.Disassemble$DisassembleCommand$Builder -> com.android.tools.r8.C$a$a:
+com.android.tools.r8.Disassemble$DisassembleCommand$Builder -> com.android.tools.r8.u$a$a:
     java.nio.file.Path proguardMapFile -> g
     java.nio.file.Path outputPath -> f
     boolean useSmali -> h
@@ -1366,7 +1357,7 @@
     9:9:com.android.tools.r8.BaseCommand makeCommand():31 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
     1:1:com.android.tools.r8.Disassemble$DisassembleCommand$Builder setProguardMapFile(java.nio.file.Path):46:46 -> d
-com.android.tools.r8.DumpOptions -> com.android.tools.r8.E:
+com.android.tools.r8.DumpOptions -> com.android.tools.r8.v:
     java.util.Optional intermediate -> g
     java.util.Optional includeDataResources -> h
     java.util.List mainDexKeepRules -> o
@@ -1419,8 +1410,7 @@
     1:1:java.util.List getMainDexKeepRules():165:165 -> e
     1:1:java.lang.String getParsedProguardConfiguration():157:157 -> f
     1:1:boolean hasMainDexKeepRules():161:161 -> g
-com.android.tools.r8.DumpOptions$1 -> com.android.tools.r8.D:
-com.android.tools.r8.DumpOptions$Builder -> com.android.tools.r8.E$a:
+com.android.tools.r8.DumpOptions$Builder -> com.android.tools.r8.v$a:
     java.util.Optional intermediate -> g
     java.util.Optional includeDataResources -> h
     java.util.List mainDexKeepRules -> o
@@ -1560,11 +1550,11 @@
     615:615:void main(java.lang.String[]):172:172 -> main
     616:616:void main(java.lang.String[]):172:172 -> main
     613:613:void main(java.lang.String[]):172:172 -> main
-com.android.tools.r8.ExtractMarker$VdexOrigin -> com.android.tools.r8.internal.rj:
+com.android.tools.r8.ExtractMarker$VdexOrigin -> com.android.tools.r8.internal.Zi:
     int index -> f
     1:2:void <init>(com.android.tools.r8.origin.Origin,int):35:36 -> <init>
     1:1:java.lang.String part():41:41 -> part
-com.android.tools.r8.ExtractMarkerCommand -> com.android.tools.r8.H:
+com.android.tools.r8.ExtractMarkerCommand -> com.android.tools.r8.x:
     java.lang.String USAGE_MESSAGE -> g
     java.util.List programFiles -> f
     boolean csv -> e
@@ -1583,8 +1573,7 @@
     1:1:boolean getSummary():153:153 -> d
     1:1:boolean getVerbose():149:149 -> e
     1:1:boolean isPrintHelp():137:137 -> f
-com.android.tools.r8.ExtractMarkerCommand$1 -> com.android.tools.r8.F:
-com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.G:
+com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.w:
     java.util.List programFiles -> f
     boolean csv -> e
     boolean printHelp -> a
@@ -1612,9 +1601,9 @@
     2:4:void <init>(com.android.tools.r8.ProgramConsumer,java.util.List):53:55 -> <init>
     1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():67:67 -> getProgramConsumer
     1:1:java.util.List getProgramResourceProviders():63:63 -> getProgramResourceProviders
-com.android.tools.r8.FeatureSplit$1 -> com.android.tools.r8.I:
+com.android.tools.r8.FeatureSplit$1 -> com.android.tools.r8.y:
     1:1:void <init>(com.android.tools.r8.ProgramConsumer,java.util.List):34:34 -> <init>
-com.android.tools.r8.FeatureSplit$2 -> com.android.tools.r8.J:
+com.android.tools.r8.FeatureSplit$2 -> com.android.tools.r8.z:
     1:1:void <init>(com.android.tools.r8.ProgramConsumer,java.util.List):42:42 -> <init>
 com.android.tools.r8.FeatureSplit$Builder -> com.android.tools.r8.FeatureSplit$Builder:
     java.util.List programResourceProviders -> b
@@ -1626,7 +1615,7 @@
     1:1:com.android.tools.r8.FeatureSplit$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):108:108 -> addProgramResourceProvider
     1:1:com.android.tools.r8.FeatureSplit build():114:114 -> build
     1:1:com.android.tools.r8.FeatureSplit$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):98:98 -> setProgramConsumer
-com.android.tools.r8.GenerateLintFiles -> com.android.tools.r8.P:
+com.android.tools.r8.GenerateLintFiles -> com.android.tools.r8.E:
     java.nio.file.Path desugaredLibraryImplementation -> e
     java.util.Set parallelMethods -> g
     com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> d
@@ -1663,73 +1652,74 @@
     66:84:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):212:230 -> a
     85:85:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DirectMappedDexApplication.programDefinitionFor(com.android.tools.r8.graph.DexType):80:80 -> a
     85:85:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):230 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    86:86:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):235:235 -> a
-    87:87:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> a
-    87:87:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):236 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    88:97:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):240:249 -> a
-    98:98:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):232:232 -> a
-    99:99:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":385,"2":386,"3":387}}
-    385:385:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):232:232 -> a
+    86:87:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):235:236 -> a
+    88:88:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> a
+    88:88:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):236 -> a
+    89:98:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):240:249 -> a
+    99:99:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):232:232 -> a
+    100:100:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":386,"2":387,"3":388}}
     386:386:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):232:232 -> a
     387:387:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):232:232 -> a
-    331:384:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):232:285 -> a
-    388:388:java.util.List lambda$collectSupportedMethods$0(com.android.tools.r8.graph.DexClass):243:243 -> a
-    389:389:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):296:296 -> a
-    390:390:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":693,"2":694,"3":695}}
-    693:693:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):296:296 -> a
+    388:388:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):232:232 -> a
+    332:385:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):232:285 -> a
+    389:389:java.util.List lambda$collectSupportedMethods$0(com.android.tools.r8.graph.DexClass):243:243 -> a
+    390:390:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):296:296 -> a
+    391:391:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":694,"2":695,"3":696}}
     694:694:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):296:296 -> a
     695:695:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):296:296 -> a
-    686:688:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):296:298 -> a
-    689:689:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":696,"2":697,"3":698}}
-    696:696:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):290:290 -> a
-    696:696:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):301 -> a
+    696:696:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):296:296 -> a
+    687:689:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):296:298 -> a
+    690:690:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":697,"2":698,"3":699}}
     697:697:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):290:290 -> a
     697:697:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):301 -> a
     698:698:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):290:290 -> a
     698:698:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):301 -> a
-    690:690:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):290:290 -> a
-    690:690:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):301 -> a
-    691:691:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):301:301 -> a
-    692:692:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):298:298 -> a
-    699:728:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):311:340 -> a
-    729:744:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):339:354 -> a
-    745:757:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):316:328 -> a
-    758:758:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
-    758:758:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):328 -> a
-    759:759:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):328:328 -> a
-    760:770:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):324:334 -> a
-    771:784:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):362:375 -> a
-    785:785:boolean lambda$generateLintFiles$4(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):372:372 -> a
-    786:786:void run(int):390:390 -> a
-    787:787:void run(int):389:389 -> a
-    788:788:boolean lambda$run$5(com.android.tools.r8.utils.AndroidApiLevel):391:391 -> a
-    789:794:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):393:398 -> a
-    795:795:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):454:454 -> a
-    795:795:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$300(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):432 -> a
-    795:795:void lambda$generateClassHTML$8(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):745 -> a
+    699:699:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):290:290 -> a
+    699:699:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):301 -> a
+    691:691:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):290:290 -> a
+    691:691:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):301 -> a
+    692:692:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):301:301 -> a
+    693:693:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):298:298 -> a
+    700:729:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):311:340 -> a
+    730:745:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):339:354 -> a
+    746:758:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):316:328 -> a
+    759:759:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
+    759:759:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):328 -> a
+    760:760:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):328:328 -> a
+    761:771:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):324:334 -> a
+    772:785:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):362:375 -> a
+    786:786:boolean lambda$generateLintFiles$4(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):372:372 -> a
+    787:787:void run(int):390:390 -> a
+    788:788:void run(int):389:389 -> a
+    789:789:boolean lambda$run$5(com.android.tools.r8.utils.AndroidApiLevel):391:391 -> a
+    790:795:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):393:398 -> a
     796:810:void generateClassHTML(java.io.PrintStream,com.android.tools.r8.graph.DexClass,boolean,java.util.function.Predicate,java.util.function.Predicate):740:754 -> a
     811:811:boolean lambda$generateClassHTML$7(com.android.tools.r8.graph.DexEncodedField):743:743 -> a
-    812:813:boolean lambda$generateClassHTML$9(com.android.tools.r8.graph.DexEncodedMethod):750:751 -> a
-    814:814:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):753:753 -> a
-    815:815:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):432:432 -> a
-    815:815:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):753 -> a
-    816:820:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addMethod(com.android.tools.r8.graph.DexEncodedMethod):459:463 -> a
-    816:820:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):432 -> a
-    816:820:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):753 -> a
-    821:832:void generateDesugaredLibraryApisDocumetation():758:769 -> a
-    833:833:void lambda$generateDesugaredLibraryApisDocumetation$15(java.io.PrintStream,com.android.tools.r8.graph.DexClass):763:763 -> a
-    834:834:boolean lambda$generateDesugaredLibraryApisDocumetation$16(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):767:767 -> a
-    835:835:void lambda$generateDesugaredLibraryApisDocumetation$20(java.io.PrintStream,com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):771:771 -> a
-    836:836:boolean lambda$generateDesugaredLibraryApisDocumetation$19(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):776:776 -> a
-    837:838:void main(java.lang.String[]):780:781 -> a
-    839:843:void run():380:384 -> a
-    839:843:void main(java.lang.String[]):781 -> a
-    844:849:void main(java.lang.String[]):784:789 -> a
+    812:812:void lambda$generateClassHTML$8(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):745:745 -> a
+    813:813:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$300(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):432:432 -> a
+    813:813:void lambda$generateClassHTML$8(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):745 -> a
+    814:814:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):454:454 -> a
+    814:814:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$300(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):432 -> a
+    814:814:void lambda$generateClassHTML$8(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):745 -> a
+    815:816:boolean lambda$generateClassHTML$9(com.android.tools.r8.graph.DexEncodedMethod):750:751 -> a
+    817:817:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):753:753 -> a
+    818:818:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):432:432 -> a
+    818:818:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):753 -> a
+    819:823:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addMethod(com.android.tools.r8.graph.DexEncodedMethod):459:463 -> a
+    819:823:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):432 -> a
+    819:823:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):753 -> a
+    824:835:void generateDesugaredLibraryApisDocumetation():758:769 -> a
+    836:836:void lambda$generateDesugaredLibraryApisDocumetation$15(java.io.PrintStream,com.android.tools.r8.graph.DexClass):763:763 -> a
+    837:837:boolean lambda$generateDesugaredLibraryApisDocumetation$16(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):767:767 -> a
+    838:838:void lambda$generateDesugaredLibraryApisDocumetation$20(java.io.PrintStream,com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):771:771 -> a
+    839:839:boolean lambda$generateDesugaredLibraryApisDocumetation$19(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):776:776 -> a
+    840:841:void main(java.lang.String[]):780:781 -> a
+    842:846:void run():380:384 -> a
+    842:846:void main(java.lang.String[]):781 -> a
+    847:852:void main(java.lang.String[]):784:789 -> a
     boolean lambda$generateDesugaredLibraryApisDocumetation$11(com.android.tools.r8.graph.DexEncodedMethod) -> b
     boolean lambda$generateDesugaredLibraryApisDocumetation$13(com.android.tools.r8.graph.DexEncodedField) -> b
     1:1:java.util.List lambda$collectSupportedMethods$1(com.android.tools.r8.graph.DexClass):265:265 -> b
@@ -1738,8 +1728,7 @@
     1:1:java.util.List lambda$collectSupportedMethods$2(com.android.tools.r8.graph.DexClass):279:279 -> c
     1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$12(com.android.tools.r8.graph.DexClass):762:762 -> d
     1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$17(com.android.tools.r8.graph.DexClass):768:768 -> e
-com.android.tools.r8.GenerateLintFiles$1 -> com.android.tools.r8.K:
-com.android.tools.r8.GenerateLintFiles$HTMLBuilder -> com.android.tools.r8.L:
+com.android.tools.r8.GenerateLintFiles$HTMLBuilder -> com.android.tools.r8.A:
     java.lang.String indent -> d
     1:2:void <init>():609:610 -> <init>
     3:3:void <init>(com.android.tools.r8.GenerateLintFiles$1):609:609 -> <init>
@@ -1791,7 +1780,7 @@
     8:8:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):410:410 -> b
     8:8:void increaseIndent():614 -> b
     8:8:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):639 -> b
-com.android.tools.r8.GenerateLintFiles$HTMLSourceBuilder -> com.android.tools.r8.M:
+com.android.tools.r8.GenerateLintFiles$HTMLSourceBuilder -> com.android.tools.r8.B:
     java.util.Set parallelMethods -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():650:650 -> <clinit>
@@ -2024,7 +2013,7 @@
     141:141:java.lang.String toString():729:729 -> toString
     142:142:java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.toString():428:428 -> toString
     142:142:java.lang.String toString():730 -> toString
-com.android.tools.r8.GenerateLintFiles$SourceBuilder -> com.android.tools.r8.N:
+com.android.tools.r8.GenerateLintFiles$SourceBuilder -> com.android.tools.r8.C:
     java.util.List fields -> b
     java.lang.String packageName -> f
     java.util.List methods -> d
@@ -2042,14 +2031,14 @@
     27:36:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):550:559 -> a
     37:42:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):558:563 -> a
     43:55:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):562:574 -> a
-com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent -> com.android.tools.r8.O:
+com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent -> com.android.tools.r8.D:
     java.lang.StringBuilder builder -> b
     java.lang.String NL -> a
     java.lang.String indent -> c
     1:1:void <init>():407:407 -> <init>
     2:4:void <init>():403:405 -> <init>
     1:1:java.lang.String toString():428:428 -> toString
-com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.internal.Il:
+com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.internal.ml:
     java.util.Map supportedMethods -> b
     java.util.Set classesWithAllMethodsSupported -> a
     1:3:void <init>(java.util.Set,java.util.Map):200:202 -> <init>
@@ -2098,7 +2087,7 @@
     33:33:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):64 -> traceMainDex
     34:34:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):37:37 -> traceMainDex
     34:34:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):64 -> traceMainDex
-com.android.tools.r8.GenerateMainDexList$1 -> com.android.tools.r8.Q:
+com.android.tools.r8.GenerateMainDexList$1 -> com.android.tools.r8.F:
     java.util.List val$result -> b
     1:1:void <init>(com.android.tools.r8.StringConsumer,java.util.List):173:173 -> <init>
     1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):176:177 -> accept
@@ -2137,14 +2126,13 @@
     30:30:com.android.tools.r8.GenerateMainDexListCommand$Builder parse(java.lang.String[]):154 -> parse
     22:25:void parse(java.lang.String[],com.android.tools.r8.GenerateMainDexListCommand$Builder):185:188 -> parse
     22:25:com.android.tools.r8.GenerateMainDexListCommand$Builder parse(java.lang.String[]):154 -> parse
-com.android.tools.r8.GenerateMainDexListCommand$1 -> com.android.tools.r8.S:
 com.android.tools.r8.GenerateMainDexListCommand$Builder -> com.android.tools.r8.GenerateMainDexListCommand$Builder:
     com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> i
     com.android.tools.r8.graph.DexItemFactory factory -> f
     com.android.tools.r8.StringConsumer mainDexListConsumer -> h
     java.util.List mainDexRules -> g
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.GenerateMainDexListCommand$1):36:36 -> <init>
-    2:2:void <init>(com.android.tools.r8.GenerateMainDexListCommand$1):36:36 -> <init>
+    1:1:void <init>(com.android.tools.r8.GenerateMainDexListCommand$1):36:36 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.GenerateMainDexListCommand$1):36:36 -> <init>
     3:3:void <init>():43:43 -> <init>
     4:7:void <init>():38:41 -> <init>
     8:8:void <init>(com.android.tools.r8.DiagnosticsHandler):47:47 -> <init>
@@ -2168,7 +2156,7 @@
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):126:126 -> setMainDexKeptGraphConsumer
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):101:101 -> setMainDexListConsumer
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListOutputPath(java.nio.file.Path):95:95 -> setMainDexListOutputPath
-com.android.tools.r8.InternalProgramOutputPathConsumer -> com.android.tools.r8.T:
+com.android.tools.r8.InternalProgramOutputPathConsumer -> com.android.tools.r8.G:
 com.android.tools.r8.JdkClassFileProvider -> com.android.tools.r8.JdkClassFileProvider:
     java.util.Map descriptorToModule -> d
     java.util.Set descriptors -> c
@@ -2217,7 +2205,7 @@
     32:38:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):99:105 -> a
     39:54:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):127:142 -> a
     39:54:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
-    55:55:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):322:322 -> a
+    55:55:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):315:315 -> a
     55:55:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):142 -> a
     55:55:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     56:60:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):142:146 -> a
@@ -2236,7 +2224,7 @@
     67:67:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     68:70:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):147:149 -> a
     68:70:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
-    71:71:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():492:492 -> a
+    71:71:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():493:493 -> a
     71:71:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150 -> a
     71:71:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     72:80:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150:158 -> a
@@ -2247,34 +2235,34 @@
     85:85:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     86:91:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):153:158 -> a
     86:91:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
-    92:99: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):166:173 -> a
-    100:101:void run(java.lang.String[]):177:178 -> a
-    100:101:void lambda$main$1(java.lang.String[]):199 -> a
-    102:102:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
-    102:102:void run(java.lang.String[]):179 -> a
-    102:102:void lambda$main$1(java.lang.String[]):199 -> a
-    103:103:void run(java.lang.String[]):180:180 -> a
-    103:103:void lambda$main$1(java.lang.String[]):199 -> a
-    104:104:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
-    104:104:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
-    104:104:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
-    104:104:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
-    104:104:void run(java.lang.String[]):179 -> a
-    104:104:void lambda$main$1(java.lang.String[]):199 -> a
-    105:106:void run(java.lang.String[]):183:184 -> a
-    105:106:void lambda$main$1(java.lang.String[]):199 -> a
-    107:107:void lambda$main$1(java.lang.String[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":112,"2":113,"3":114}}
-    112:112:void run(java.lang.String[]):184:184 -> a
-    112:112:void lambda$main$1(java.lang.String[]):199 -> a
-    113:113:void run(java.lang.String[]):184:184 -> a
-    113:113:void lambda$main$1(java.lang.String[]):199 -> a
-    114:114:void run(java.lang.String[]):184:184 -> a
-    114:114:void lambda$main$1(java.lang.String[]):199 -> a
-    108:111:void run(java.lang.String[]):184:187 -> a
-    108:111:void lambda$main$1(java.lang.String[]):199 -> a
-    1:4:void main(java.lang.String[]):196:199 -> main
-    5:5:void main(java.lang.String[]):197:197 -> main
+    92:98:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):166:172 -> a
+    99:100:void run(java.lang.String[]):176:177 -> a
+    99:100:void lambda$main$1(java.lang.String[]):198 -> a
+    101:101:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
+    101:101:void run(java.lang.String[]):178 -> a
+    101:101:void lambda$main$1(java.lang.String[]):198 -> a
+    102:102:void run(java.lang.String[]):179:179 -> a
+    102:102:void lambda$main$1(java.lang.String[]):198 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
+    103:103:void run(java.lang.String[]):178 -> a
+    103:103:void lambda$main$1(java.lang.String[]):198 -> a
+    104:105:void run(java.lang.String[]):182:183 -> a
+    104:105:void lambda$main$1(java.lang.String[]):198 -> a
+    106:106:void lambda$main$1(java.lang.String[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":111,"2":112,"3":113}}
+    111:111:void run(java.lang.String[]):183:183 -> a
+    111:111:void lambda$main$1(java.lang.String[]):198 -> a
+    112:112:void run(java.lang.String[]):183:183 -> a
+    112:112:void lambda$main$1(java.lang.String[]):198 -> a
+    113:113:void run(java.lang.String[]):183:183 -> a
+    113:113:void lambda$main$1(java.lang.String[]):198 -> a
+    107:110:void run(java.lang.String[]):183:186 -> a
+    107:110:void lambda$main$1(java.lang.String[]):198 -> a
+    1:4:void main(java.lang.String[]):195:198 -> main
+    5:5:void main(java.lang.String[]):196:196 -> main
     1:5:void run(com.android.tools.r8.L8Command):49:53 -> run
     6:6:void run(com.android.tools.r8.L8Command):48:48 -> run
     7:11:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):65:69 -> run
@@ -2291,15 +2279,15 @@
     2:2:void <init>(boolean,boolean,com.android.tools.r8.L8Command$1):39:39 -> <init>
     3:23:void <init>(com.android.tools.r8.R8Command,com.android.tools.r8.D8Command,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,java.util.function.BiPredicate,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.util.List,java.util.List,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.graph.DexItemFactory):105:125 -> <init>
     24:28:void <init>(boolean,boolean):129:133 -> <init>
-    1:52:com.android.tools.r8.utils.InternalOptions getInternalOptions():162:213 -> b
-    53:53:com.android.tools.r8.DumpOptions dumpOptions():442:442 -> b
-    53:53:com.android.tools.r8.utils.InternalOptions getInternalOptions():214 -> b
-    54:58:void com.android.tools.r8.BaseCompilerCommand.dumpBaseCommandOptions(com.android.tools.r8.DumpOptions$Builder):127:131 -> b
-    54:58:com.android.tools.r8.DumpOptions dumpOptions():443 -> b
-    54:58:com.android.tools.r8.utils.InternalOptions getInternalOptions():214 -> b
-    59:62:com.android.tools.r8.DumpOptions dumpOptions():444:447 -> b
-    59:62:com.android.tools.r8.utils.InternalOptions getInternalOptions():214 -> b
-    63:63:com.android.tools.r8.utils.InternalOptions getInternalOptions():214:214 -> b
+    1:51:com.android.tools.r8.utils.InternalOptions getInternalOptions():162:212 -> b
+    52:52:com.android.tools.r8.DumpOptions dumpOptions():441:441 -> b
+    52:52:com.android.tools.r8.utils.InternalOptions getInternalOptions():213 -> b
+    53:57:void com.android.tools.r8.BaseCompilerCommand.dumpBaseCommandOptions(com.android.tools.r8.DumpOptions$Builder):127:131 -> b
+    53:57:com.android.tools.r8.DumpOptions dumpOptions():442 -> b
+    53:57:com.android.tools.r8.utils.InternalOptions getInternalOptions():213 -> b
+    58:61:com.android.tools.r8.DumpOptions dumpOptions():443:446 -> b
+    58:61:com.android.tools.r8.utils.InternalOptions getInternalOptions():213 -> b
+    62:62:com.android.tools.r8.utils.InternalOptions getInternalOptions():213:213 -> b
     1:1:com.android.tools.r8.L8Command$Builder builder():153:153 -> builder
     2:2:com.android.tools.r8.L8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):157:157 -> builder
     1:1:com.android.tools.r8.D8Command getD8Command():53:53 -> f
@@ -2307,59 +2295,58 @@
     1:1:boolean isShrinking():49:49 -> h
     1:1:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):70:70 -> parse
     2:2:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):84:84 -> parse
-com.android.tools.r8.L8Command$1 -> com.android.tools.r8.U:
 com.android.tools.r8.L8Command$Builder -> com.android.tools.r8.L8Command$Builder:
     java.util.List proguardConfigFiles -> z
     java.util.List proguardConfigStrings -> y
     boolean $assertionsDisabled -> A
-    1:1:void <clinit>():224:224 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.L8Command$1):225:225 -> <init>
-    2:2:void <init>(com.android.tools.r8.L8Command$1):225:225 -> <init>
-    3:3:void <init>():231:231 -> <init>
-    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):235:235 -> <init>
-    5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):227:228 -> <init>
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):267:267 -> addProguardConfiguration
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):255:255 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):261:261 -> addProguardConfigurationFiles
-    1:5:com.android.tools.r8.L8Command makeCommand():326:330 -> c
-    1:5:com.android.tools.r8.BaseCommand makeCommand():224 -> c
-    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():250:250 -> c
-    6:6:com.android.tools.r8.L8Command makeCommand():331 -> c
-    6:6:com.android.tools.r8.BaseCommand makeCommand():224 -> c
-    7:25:com.android.tools.r8.L8Command makeCommand():331:349 -> c
-    7:25:com.android.tools.r8.BaseCommand makeCommand():224 -> c
-    26:44:com.android.tools.r8.L8Command makeCommand():348:366 -> c
-    26:44:com.android.tools.r8.BaseCommand makeCommand():224 -> c
-    45:49:com.android.tools.r8.L8Command makeCommand():365:369 -> c
-    45:49:com.android.tools.r8.BaseCommand makeCommand():224 -> c
-    50:62:com.android.tools.r8.L8Command makeCommand():368:380 -> c
-    50:62:com.android.tools.r8.BaseCommand makeCommand():224 -> c
-    63:98:com.android.tools.r8.L8Command makeCommand():379:414 -> c
-    63:98:com.android.tools.r8.BaseCommand makeCommand():224 -> c
-    99:99:com.android.tools.r8.L8Command makeCommand():327:327 -> c
-    99:99:com.android.tools.r8.BaseCommand makeCommand():224 -> c
+    1:1:void <clinit>():223:223 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.L8Command$1):224:224 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.L8Command$1):224:224 -> <init>
+    3:3:void <init>():230:230 -> <init>
+    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):234:234 -> <init>
+    5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):226:227 -> <init>
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):266:266 -> addProguardConfiguration
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):254:254 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):260:260 -> addProguardConfigurationFiles
+    1:5:com.android.tools.r8.L8Command makeCommand():325:329 -> c
+    1:5:com.android.tools.r8.BaseCommand makeCommand():223 -> c
+    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():249:249 -> c
+    6:6:com.android.tools.r8.L8Command makeCommand():330 -> c
+    6:6:com.android.tools.r8.BaseCommand makeCommand():223 -> c
+    7:25:com.android.tools.r8.L8Command makeCommand():330:348 -> c
+    7:25:com.android.tools.r8.BaseCommand makeCommand():223 -> c
+    26:44:com.android.tools.r8.L8Command makeCommand():347:365 -> c
+    26:44:com.android.tools.r8.BaseCommand makeCommand():223 -> c
+    45:49:com.android.tools.r8.L8Command makeCommand():364:368 -> c
+    45:49:com.android.tools.r8.BaseCommand makeCommand():223 -> c
+    50:62:com.android.tools.r8.L8Command makeCommand():367:379 -> c
+    50:62:com.android.tools.r8.BaseCommand makeCommand():223 -> c
+    63:98:com.android.tools.r8.L8Command makeCommand():378:413 -> c
+    63:98:com.android.tools.r8.BaseCommand makeCommand():223 -> c
+    99:99:com.android.tools.r8.L8Command makeCommand():326:326 -> c
+    99:99:com.android.tools.r8.BaseCommand makeCommand():223 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:22:void validate():300:321 -> f
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():250:250 -> g
-    1:1:boolean isShrinking():240:240 -> isShrinking
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):224:224 -> setProguardMapConsumer
-    2:2:com.android.tools.r8.L8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):295:295 -> setProguardMapConsumer
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setProguardMapOutputPath(java.nio.file.Path):224:224 -> setProguardMapOutputPath
+    1:22:void validate():299:320 -> f
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():249:249 -> g
+    1:1:boolean isShrinking():239:239 -> isShrinking
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):223:223 -> setProguardMapConsumer
+    2:2:com.android.tools.r8.L8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):294:294 -> setProguardMapConsumer
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setProguardMapOutputPath(java.nio.file.Path):223:223 -> setProguardMapOutputPath
     2:3:com.android.tools.r8.BaseCompilerCommand$Builder com.android.tools.r8.BaseCompilerCommand$Builder.setProguardMapOutputPath(java.nio.file.Path):319:320 -> setProguardMapOutputPath
-    2:3:com.android.tools.r8.L8Command$Builder setProguardMapOutputPath(java.nio.file.Path):282 -> setProguardMapOutputPath
-    4:4:com.android.tools.r8.L8Command$Builder setProguardMapOutputPath(java.nio.file.Path):282:282 -> setProguardMapOutputPath
-com.android.tools.r8.L8Command$DefaultL8DiagnosticsHandler -> com.android.tools.r8.V:
+    2:3:com.android.tools.r8.L8Command$Builder setProguardMapOutputPath(java.nio.file.Path):281 -> setProguardMapOutputPath
+    4:4:com.android.tools.r8.L8Command$Builder setProguardMapOutputPath(java.nio.file.Path):281:281 -> setProguardMapOutputPath
+com.android.tools.r8.L8Command$DefaultL8DiagnosticsHandler -> com.android.tools.r8.H:
     1:1:void <init>():136:136 -> <init>
     1:5:void error(com.android.tools.r8.Diagnostic):140:144 -> error
     6:12:void error(com.android.tools.r8.Diagnostic):142:148 -> error
-com.android.tools.r8.L8Command$InMemoryJarContent -> com.android.tools.r8.W:
+com.android.tools.r8.L8Command$InMemoryJarContent -> com.android.tools.r8.I:
     java.util.List resources -> a
-    1:3:void <init>():419:421 -> <init>
-    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):427:429 -> accept
-    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):428:428 -> accept
-    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):427:427 -> accept
-    1:1:java.util.Collection getProgramResources():434:434 -> getProgramResources
-com.android.tools.r8.L8CommandParser -> com.android.tools.r8.X:
+    1:3:void <init>():418:420 -> <init>
+    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):426:428 -> accept
+    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):427:427 -> accept
+    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):426:426 -> accept
+    1:1:java.util.Collection getProgramResources():433:433 -> getProgramResources
+com.android.tools.r8.L8CommandParser -> com.android.tools.r8.J:
     java.lang.String USAGE_MESSAGE -> g
     java.util.Set OPTIONS_WITH_PARAMETER -> f
     1:20:void <clinit>():21:40 -> <clinit>
@@ -2373,41 +2360,39 @@
     104:104:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable[]):472:472 -> <clinit>
     104:104:void <clinit>():43 -> <clinit>
     105:105:void <clinit>():41:41 -> <clinit>
-    1:1:void <init>():19:19 -> <init>
     1:1:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):82:82 -> a
     2:2:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):96:96 -> a
     3:15:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):102:114 -> a
     16:16:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":658,"2":659,"3":660}}
-    658:658:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:114 -> a
-    659:659:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:114 -> a
-    660:660:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:114 -> a
-    130:130:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:114 -> a
-    131:131:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":661,"2":662,"3":663}}
     661:661:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:114 -> a
     662:662:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:114 -> a
     663:663:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:114 -> a
+    130:130:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:114 -> a
+    131:131:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":664,"2":665,"3":666}}
+    664:664:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:114 -> a
+    665:665:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:114 -> a
+    666:666:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:114 -> a
     245:272:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):114:141 -> a
     273:273:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":690,"2":691,"3":692}}
-    690:690:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):141:141 -> a
-    691:691:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):141:141 -> a
-    692:692:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):141:141 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":693,"2":694,"3":695}}
+    693:693:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):141:141 -> a
+    694:694:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):141:141 -> a
+    695:695:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):141:141 -> a
     416:416:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):143:143 -> a
     417:460:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):141:184 -> a
     461:461:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":735,"2":736,"3":737,"4":738,"5":739}}
-    735:735:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):184:184 -> a
-    736:736:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):184:184 -> a
-    737:737:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):184:184 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":738,"2":739,"3":740,"4":741,"5":742}}
     738:738:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):184:184 -> a
     739:739:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):184:184 -> a
-    645:647:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):184:186 -> a
-    648:648:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():68:68 -> a
-    648:648:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):189 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    649:657:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):190:198 -> a
+    740:740:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):184:184 -> a
+    741:741:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):184:184 -> a
+    742:742:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):184:184 -> a
+    645:650:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):184:189 -> a
+    651:651:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():68:68 -> a
+    651:651:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):189 -> a
+    652:660:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):190:198 -> a
 com.android.tools.r8.OutputMode -> com.android.tools.r8.OutputMode:
     com.android.tools.r8.OutputMode[] $VALUES -> b
     1:16:void <clinit>():11:26 -> <clinit>
@@ -2419,7 +2404,6 @@
     1:1:com.android.tools.r8.ProgramResource fromBytes(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set):53:53 -> fromBytes
     1:1:com.android.tools.r8.ProgramResource fromFile(com.android.tools.r8.ProgramResource$Kind,java.nio.file.Path):42:42 -> fromFile
     1:3:byte[] getBytes():65:67 -> getBytes
-com.android.tools.r8.ProgramResource$1 -> com.android.tools.r8.Y:
 com.android.tools.r8.ProgramResource$ByteResource -> com.android.tools.r8.ProgramResource$ByteResource:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
@@ -2462,10 +2446,10 @@
     boolean lambda$run$3(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexApplication lambda$run$8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication) -> a
     1:8:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):220:227 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):228 -> a
     10:10:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):229:229 -> a
-    11:11:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():492:492 -> a
+    11:11:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():493:493 -> a
     11:11:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):230 -> a
     12:24:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):230:242 -> a
     25:26:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):248:249 -> a
@@ -2478,22 +2462,22 @@
     40:40:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):280 -> a
     41:47:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):280:286 -> a
     48:48:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2066,"2":2067,"3":2068}}
-    2066:2066:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):286:286 -> a
-    2067:2067:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):286:286 -> a
-    2068:2068:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):286:286 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2070,"2":2071,"3":2072}}
+    2070:2070:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):286:286 -> a
+    2071:2071:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):286:286 -> a
+    2072:2072:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):286:286 -> a
     334:335:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):286:287 -> a
     336:336:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2069,"2":2070,"3":2071}}
-    2069:2069:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
-    2070:2070:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
-    2071:2071:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2073,"2":2074,"3":2075}}
+    2073:2073:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
+    2074:2074:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
+    2075:2075:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
     623:624:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:288 -> a
     625:625:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2072,"2":2073,"3":2074}}
-    2072:2072:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
-    2073:2073:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
-    2074:2074:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2076,"2":2077,"3":2078}}
+    2076:2076:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
+    2077:2077:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
+    2078:2078:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
     913:936:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:311 -> a
     937:944:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):35:42 -> a
     937:944:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):311 -> a
@@ -2521,103 +2505,105 @@
     1020:1062:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):356:398 -> a
     1063:1093:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):397:427 -> a
     1094:1144:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):422:472 -> a
-    1145:1284:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):469:608 -> a
-    1285:1306:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):606:627 -> a
-    1307:1325:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):622:640 -> a
-    1326:1375:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):639:688 -> a
-    1376:1446:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):669:739 -> a
-    1447:1474:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):738:765 -> a
-    1475:1572:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):762:859 -> a
-    1573:1587:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):795:809 -> a
-    1588:1600:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):806:818 -> a
-    1601:1606: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):25:30 -> a
-    1601:1606:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):818 -> a
-    1607:1632:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):820:845 -> a
-    1633:1651:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):841:859 -> a
-    1652:1652:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):544:544 -> a
-    1653:2065:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):447:859 -> a
-    2075:2075:java.lang.Boolean lambda$run$2():280:280 -> a
-    2076:2076:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):406:406 -> a
-    2077:2077:void lambda$run$9(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):599:599 -> a
-    2078:2078:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$10(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):607:607 -> a
-    2079:2079:void lambda$run$13(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):683:683 -> a
-    2080:2080:void lambda$run$14(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):690:690 -> a
-    2081:2081:void lambda$run$15(java.lang.String):790:790 -> a
-    2082:2082:boolean lambda$run$16(com.android.tools.r8.graph.DexProgramClass):796:796 -> a
-    2083:2089:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):866:872 -> a
-    2090:2093:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):874:877 -> a
-    2094:2094:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):876:876 -> a
-    2095:2115:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):904:924 -> a
-    2116:2116:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):923:923 -> a
-    2117:2119:java.lang.Iterable lambda$performFinalMainDexTracing$20(com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.graph.AppView):926:928 -> a
-    2120:2122:void lambda$performFinalMainDexTracing$19(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):930:932 -> a
-    2123:2124:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):948:949 -> a
-    2125:2125:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$22(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):951:951 -> a
-    2126:2126:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):954:954 -> a
-    2127:2127:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    2127:2127:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):954 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2128:2135:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):955:962 -> a
-    2136:2137:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):974:975 -> a
-    2136:2137:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962 -> a
-    2138:2138:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    2138:2138:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):975 -> a
-    2138:2138:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962 -> a
-    2139:2140:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):978:979 -> a
-    2139:2140:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962 -> a
-    2141:2142:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):963:964 -> a
-    2143:2147:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):985:989 -> a
-    2143:2147:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
-    2148:2148:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
-    2148:2148:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):989 -> a
-    2148:2148:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
-    2149:2149:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):989:989 -> a
-    2149:2149:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
-    2150:2150:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966:966 -> a
-    2151:2151:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    2151:2151:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
-    2152:2152:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
-    2152:2152:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
-    2153:2153:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966:966 -> a
-    2154:2162:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1002:1010 -> a
-    2163:2168:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1008:1013 -> a
-    2169:2171:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):87:89 -> a
-    2169:2171:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1014 -> a
-    2172:2182:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1018:1028 -> a
-    2183:2183:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1026:1026 -> a
-    2184:2186:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1047:1049 -> a
-    2187:2222:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1048:1083 -> a
-    2223:2227:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1080:1084 -> a
-    2228:2231:boolean verifyNoJarApplicationReaders(java.util.Collection):1088:1091 -> a
-    2232:2232:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1113:1113 -> a
-    2233:2233:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):262:262 -> a
-    2233:2233:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1113 -> a
-    2234:2234:void lambda$main$26(java.lang.String[]):1128:1128 -> a
+    1145:1262:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):469:586 -> a
+    1263:1288:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):583:608 -> a
+    1289:1310:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):606:627 -> a
+    1311:1329:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):622:640 -> a
+    1330:1379:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):639:688 -> a
+    1380:1450:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):669:739 -> a
+    1451:1478:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):738:765 -> a
+    1479:1576:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):762:859 -> a
+    1577:1591:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):795:809 -> a
+    1592:1604:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):806:818 -> a
+    1605:1610: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):25:30 -> a
+    1605:1610:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):818 -> a
+    1611:1636:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):820:845 -> a
+    1637:1655:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):841:859 -> a
+    1656:1656:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):544:544 -> a
+    1657:2069:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):447:859 -> a
+    2079:2079:java.lang.Boolean lambda$run$2():280:280 -> a
+    2080:2080:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):406:406 -> a
+    2081:2081:void lambda$run$9(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):599:599 -> a
+    2082:2082:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$10(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):607:607 -> a
+    2083:2083:void lambda$run$13(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):683:683 -> a
+    2084:2084:void lambda$run$14(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):690:690 -> a
+    2085:2085:void lambda$run$15(java.lang.String):790:790 -> a
+    2086:2086:boolean lambda$run$16(com.android.tools.r8.graph.DexProgramClass):796:796 -> a
+    2087:2093:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):866:872 -> a
+    2094:2097:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):874:877 -> a
+    2098:2098:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):876:876 -> a
+    2099:2113:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):904:918 -> a
+    2114:2121:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):917:924 -> a
+    2122:2122:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):923:923 -> a
+    2123:2125:java.lang.Iterable lambda$performFinalMainDexTracing$20(com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.graph.AppView):926:928 -> a
+    2126:2128:void lambda$performFinalMainDexTracing$19(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):930:932 -> a
+    2129:2130:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):948:949 -> a
+    2131:2131:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$22(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):951:951 -> a
+    2132:2132:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):954:954 -> a
+    2133:2133:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    2133:2133:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):954 -> a
+    2134:2141:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):955:962 -> a
+    2142:2143:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):974:975 -> a
+    2142:2143:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962 -> a
+    2144:2144:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    2144:2144:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):975 -> a
+    2144:2144:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962 -> a
+    2145:2146:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):978:979 -> a
+    2145:2146:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962 -> a
+    2147:2148:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):963:964 -> a
+    2149:2153:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):985:989 -> a
+    2149:2153:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
+    2154:2154:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
+    2154:2154:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):989 -> a
+    2154:2154:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
+    2155:2155:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):989:989 -> a
+    2155:2155:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
+    2156:2156:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966:966 -> a
+    2157:2157:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
+    2157:2157:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
+    2158:2158:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
+    2158:2158:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
+    2159:2159:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966:966 -> a
+    2160:2168:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1002:1010 -> a
+    2169:2174:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1008:1013 -> a
+    2175:2177:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):87:89 -> a
+    2175:2177:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1014 -> a
+    2178:2188:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1018:1028 -> a
+    2189:2189:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1026:1026 -> a
+    2190:2192:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1047:1049 -> a
+    2193:2228:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1048:1083 -> a
+    2229:2233:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1080:1084 -> a
+    2234:2237:boolean verifyNoJarApplicationReaders(java.util.Collection):1088:1091 -> a
+    2238:2238:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1113:1113 -> a
+    2239:2239:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):262:262 -> a
+    2239:2239:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1113 -> a
+    2240:2240:void lambda$main$26(java.lang.String[]):1128:1128 -> a
     1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):262:262 -> b
     1:1:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):253 -> b
     2:2:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):255:255 -> b
     3:3:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):266:266 -> b
-    4:15:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):887:898 -> b
-    16:16:void lambda$runEnqueuer$24(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1030:1030 -> b
-    17:18:void run(java.lang.String[]):1099:1100 -> b
-    19:19:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    19:19:void run(java.lang.String[]):1101 -> b
-    20:20:void run(java.lang.String[]):1102:1102 -> b
-    21:21:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
-    21:21:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
-    21:21:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
-    21:21:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
+    4:13:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):887:896 -> b
+    14:17:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):895:898 -> b
+    18:18:void lambda$runEnqueuer$24(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1030:1030 -> b
+    19:20:void run(java.lang.String[]):1099:1100 -> b
+    21:21:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
     21:21:void run(java.lang.String[]):1101 -> b
-    22:23:void run(java.lang.String[]):1105:1106 -> b
-    24:24:void run(java.lang.String[]):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1139,"2":1140,"3":1141}}
-    1139:1139:void run(java.lang.String[]):1106:1106 -> b
-    1140:1140:void run(java.lang.String[]):1106:1106 -> b
+    22:22:void run(java.lang.String[]):1102:1102 -> b
+    23:23:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
+    23:23:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
+    23:23:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
+    23:23:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
+    23:23:void run(java.lang.String[]):1101 -> b
+    24:25:void run(java.lang.String[]):1105:1106 -> b
+    26:26:void run(java.lang.String[]):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1141,"2":1142,"3":1143}}
     1141:1141:void run(java.lang.String[]):1106:1106 -> b
-    1130:1136:void run(java.lang.String[]):1106:1112 -> b
-    1137:1137:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> b
-    1137:1137:void run(java.lang.String[]):1112 -> b
-    1138:1138:void run(java.lang.String[]):1115:1115 -> b
+    1142:1142:void run(java.lang.String[]):1106:1106 -> b
+    1143:1143:void run(java.lang.String[]):1106:1106 -> b
+    1132:1138:void run(java.lang.String[]):1106:1112 -> b
+    1139:1139:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> b
+    1139:1139:void run(java.lang.String[]):1112 -> b
+    1140:1140:void run(java.lang.String[]):1115:1115 -> b
     1:1:java.lang.Iterable lambda$run$11(com.android.tools.r8.graph.AppView):641:641 -> c
     1:1:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):660:660 -> d
     2:5:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):659:662 -> d
@@ -2680,7 +2666,7 @@
     89:91:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):971:973 -> b
     89:91:com.android.tools.r8.utils.InternalOptions getInternalOptions():900 -> b
     92:119:com.android.tools.r8.utils.InternalOptions getInternalOptions():900:927 -> b
-    120:120:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
+    120:120:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> b
     120:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():932 -> b
     121:142:com.android.tools.r8.utils.InternalOptions getInternalOptions():933:954 -> b
     143:151:com.android.tools.r8.utils.InternalOptions getInternalOptions():953:961 -> b
@@ -2699,7 +2685,6 @@
     1:1:boolean getEnableTreeShaking():829:829 -> getEnableTreeShaking
     1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):707:707 -> parse
     2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):721:721 -> parse
-com.android.tools.r8.R8Command$1 -> com.android.tools.r8.Z:
 com.android.tools.r8.R8Command$Builder -> com.android.tools.r8.R8Command$Builder:
     java.util.Optional includeDataResources -> H
     boolean skipDump -> P
@@ -2722,8 +2707,8 @@
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> B
     boolean disableTreeShaking -> D
     1:1:void <clinit>():77:77 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.R8Command$1):78:78 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.R8Command$1):78:78 -> <init>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.R8Command$1):78:78 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.R8Command$1):78:78 -> <init>
     3:3:void <init>():122:122 -> <init>
     4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):126:126 -> <init>
     5:25:void <init>(com.android.tools.r8.DiagnosticsHandler):98:118 -> <init>
@@ -2776,7 +2761,7 @@
     5:10:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.shaking.ProguardConfigurationParser.parse(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):113:118 -> r
     5:10:com.android.tools.r8.R8Command makeR8Command():476 -> r
     11:20:com.android.tools.r8.R8Command makeR8Command():479:488 -> r
-    21:21:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():783:783 -> r
+    21:21:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():784:784 -> r
     21:21:com.android.tools.r8.R8Command makeR8Command():488 -> r
     22:88:com.android.tools.r8.R8Command makeR8Command():489:555 -> r
     89:89:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():534:534 -> r
@@ -2801,11 +2786,11 @@
     4:4:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):242:242 -> setProguardMapOutputPath
     1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):298:298 -> setProguardSeedsConsumer
     1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):286:286 -> setProguardUsageConsumer
-com.android.tools.r8.R8Command$Builder$1 -> com.android.tools.r8.a0:
+com.android.tools.r8.R8Command$Builder$1 -> com.android.tools.r8.K:
     com.android.tools.r8.ProgramResourceProvider val$programResourceProvider -> a
     1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.ProgramResourceProvider):391:391 -> <init>
     1:1:java.util.Collection getProgramResources():394:394 -> getProgramResources
-com.android.tools.r8.R8Command$Builder$2 -> com.android.tools.r8.b0:
+com.android.tools.r8.R8Command$Builder$2 -> com.android.tools.r8.L:
     com.android.tools.r8.shaking.ProguardConfigurationParser val$parser -> a
     com.android.tools.r8.utils.Reporter val$reporter -> b
     1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):498:498 -> <init>
@@ -2821,20 +2806,20 @@
     534:534:void visit(com.android.tools.r8.DataEntryResource):512:512 -> visit
     535:535:void visit(com.android.tools.r8.DataEntryResource):512:512 -> visit
     530:532:void visit(com.android.tools.r8.DataEntryResource):512:512 -> visit
-com.android.tools.r8.R8Command$Builder$DefaultR8DiagnosticsHandler -> com.android.tools.r8.c0:
+com.android.tools.r8.R8Command$Builder$DefaultR8DiagnosticsHandler -> com.android.tools.r8.M:
     1:1:void <init>():80:80 -> <init>
     2:2:void <init>(com.android.tools.r8.R8Command$1):80:80 -> <init>
     1:6:void error(com.android.tools.r8.Diagnostic):84:89 -> error
     7:14:void error(com.android.tools.r8.Diagnostic):87:94 -> error
-com.android.tools.r8.R8Command$EnsureNonDexProgramResourceProvider -> com.android.tools.r8.d0:
+com.android.tools.r8.R8Command$EnsureNonDexProgramResourceProvider -> com.android.tools.r8.N:
     com.android.tools.r8.ProgramResourceProvider provider -> a
     1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):633:634 -> <init>
     1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():651:651 -> getDataResourceProvider
     1:4:java.util.Collection getProgramResources():639:642 -> getProgramResources
-com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.e0:
+com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.O:
     1:1:void <init>(com.android.tools.r8.StringConsumer):982:982 -> <init>
     1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):987:988 -> accept
-com.android.tools.r8.R8CommandParser -> com.android.tools.r8.h0:
+com.android.tools.r8.R8CommandParser -> com.android.tools.r8.Q:
     java.util.Set OPTIONS_WITH_TWO_PARAMETERS -> g
     java.lang.String USAGE_MESSAGE -> h
     java.util.Set OPTIONS_WITH_PARAMETER -> f
@@ -2904,8 +2889,7 @@
     1503:1505:com.android.tools.r8.FeatureSplit lambda$addFeatureJar$2(com.android.tools.r8.R8Command$Builder,java.nio.file.Path,java.util.List,com.android.tools.r8.FeatureSplit$Builder):304:306 -> a
     1506:1509:com.android.tools.r8.FeatureSplit lambda$addFeatureJar$2(com.android.tools.r8.R8Command$Builder,java.nio.file.Path,java.util.List,com.android.tools.r8.FeatureSplit$Builder):305:308 -> a
     1:1:void lambda$parse$1(com.android.tools.r8.R8Command$Builder,java.nio.file.Path,java.util.List):296:296 -> b
-com.android.tools.r8.R8CommandParser$1 -> com.android.tools.r8.f0:
-com.android.tools.r8.R8CommandParser$ParseState -> com.android.tools.r8.g0:
+com.android.tools.r8.R8CommandParser$ParseState -> com.android.tools.r8.P:
     java.nio.file.Path outputPath -> c
     com.android.tools.r8.OutputMode outputMode -> b
     boolean includeDataResources -> e
@@ -2935,7 +2919,7 @@
 com.android.tools.r8.ResourceShrinker$Command -> com.android.tools.r8.ResourceShrinker$Command:
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp):102:102 -> <init>
     1:1:com.android.tools.r8.utils.InternalOptions getInternalOptions():107:107 -> b
-com.android.tools.r8.ResourceShrinker$DexClassUsageVisitor -> com.android.tools.r8.i0:
+com.android.tools.r8.ResourceShrinker$DexClassUsageVisitor -> com.android.tools.r8.S:
     com.android.tools.r8.graph.DexProgramClass classDef -> a
     com.android.tools.r8.ResourceShrinker$ReferenceChecker callback -> b
     boolean $assertionsDisabled -> c
@@ -3047,38 +3031,37 @@
     134:134:void visit():181 -> a
     135:135:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):238:238 -> a
     135:135:void visit():181 -> a
-    136:138:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):296:298 -> a
-    136:138:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239 -> a
-    136:138:void visit():181 -> a
-    139:139:com.android.tools.r8.graph.DexType com.android.tools.r8.code.NewArray.getType():62:62 -> a
-    139:139:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):299 -> a
-    139:139:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239 -> a
-    139:139:void visit():181 -> a
-    140:148:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):299:307 -> a
-    140:148:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239 -> a
-    140:148:void visit():181 -> a
-    149:149:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):306:306 -> a
-    149:149:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239 -> a
-    149:149:void visit():181 -> a
-    150:156:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):240:246 -> a
-    150:156:void visit():181 -> a
-    157:162:boolean isIntArrayPayload(com.android.tools.r8.code.Instruction,java.util.Set):286:291 -> a
-    157:162:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):247 -> a
-    157:162:void visit():181 -> a
-    163:165:void processIntArrayPayload(com.android.tools.r8.code.Instruction):278:280 -> a
-    163:165:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):248 -> a
-    163:165:void visit():181 -> a
-    166:172:void visit():182:188 -> a
-    173:173:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):255:255 -> a
-    174:174:java.util.stream.Stream com.android.tools.r8.graph.DexAnnotationSet.stream():98:98 -> a
-    174:174:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):255 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    175:184:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):257:266 -> a
-    185:185:java.util.stream.Stream lambda$processAnnotations$0(com.android.tools.r8.graph.DexEncodedField):259:259 -> a
-    186:186:java.util.stream.Stream lambda$processAnnotations$1(com.android.tools.r8.graph.DexEncodedMethod):263:263 -> a
-    187:189:void lambda$processAnnotations$2(com.android.tools.r8.graph.DexAnnotation):268:270 -> a
-    190:208:void processAnnotationValue(com.android.tools.r8.graph.DexValue):311:329 -> a
-    209:209:void processAnnotationValue(com.android.tools.r8.graph.DexValue):325:325 -> a
+    136:139:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):296:299 -> a
+    136:139:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239 -> a
+    136:139:void visit():181 -> a
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.code.NewArray.getType():62:62 -> a
+    140:140:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):299 -> a
+    140:140:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239 -> a
+    140:140:void visit():181 -> a
+    141:149:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):299:307 -> a
+    141:149:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239 -> a
+    141:149:void visit():181 -> a
+    150:150:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):306:306 -> a
+    150:150:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239 -> a
+    150:150:void visit():181 -> a
+    151:157:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):240:246 -> a
+    151:157:void visit():181 -> a
+    158:163:boolean isIntArrayPayload(com.android.tools.r8.code.Instruction,java.util.Set):286:291 -> a
+    158:163:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):247 -> a
+    158:163:void visit():181 -> a
+    164:166:void processIntArrayPayload(com.android.tools.r8.code.Instruction):278:280 -> a
+    164:166:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):248 -> a
+    164:166:void visit():181 -> a
+    167:173:void visit():182:188 -> a
+    174:174:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):255:255 -> a
+    175:175:java.util.stream.Stream com.android.tools.r8.graph.DexAnnotationSet.stream():98:98 -> a
+    175:175:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):255 -> a
+    176:185:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):257:266 -> a
+    186:186:java.util.stream.Stream lambda$processAnnotations$0(com.android.tools.r8.graph.DexEncodedField):259:259 -> a
+    187:187:java.util.stream.Stream lambda$processAnnotations$1(com.android.tools.r8.graph.DexEncodedMethod):263:263 -> a
+    188:190:void lambda$processAnnotations$2(com.android.tools.r8.graph.DexAnnotation):268:270 -> a
+    191:209:void processAnnotationValue(com.android.tools.r8.graph.DexValue):311:329 -> a
+    210:210:void processAnnotationValue(com.android.tools.r8.graph.DexValue):325:325 -> a
 com.android.tools.r8.StringConsumer -> com.android.tools.r8.StringConsumer:
     1:1:com.android.tools.r8.StringConsumer$EmptyConsumer emptyConsumer():47:47 -> emptyConsumer
 com.android.tools.r8.StringConsumer$EmptyConsumer -> com.android.tools.r8.StringConsumer$EmptyConsumer:
@@ -3111,20 +3094,19 @@
     1:2:void <init>(com.android.tools.r8.StringConsumer):74:75 -> <init>
     1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):80:81 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):87:88 -> finished
-com.android.tools.r8.StringConsumer$WriterConsumer -> com.android.tools.r8.j0:
+com.android.tools.r8.StringConsumer$WriterConsumer -> com.android.tools.r8.T:
     com.android.tools.r8.origin.Origin origin -> b
     java.io.Writer writer -> c
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.io.Writer,com.android.tools.r8.StringConsumer):192:194 -> <init>
     1:5:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):199:203 -> accept
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):209:213 -> finished
-com.android.tools.r8.StringResource -> com.android.tools.r8.internal.NX:
+com.android.tools.r8.StringResource -> com.android.tools.r8.internal.hW:
     java.lang.String getString() -> a
     1:1:com.android.tools.r8.StringResource fromString(java.lang.String,com.android.tools.r8.origin.Origin):26:26 -> a
     2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37:37 -> a
     3:3:com.android.tools.r8.StringResource com.android.tools.r8.StringResource.fromFile(java.nio.file.Path,java.nio.charset.Charset):49:49 -> a
     3:3:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37 -> a
-com.android.tools.r8.StringResource$1 -> com.android.tools.r8.internal.KX:
-com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.LX:
+com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.fW:
     java.nio.charset.Charset charset -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path file -> a
@@ -3134,7 +3116,7 @@
     2:7:void <init>(java.nio.file.Path,java.nio.charset.Charset):87:92 -> <init>
     1:3:java.lang.String getString():103:105 -> a
     1:1:com.android.tools.r8.origin.Origin getOrigin():97:97 -> getOrigin
-com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.internal.MX:
+com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.internal.gW:
     com.android.tools.r8.origin.Origin origin -> a
     java.lang.String content -> b
     boolean $assertionsDisabled -> c
@@ -3160,7 +3142,7 @@
     25:25:java.lang.String getVersionString():21:21 -> getVersionString
     22:22:java.lang.String getVersionString():21:21 -> getVersionString
     1:1:boolean isDevelopmentVersion():106:106 -> isDevelopmentVersion
-com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.RU:
+com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.jT:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
     java.util.List components -> f
@@ -3205,9 +3187,17 @@
     com.android.tools.r8.androidapi.ComputedApiLevel minApiLevel -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView):95:97 -> <init>
     1:3:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForDefinition(java.lang.Iterable,com.android.tools.r8.androidapi.ComputedApiLevel):103:105 -> a
-    4:5:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache.lookupMax(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel):50:51 -> a
-    4:5:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForDefinition(java.lang.Iterable,com.android.tools.r8.androidapi.ComputedApiLevel):105 -> a
-    6:6:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForLibraryReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel):113:113 -> a
+    4:4:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache.lookupMax(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel):50:50 -> a
+    4:4:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForDefinition(java.lang.Iterable,com.android.tools.r8.androidapi.ComputedApiLevel):105 -> a
+    5:5:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForDefinition(java.lang.Iterable,com.android.tools.r8.androidapi.ComputedApiLevel):105:105 -> a
+    6:6:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache.lookupMax(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel):50:50 -> a
+    6:6:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForDefinition(java.lang.Iterable,com.android.tools.r8.androidapi.ComputedApiLevel):105 -> a
+    7:7:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache.lookupMax(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel):51:51 -> a
+    7:7:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForDefinition(java.lang.Iterable,com.android.tools.r8.androidapi.ComputedApiLevel):105 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    8:8:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache.lookupMax(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel):51:51 -> a
+    8:8:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForDefinition(java.lang.Iterable,com.android.tools.r8.androidapi.ComputedApiLevel):105 -> a
+    9:9:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForLibraryReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel):113:113 -> a
 com.android.tools.r8.androidapi.AndroidApiLevelCompute$NoAndroidApiLevelCompute -> com.android.tools.r8.internal.S1:
     1:1:void <init>():70:70 -> <init>
     com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForDefinition(java.lang.Iterable,com.android.tools.r8.androidapi.ComputedApiLevel) -> a
@@ -3298,13 +3288,11 @@
     2:2:void access$100(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.DexType):38:38 -> a
     3:3:void access$200(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.DexMethod):38:38 -> a
     4:4:void run(java.util.concurrent.ExecutorService):124:124 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     5:5:void run(java.util.concurrent.ExecutorService):124 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:22:void run(java.util.concurrent.ExecutorService):124:140 -> a
     23:23:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
     23:23:void run(java.util.concurrent.ExecutorService):140 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:26:void run(java.util.concurrent.ExecutorService):141:143 -> a
     27:32:void run(java.util.concurrent.ExecutorService):142:147 -> a
     33:37:void lambda$run$0(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):134:134 -> a
@@ -3314,9 +3302,9 @@
     51:51:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":239,"2":240,"3":241}}
     239:239:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):168:168 -> a
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     240:240:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):168 -> a
-    241:241:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    241:241:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     241:241:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):168 -> a
     220:220:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):169:169 -> a
     221:221:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
@@ -3349,7 +3337,6 @@
     303:310:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):251:258 -> a
     311:311:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2383:2383 -> a
     311:311:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     312:312:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):257:257 -> a
     313:313:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
     313:313:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):259 -> a
@@ -3369,9 +3356,9 @@
     4:4:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":110,"2":111,"3":112}}
     110:110:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):102:102 -> a
-    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     111:111:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):102 -> a
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     112:112:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):102 -> a
     107:109:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):103:105 -> a
     1:1:void registerInitClass(com.android.tools.r8.graph.DexType):48:48 -> b
@@ -3383,7 +3370,7 @@
     2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):98:98 -> f
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):53:53 -> g
     2:2:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):93:93 -> g
-com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.W3:
+com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.T3:
     java.util.Set exceptions -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():24:24 -> <clinit>
@@ -4254,7 +4241,7 @@
     3672:3672:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):400:400 -> a
     3673:3673:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):400:400 -> a
     2989:2989:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):401:401 -> a
-com.android.tools.r8.androidapi.ComputedApiLevel -> com.android.tools.r8.internal.Sc:
+com.android.tools.r8.androidapi.ComputedApiLevel -> com.android.tools.r8.internal.uc:
     int $r8$clinit -> a
     1:1:void <clinit>():15:15 -> <clinit>
     boolean isUnknownApiLevel() -> C
@@ -4268,10 +4255,10 @@
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel unknown():22:22 -> j
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel notSet():18:18 -> t
     boolean isKnownApiLevel() -> u
-com.android.tools.r8.androidapi.ComputedApiLevel$1 -> com.android.tools.r8.internal.Rc:
+com.android.tools.r8.androidapi.ComputedApiLevel$1 -> com.android.tools.r8.internal.tc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():42:42 -> <clinit>
-com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel -> com.android.tools.r8.internal.Sc$a:
+com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel -> com.android.tools.r8.internal.uc$a:
     com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel PLATFORM_INSTANCE -> c
     com.android.tools.r8.utils.AndroidApiLevel apiLevel -> b
     1:1:void <clinit>():124:124 -> <clinit>
@@ -4283,14 +4270,14 @@
     1:1:int hashCode():166:166 -> hashCode
     1:1:java.lang.String toString():149:149 -> toString
     boolean isKnownApiLevel() -> u
-com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel -> com.android.tools.r8.internal.Tc:
+com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel -> com.android.tools.r8.internal.vc:
     com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel INSTANCE -> b
     1:1:void <clinit>():75:75 -> <clinit>
     1:1:void <init>():77:77 -> <init>
     boolean isNotSetApiLevel() -> E
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel access$000():73:73 -> a
     1:1:int hashCode():91:91 -> hashCode
-com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel -> com.android.tools.r8.internal.Uc:
+com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel -> com.android.tools.r8.internal.wc:
     com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel INSTANCE -> b
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>():99:99 -> <init>
@@ -4298,20 +4285,20 @@
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel access$100():95:95 -> a
     1:1:int hashCode():118:118 -> hashCode
     1:1:java.lang.String toString():108:108 -> toString
-com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.X4:
+com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.U4:
     1:4:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):80:83 -> a
     5:22:void com.android.tools.r8.bisect.Bisect.writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):186:203 -> a
     5:22:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):86 -> a
     23:29:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):87:93 -> a
-com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.X4$a:
+com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.U4$a:
     com.android.tools.r8.bisect.BisectOptions$Result apply(com.android.tools.r8.graph.DexApplication) -> a
-com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.internal.Y4:
+com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.internal.V4:
     com.android.tools.r8.bisect.BisectOptions$Result UNKNOWN -> b
     com.android.tools.r8.bisect.BisectOptions$Result GOOD -> c
     com.android.tools.r8.bisect.BisectOptions$Result BAD -> d
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):33:33 -> <init>
-com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.c5:
+com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.Z4:
     java.nio.file.Path stateFile -> e
     com.android.tools.r8.graph.DexApplication badApp -> b
     java.util.Map indexMap -> d
@@ -4351,64 +4338,65 @@
     251:251:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):202 -> a
     252:252:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):202:202 -> a
     273:279:com.android.tools.r8.graph.DexApplication bisect():240:246 -> a
-    280:282:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():288:290 -> a
-    280:282:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    283:283:boolean com.android.tools.r8.bisect.BisectState$Run.isBad():140:140 -> a
-    283:283:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():291 -> a
-    283:283:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    284:284:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():292:292 -> a
+    280:283:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():288:291 -> a
+    280:283:com.android.tools.r8.graph.DexApplication bisect():249 -> a
+    284:284:boolean com.android.tools.r8.bisect.BisectState$Run.isBad():140:140 -> a
+    284:284:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():291 -> a
     284:284:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    285:285:boolean com.android.tools.r8.bisect.BisectState$Range.isEmpty():53:53 -> a
-    285:285:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.sub(com.android.tools.r8.bisect.BisectState$Range):72 -> a
-    285:285:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():292 -> a
+    285:285:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():292:292 -> a
     285:285:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    286:291:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.sub(com.android.tools.r8.bisect.BisectState$Range):75:80 -> a
-    286:291:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():292 -> a
-    286:291:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    292:292:boolean com.android.tools.r8.bisect.BisectState$Range.isEmpty():53:53 -> a
-    292:292:com.android.tools.r8.graph.DexApplication bisect():250 -> a
-    293:296:com.android.tools.r8.graph.DexApplication bisect():254:257 -> a
-    297:297:int com.android.tools.r8.bisect.BisectState$Range.size():57:57 -> a
-    297:297:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.split():84 -> a
-    297:297:com.android.tools.r8.graph.DexApplication bisect():258 -> a
-    298:299:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.split():84:85 -> a
-    298:299:com.android.tools.r8.graph.DexApplication bisect():258 -> a
-    300:302:com.android.tools.r8.graph.DexApplication bisect():258:260 -> a
-    303:303:com.android.tools.r8.graph.DexApplication bisect():0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":591,"2":592,"3":593}}
-    591:591:com.android.tools.r8.graph.DexApplication bisect():260:260 -> a
-    592:592:com.android.tools.r8.graph.DexApplication bisect():260:260 -> a
+    286:286:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.sub(com.android.tools.r8.bisect.BisectState$Range):72:72 -> a
+    286:286:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():292 -> a
+    286:286:com.android.tools.r8.graph.DexApplication bisect():249 -> a
+    287:287:boolean com.android.tools.r8.bisect.BisectState$Range.isEmpty():53:53 -> a
+    287:287:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.sub(com.android.tools.r8.bisect.BisectState$Range):72 -> a
+    287:287:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():292 -> a
+    287:287:com.android.tools.r8.graph.DexApplication bisect():249 -> a
+    288:293:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.sub(com.android.tools.r8.bisect.BisectState$Range):75:80 -> a
+    288:293:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():292 -> a
+    288:293:com.android.tools.r8.graph.DexApplication bisect():249 -> a
+    294:294:boolean com.android.tools.r8.bisect.BisectState$Range.isEmpty():53:53 -> a
+    294:294:com.android.tools.r8.graph.DexApplication bisect():250 -> a
+    295:298:com.android.tools.r8.graph.DexApplication bisect():254:257 -> a
+    299:299:int com.android.tools.r8.bisect.BisectState$Range.size():57:57 -> a
+    299:299:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.split():84 -> a
+    299:299:com.android.tools.r8.graph.DexApplication bisect():258 -> a
+    300:301:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.split():84:85 -> a
+    300:301:com.android.tools.r8.graph.DexApplication bisect():258 -> a
+    302:304:com.android.tools.r8.graph.DexApplication bisect():258:260 -> a
+    305:305:com.android.tools.r8.graph.DexApplication bisect():0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":593,"2":594,"3":595}}
     593:593:com.android.tools.r8.graph.DexApplication bisect():260:260 -> a
-    563:567:com.android.tools.r8.graph.DexApplication bisect():260:264 -> a
-    568:569:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.bisect.BisectState.getGoodClass(com.android.tools.r8.graph.DexProgramClass):280:281 -> a
-    568:569:com.android.tools.r8.graph.DexApplication bisect():265 -> a
-    570:570:boolean com.android.tools.r8.bisect.BisectState$Range.contains(int):89:89 -> a
-    570:570:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.bisect.BisectState.getGoodClass(com.android.tools.r8.graph.DexProgramClass):281 -> a
-    570:570:com.android.tools.r8.graph.DexApplication bisect():265 -> a
-    571:571:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.bisect.BisectState.getGoodClass(com.android.tools.r8.graph.DexProgramClass):282:282 -> a
-    571:571:com.android.tools.r8.graph.DexApplication bisect():265 -> a
-    572:576:com.android.tools.r8.graph.DexApplication bisect():267:271 -> a
-    577:577:boolean com.android.tools.r8.bisect.BisectState$Range.isEmpty():53:53 -> a
-    577:577:com.android.tools.r8.graph.DexApplication bisect():271 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    578:583:com.android.tools.r8.graph.DexApplication bisect():271:276 -> a
-    584:584:com.android.tools.r8.graph.DexApplication bisect():251:251 -> a
-    585:585:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    585:585:com.android.tools.r8.graph.DexApplication bisect():251 -> a
-    586:586:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    586:586:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    586:586:com.android.tools.r8.graph.DexApplication bisect():251 -> a
-    587:587:com.android.tools.r8.graph.DexApplication bisect():251:251 -> a
-    588:590:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():294:296 -> a
-    588:590:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    594:595:java.util.List getSortedClasses(com.android.tools.r8.graph.DexApplication):325:326 -> a
-    596:596:int lambda$getSortedClasses$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):326:326 -> a
+    594:594:com.android.tools.r8.graph.DexApplication bisect():260:260 -> a
+    595:595:com.android.tools.r8.graph.DexApplication bisect():260:260 -> a
+    565:569:com.android.tools.r8.graph.DexApplication bisect():260:264 -> a
+    570:571:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.bisect.BisectState.getGoodClass(com.android.tools.r8.graph.DexProgramClass):280:281 -> a
+    570:571:com.android.tools.r8.graph.DexApplication bisect():265 -> a
+    572:572:boolean com.android.tools.r8.bisect.BisectState$Range.contains(int):89:89 -> a
+    572:572:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.bisect.BisectState.getGoodClass(com.android.tools.r8.graph.DexProgramClass):281 -> a
+    572:572:com.android.tools.r8.graph.DexApplication bisect():265 -> a
+    573:573:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.bisect.BisectState.getGoodClass(com.android.tools.r8.graph.DexProgramClass):282:282 -> a
+    573:573:com.android.tools.r8.graph.DexApplication bisect():265 -> a
+    574:578:com.android.tools.r8.graph.DexApplication bisect():267:271 -> a
+    579:579:boolean com.android.tools.r8.bisect.BisectState$Range.isEmpty():53:53 -> a
+    579:579:com.android.tools.r8.graph.DexApplication bisect():271 -> a
+    580:585:com.android.tools.r8.graph.DexApplication bisect():271:276 -> a
+    586:586:com.android.tools.r8.graph.DexApplication bisect():251:251 -> a
+    587:587:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    587:587:com.android.tools.r8.graph.DexApplication bisect():251 -> a
+    588:588:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    588:588:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    588:588:com.android.tools.r8.graph.DexApplication bisect():251 -> a
+    589:589:com.android.tools.r8.graph.DexApplication bisect():251:251 -> a
+    590:592:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState.getLastBadRange():294:296 -> a
+    590:592:com.android.tools.r8.graph.DexApplication bisect():249 -> a
+    596:597:java.util.List getSortedClasses(com.android.tools.r8.graph.DexApplication):325:326 -> a
+    598:598:int lambda$getSortedClasses$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):326:326 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getFinalClass():232:232 -> b
     2:2:int com.android.tools.r8.bisect.BisectState$Range.size():57:57 -> b
     2:2:com.android.tools.r8.graph.DexProgramClass getFinalClass():232 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.graph.DexProgramClass getFinalClass():234:234 -> b
-    4:9:java.lang.String makeSignature(com.android.tools.r8.graph.DexApplication):332:337 -> b
+    3:4:com.android.tools.r8.graph.DexProgramClass getFinalClass():233:234 -> b
+    5:10:java.lang.String makeSignature(com.android.tools.r8.graph.DexApplication):332:337 -> b
     1:5:void read():172:176 -> c
     6:6:void read():0:0 -> c
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":212,"2":213,"3":214}}
@@ -4433,25 +4421,23 @@
     210:210:void com.android.tools.r8.bisect.BisectState.$closeResource(java.lang.Throwable,java.lang.AutoCloseable):189:189 -> c
     210:210:void read():189 -> c
     211:211:void read():189:189 -> c
-    1:7:void write():308:314 -> d
-    8:10:void com.android.tools.r8.bisect.BisectState$Run.write(java.io.Writer):134:136 -> d
-    8:10:void write():315 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:13:void com.android.tools.r8.bisect.BisectState$Range.write(java.io.Writer):47:49 -> d
-    11:13:void com.android.tools.r8.bisect.BisectState$Run.write(java.io.Writer):136 -> d
-    11:13:void write():315 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    14:16:void write():316:318 -> d
-    17:19:void com.android.tools.r8.bisect.BisectState$Range.write(java.io.Writer):47:49 -> d
-    17:19:void write():318 -> d
-    20:21:void write():319:320 -> d
-    22:22:void com.android.tools.r8.bisect.BisectState.$closeResource(java.lang.Throwable,java.lang.AutoCloseable):189:189 -> d
-    22:22:void write():321 -> d
-    23:23:void write():311:311 -> d
-    24:24:void com.android.tools.r8.bisect.BisectState.$closeResource(java.lang.Throwable,java.lang.AutoCloseable):189:189 -> d
-    24:24:void write():321 -> d
-    25:25:void write():321:321 -> d
-com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.a5:
+    1:8:void write():308:315 -> d
+    9:11:void com.android.tools.r8.bisect.BisectState$Run.write(java.io.Writer):134:136 -> d
+    9:11:void write():315 -> d
+    12:14:void com.android.tools.r8.bisect.BisectState$Range.write(java.io.Writer):47:49 -> d
+    12:14:void com.android.tools.r8.bisect.BisectState$Run.write(java.io.Writer):136 -> d
+    12:14:void write():315 -> d
+    15:17:void write():316:318 -> d
+    18:20:void com.android.tools.r8.bisect.BisectState$Range.write(java.io.Writer):47:49 -> d
+    18:20:void write():318 -> d
+    21:22:void write():319:320 -> d
+    23:23:void com.android.tools.r8.bisect.BisectState.$closeResource(java.lang.Throwable,java.lang.AutoCloseable):189:189 -> d
+    23:23:void write():321 -> d
+    24:24:void write():311:311 -> d
+    25:25:void com.android.tools.r8.bisect.BisectState.$closeResource(java.lang.Throwable,java.lang.AutoCloseable):189:189 -> d
+    25:25:void write():321 -> d
+    26:26:void write():321:321 -> d
+com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.X4:
     int end -> b
     boolean $assertionsDisabled -> c
     int start -> a
@@ -4460,11 +4446,11 @@
     5:9:void <init>(java.lang.String):39:43 -> <init>
     1:1:boolean com.android.tools.r8.bisect.BisectState$Range.isEmpty():53:53 -> a
     1:1:com.android.tools.r8.bisect.BisectState$Range add(com.android.tools.r8.bisect.BisectState$Range):61 -> a
-    2:2:boolean com.android.tools.r8.bisect.BisectState$Range.isEmpty():53:53 -> a
-    2:2:com.android.tools.r8.bisect.BisectState$Range add(com.android.tools.r8.bisect.BisectState$Range):64 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:4:com.android.tools.r8.bisect.BisectState$Range add(com.android.tools.r8.bisect.BisectState$Range):67:68 -> a
-    5:5:boolean verify():112:112 -> a
+    2:2:com.android.tools.r8.bisect.BisectState$Range add(com.android.tools.r8.bisect.BisectState$Range):64:64 -> a
+    3:3:boolean com.android.tools.r8.bisect.BisectState$Range.isEmpty():53:53 -> a
+    3:3:com.android.tools.r8.bisect.BisectState$Range add(com.android.tools.r8.bisect.BisectState$Range):64 -> a
+    4:5:com.android.tools.r8.bisect.BisectState$Range add(com.android.tools.r8.bisect.BisectState$Range):67:68 -> a
+    6:6:boolean verify():112:112 -> a
     1:5:boolean equals(java.lang.Object):99:103 -> equals
     1:1:int hashCode():108:108 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
@@ -4478,14 +4464,14 @@
     97:97:java.lang.String toString():94:94 -> toString
     98:98:java.lang.String toString():94:94 -> toString
     99:99:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.b5:
+com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.Y4:
     boolean good -> a
     com.android.tools.r8.bisect.BisectState$Range range -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():116:116 -> <clinit>
     1:4:void <init>(com.android.tools.r8.bisect.BisectOptions$Result,com.android.tools.r8.bisect.BisectState$Range):120:123 -> <init>
     5:9:void <init>(java.lang.String):126:130 -> <init>
-com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.R6:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.M6:
     java.util.Map knownTypeFields -> r
     java.util.Set imports -> j
     boolean pendingComma -> p
@@ -4923,7 +4909,7 @@
     1:2:java.util.List getImports():104:105 -> i
     1:1:java.util.List getMethods():110:110 -> j
     1:1:java.util.Set getSynthesizedTypes():644:644 -> k
-com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.o8:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.f8:
     java.util.List sortedLabels -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labelToIndex -> c
     com.android.tools.r8.naming.ClassNameMapper mapper -> f
@@ -5175,7 +5161,7 @@
     1:1:void print(com.android.tools.r8.cf.code.CfReturnVoid):356:356 -> f
     1:1:void print(com.android.tools.r8.cf.code.CfArrayLength):557:557 -> g
     1:1:java.lang.String toString():816:816 -> toString
-com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.n8:
+com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.e8:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> d
@@ -5184,7 +5170,7 @@
     2:2:void <clinit>():673:673 -> <clinit>
     3:3:void <clinit>():319:319 -> <clinit>
     4:4:void <clinit>():275:275 -> <clinit>
-com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.r8:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.i8:
     boolean $assertionsDisabled -> n
     int maxRegisterNumber -> l
     com.android.tools.r8.graph.AppView appView -> a
@@ -5317,7 +5303,7 @@
     47:47:void com.android.tools.r8.cf.CfRegisterAllocator.updateFirstStackByJoiningTheSecond(java.util.List,java.util.List):605:605 -> b
     47:47:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):394 -> b
     1:1:int registersUsed():123:123 -> c
-com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.q8:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.h8:
     java.util.List stack -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap registers -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List):71:73 -> <init>
@@ -5327,7 +5313,7 @@
     91:91:java.lang.String toString():78:78 -> toString
     92:92:java.lang.String toString():79:79 -> toString
     81:89:java.lang.String toString():80:88 -> toString
-com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.Z8:
+com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.P8:
     com.android.tools.r8.cf.CfVersion V17 -> n
     com.android.tools.r8.cf.CfVersion V12 -> l
     com.android.tools.r8.cf.CfVersion V15 -> m
@@ -5353,15 +5339,13 @@
     2:2:boolean lambda$rangeInclusive$1(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):99:99 -> b
     1:1:com.android.tools.r8.cf.CfVersion fromRaw(int):70:70 -> c
     2:2:int raw():82:82 -> c
-    3:3:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):94:94 -> c
-    4:4:boolean com.android.tools.r8.cf.CfVersion.isPreview():86:86 -> c
-    4:4:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):95 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):95:95 -> c
-    6:6:boolean com.android.tools.r8.cf.CfVersion.isPreview():86:86 -> c
-    6:6:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):96 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:11:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):96:100 -> c
+    3:4:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):94:95 -> c
+    5:5:boolean com.android.tools.r8.cf.CfVersion.isPreview():86:86 -> c
+    5:5:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):95 -> c
+    6:7:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):95:96 -> c
+    8:8:boolean com.android.tools.r8.cf.CfVersion.isPreview():86:86 -> c
+    8:8:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):96 -> c
+    9:13:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):96:100 -> c
     1:1:boolean equals(java.lang.Object):115:115 -> equals
     1:1:int hashCode():120:120 -> hashCode
     2:2:int com.android.tools.r8.utils.structural.HashCodeVisitor.run(com.android.tools.r8.utils.structural.StructuralItem):28:28 -> hashCode
@@ -5380,7 +5364,7 @@
     255:255:java.lang.String toString():125:125 -> toString
     256:256:java.lang.String toString():125:125 -> toString
     253:253:java.lang.String toString():125:125 -> toString
-com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.yk:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.dk:
     com.android.tools.r8.ir.code.Phi phi -> r
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
     boolean isConstant() -> J
@@ -5388,7 +5372,6 @@
     1:1:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26:26 -> a
     2:2:int com.android.tools.r8.cf.CfRegisterAllocator.getRegisterForValue(com.android.tools.r8.ir.code.Value,int):128:128 -> a
     2:2:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> g0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":47,"2":48,"3":49}}
@@ -5396,7 +5379,7 @@
     48:48:java.lang.String toString():45:45 -> toString
     49:49:java.lang.String toString():45:45 -> toString
     46:46:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.IC:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.RB:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map clonableConstants -> d
     boolean $assertionsDisabled -> f
@@ -5554,14 +5537,14 @@
     99:101:void com.android.tools.r8.cf.LoadStoreHelper.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionListIterator):287:289 -> b
     99:101:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):205 -> b
     102:104:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):206:208 -> b
-com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.GC:
+com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.PB:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():64:64 -> <clinit>
-com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.HC:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.QB:
     com.android.tools.r8.ir.code.Phi phi -> a
     com.android.tools.r8.ir.code.Value operand -> b
     1:3:void <init>(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):235:237 -> <init>
-com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.v10:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.LZ:
     boolean computingVerificationTypes -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> e
@@ -5617,10 +5600,10 @@
     196:196:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):167:167 -> b
     197:197:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):165:165 -> b
     198:198:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):163:163 -> b
-com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.q10:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.GZ:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():161:161 -> <clinit>
-com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.r10:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.HZ:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
@@ -5628,7 +5611,7 @@
     2:4:void <init>(com.android.tools.r8.graph.DexType):44:46 -> <init>
     1:1:com.android.tools.r8.graph.DexType getDexType():51:51 -> a
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.s10:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.IZ:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():60:60 -> <clinit>
@@ -5642,7 +5625,7 @@
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo.getDexType():70:70 -> toString
     2:2:java.lang.String toString():75 -> toString
     3:3:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.t10:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.JZ:
     com.android.tools.r8.ir.code.Argument thisArgument -> b
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> c
@@ -5657,9 +5640,9 @@
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo.getDexType():92:92 -> toString
     2:2:java.lang.String toString():97 -> toString
     3:3:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.u10:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.KZ:
     com.android.tools.r8.graph.DexType getDexType() -> a
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.B6:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.x6:
     com.android.tools.r8.ir.code.NumericType type -> c
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode opcode -> b
     int $r8$clinit -> e
@@ -5704,12 +5687,12 @@
     243:243:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):212:212 -> a
     1:1:boolean canThrow():166:166 -> q
     1:1:int getCompareToId():52:52 -> s
-com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.A6:
+com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.w6:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> b
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfArithmeticBinop$Opcode -> a
     1:1:void <clinit>():134:134 -> <clinit>
     2:2:void <clinit>():117:117 -> <clinit>
-com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.B6$a:
+com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.x6$a:
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] $VALUES -> g
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Add -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Rem -> f
@@ -5720,7 +5703,7 @@
     6:6:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(java.lang.String,int):32:32 -> <init>
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] values():32:32 -> a
-com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.C6:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.y6:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>():27:27 -> <init>
@@ -5735,7 +5718,7 @@
     11:11:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
     11:11:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):86 -> a
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.D6:
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.z6:
     com.android.tools.r8.ir.code.MemberType type -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -5770,7 +5753,7 @@
     49:50:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):132:133 -> a
     boolean canThrow() -> q
     1:1:int getCompareToId():42:42 -> s
-com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.E6:
+com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.A6:
     com.android.tools.r8.ir.code.MemberType type -> b
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType):34:35 -> <init>
     1:19:int getStoreType():54:72 -> F
@@ -5790,7 +5773,7 @@
     9:11:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):122:124 -> a
     boolean canThrow() -> q
     1:1:int getCompareToId():44:44 -> s
-com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.I6:
+com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.D6:
     com.android.tools.r8.graph.DexType type -> b
     boolean ignoreCompatRules -> c
     1:1:void <init>(com.android.tools.r8.graph.DexType):36:36 -> <init>
@@ -5800,7 +5783,7 @@
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):76 -> a
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):89 -> a
     5:5:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):90:90 -> a
     6:6:void print(com.android.tools.r8.cf.CfPrinter):95:95 -> a
@@ -5818,7 +5801,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.P6:
+com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.K6:
     com.android.tools.r8.ir.code.Cmp$Bias bias -> b
     com.android.tools.r8.ir.code.NumericType type -> c
     boolean $assertionsDisabled -> d
@@ -5847,10 +5830,10 @@
     11:11:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
     11:11:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):137 -> a
     1:1:int getCompareToId():49:49 -> s
-com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.O6:
+com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.J6:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():84:84 -> <clinit>
-com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.U6:
+com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.P6:
     com.android.tools.r8.graph.DexType type -> b
     boolean ignoreCompatRules -> c
     1:3:void <init>(com.android.tools.r8.graph.DexType,boolean):39:41 -> <init>
@@ -5865,10 +5848,10 @@
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":60,"2":61,"3":62}}
     60:60:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):103:103 -> a
     60:60:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):89 -> a
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     61:61:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):103 -> a
     61:61:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):89 -> a
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     62:62:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):103 -> a
     62:62:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):89 -> a
     6:27:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104:125 -> a
@@ -5911,7 +5894,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.V6:
+com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.Q6:
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():40:40 -> <clinit>
@@ -5924,39 +5907,32 @@
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):145:145 -> a
     3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.cf.code.CfConstDynamic.getName():73:73 -> a
     3:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):145 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):145:145 -> a
     5:5:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
     5:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):145 -> a
     6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfConstDynamic.getType():169:169 -> a
     6:6:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):149 -> a
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfConstDynamic.getType():169:169 -> a
-    7:7:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):149 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):149:149 -> a
-    9:9:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> a
-    9:9:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):149 -> a
-    10:10:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.cf.code.CfConstDynamic.getBootstrapMethod():77:77 -> a
-    10:10:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):153 -> a
+    7:7:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):149:149 -> a
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfConstDynamic.getType():169:169 -> a
+    8:8:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):149 -> a
+    9:9:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):149:149 -> a
+    10:10:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> a
+    10:10:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):149 -> a
     11:11:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.cf.code.CfConstDynamic.getBootstrapMethod():77:77 -> a
-    11:11:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):154 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    11:11:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):153 -> a
     12:12:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):154:154 -> a
-    13:13:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):188:188 -> a
-    14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    14:14:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):188 -> a
-    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    15:15:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):188 -> a
-    16:16:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):188:188 -> a
-    17:17:void print(com.android.tools.r8.cf.CfPrinter):193:193 -> a
-    18:20:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):204:206 -> a
-    21:23:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):205:207 -> a
-    24:24:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):212:212 -> a
-    25:25:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    25:25:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):212 -> a
-    26:26:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    26:26:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    13:13:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.cf.code.CfConstDynamic.getBootstrapMethod():77:77 -> a
+    13:13:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):154 -> a
+    14:14:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):154:154 -> a
+    15:15:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):188:188 -> a
+    16:16:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    16:16:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):188 -> a
+    17:17:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):188:188 -> a
+    18:18:void print(com.android.tools.r8.cf.CfPrinter):193:193 -> a
+    19:21:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):204:206 -> a
+    22:24:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):205:207 -> a
+    25:25:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):212:212 -> a
+    26:26:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     26:26:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):212 -> a
     27:27:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):212:212 -> a
     28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):218:218 -> a
@@ -5967,7 +5943,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.W6:
+com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.R6:
     com.android.tools.r8.graph.DexMethodHandle handle -> b
     1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):34:35 -> <init>
     1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():39:39 -> F
@@ -5976,11 +5952,11 @@
     6:6:void print(com.android.tools.r8.cf.CfPrinter):71:71 -> a
     7:7:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):77:77 -> a
     8:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88:89 -> a
-    10:18:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1272:1280 -> a
+    10:18:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1228:1236 -> a
     10:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88 -> a
-    19:23:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1279:1283 -> a
+    19:23:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1235:1239 -> a
     19:23:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1273:1273 -> a
+    24:24:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1229:1229 -> a
     24:24:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88 -> a
     25:25:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):107:107 -> a
     26:26:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
@@ -5989,7 +5965,7 @@
     27:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):95 -> a
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.X6:
+com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.S6:
     com.android.tools.r8.graph.DexProto type -> b
     1:2:void <init>(com.android.tools.r8.graph.DexProto):34:35 -> <init>
     1:1:com.android.tools.r8.graph.DexProto getType():39:39 -> F
@@ -5999,27 +5975,29 @@
     4:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):50:50 -> a
     5:5:void print(com.android.tools.r8.cf.CfPrinter):69:69 -> a
     6:6:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):75:75 -> a
-    7:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86:87 -> a
-    9:17:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1287:1295 -> a
-    9:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86 -> a
-    18:22:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1294:1298 -> a
-    18:22:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86 -> a
-    23:23:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1288:1288 -> a
-    23:23:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86 -> a
-    24:24:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):105:105 -> a
-    25:25:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
-    25:25:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):105 -> a
-    26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():347:347 -> a
-    26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):93 -> a
+    7:9:void com.android.tools.r8.graph.UseRegistry.registerProto(com.android.tools.r8.graph.DexProto):253:255 -> a
+    7:9:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):75 -> a
+    10:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86:87 -> a
+    12:20:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1243:1251 -> a
+    12:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86 -> a
+    21:25:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1250:1254 -> a
+    21:25:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86 -> a
+    26:26:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1244:1244 -> a
+    26:26:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86 -> a
+    27:27:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):105:105 -> a
+    28:28:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    28:28:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):105 -> a
+    29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():347:347 -> a
+    29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):93 -> a
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.Y6:
+com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.T6:
     1:1:void <init>():27:27 -> <init>
     1:1:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):39:39 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):50:50 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):55:55 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):60:60 -> a
-    5:5:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):1260:1260 -> a
+    5:5:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):1216:1216 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):60 -> a
     6:6:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):78:78 -> a
     7:7:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
@@ -6027,7 +6005,7 @@
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():106:106 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):66 -> a
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.a7:
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.V6:
     com.android.tools.r8.ir.code.ValueType type -> c
     long value -> b
     int $r8$clinit -> e
@@ -6070,10 +6048,10 @@
     285:285:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
     285:285:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):181 -> a
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.Z6:
+com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.U6:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():92:92 -> <clinit>
-com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.b7:
+com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.W6:
     com.android.tools.r8.graph.DexString string -> b
     1:2:void <init>(com.android.tools.r8.graph.DexString):30:31 -> <init>
     1:1:com.android.tools.r8.graph.DexString getString():46:46 -> F
@@ -6084,7 +6062,7 @@
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):73:73 -> a
     5:5:void print(com.android.tools.r8.cf.CfPrinter):78:78 -> a
     6:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):89:90 -> a
-    8:10:void com.android.tools.r8.ir.conversion.IRBuilder.addConstString(int,com.android.tools.r8.graph.DexString):1306:1308 -> a
+    8:10:void com.android.tools.r8.ir.conversion.IRBuilder.addConstString(int,com.android.tools.r8.graph.DexString):1262:1264 -> a
     8:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):89 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():106:106 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):96 -> a
@@ -6094,7 +6072,7 @@
     com.android.tools.r8.cf.code.CfConstString asConstString() -> d
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.c7:
+com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.X6:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> c
     com.android.tools.r8.graph.DexReference item -> b
     boolean $assertionsDisabled -> d
@@ -6112,7 +6090,7 @@
     7:7:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):99 -> a
     8:9:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):99:100 -> a
     10:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):106:107 -> a
-    12:15:void com.android.tools.r8.ir.conversion.IRBuilder.addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1313:1316 -> a
+    12:15:void com.android.tools.r8.ir.conversion.IRBuilder.addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1269:1272 -> a
     12:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):106 -> a
     16:16:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):127:127 -> a
     17:17:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
@@ -6120,7 +6098,7 @@
     com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> e
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.d7:
+com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.Y6:
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
     com.android.tools.r8.graph.DexField declaringField -> d
@@ -6135,11 +6113,10 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):39:39 -> a
     3:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):84:84 -> a
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):111:111 -> a
-    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
+    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
     5:5:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):111 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):112:112 -> a
-    7:7:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
+    7:7:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
     7:7:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):112 -> a
     8:11:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):113:116 -> a
     12:12:void print(com.android.tools.r8.cf.CfPrinter):121:121 -> a
@@ -6189,7 +6166,7 @@
     boolean canThrow() -> q
     1:1:int getCompareToId():78:78 -> s
     boolean isFieldInstruction() -> v
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.m7:
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.g7:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> b
     java.util.Deque stack -> c
     boolean $assertionsDisabled -> d
@@ -6235,8 +6212,7 @@
     int getCompareToId() -> s
     1:1:java.lang.String toString():468:468 -> toString
     boolean isFrame() -> w
-com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.internal.e7:
-com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.f7:
+com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.Z6:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):40:40 -> <init>
     2:2:void <init>():126:126 -> <init>
     com.android.tools.r8.graph.DexType getInitializedType() -> a
@@ -6271,7 +6247,7 @@
     boolean isWide() -> h
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType top():55:55 -> i
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedThis():51:51 -> j
-com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.internal.g7:
+com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.internal.a7:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():183:183 -> <clinit>
@@ -6281,9 +6257,9 @@
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":444,"2":445,"3":446}}
     444:444:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):199:199 -> a
-    445:445:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    445:445:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     445:445:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):199 -> a
-    446:446:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    446:446:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     446:446:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):199 -> a
     202:217:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):200:215 -> a
     218:218:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):0:0 -> a
@@ -6304,28 +6280,28 @@
     197:197:java.lang.String toString():194:194 -> toString
     198:198:java.lang.String toString():194:194 -> toString
     195:195:java.lang.String toString():194:194 -> toString
-com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.h7:
+com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.b7:
     com.android.tools.r8.cf.code.CfFrame$OneWord SINGLETON -> a
     1:1:void <clinit>():312:312 -> <clinit>
     1:1:void <init>():310:310 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):316:316 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$OneWord access$400():310:310 -> k
     1:1:java.lang.String toString():326:326 -> toString
-com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.i7:
+com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.c7:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
     1:1:void <clinit>():237:237 -> <clinit>
     1:1:void <init>():235:235 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):246:246 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$Top access$300():235:235 -> k
     1:1:java.lang.String toString():241:241 -> toString
-com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.j7:
+com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.d7:
     com.android.tools.r8.cf.code.CfFrame$TwoWord SINGLETON -> a
     1:1:void <clinit>():332:332 -> <clinit>
     1:1:void <init>():330:330 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):336:336 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$TwoWord access$500():330:330 -> k
     1:1:java.lang.String toString():351:351 -> toString
-com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.k7:
+com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.e7:
     com.android.tools.r8.cf.code.CfLabel label -> a
     com.android.tools.r8.graph.DexType type -> b
     1:1:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfFrame$1):255:255 -> <init>
@@ -6334,12 +6310,12 @@
     1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():281:281 -> b
     1:1:com.android.tools.r8.graph.DexType getUninitializedNewType():286:286 -> c
     1:1:java.lang.String toString():266:266 -> toString
-com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.l7:
+com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.f7:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):290:290 -> <init>
     2:2:void <init>():292:292 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):296:296 -> a
     1:1:java.lang.String toString():301:301 -> toString
-com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.n7:
+com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.h7:
     java.util.Map stateMap -> d
     com.android.tools.r8.graph.GraphLens graphLens -> g
     java.util.Set tryCatchRangeLabels -> j
@@ -6506,7 +6482,7 @@
     13:13:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedNew():0:0 -> b
     13:13:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):265 -> b
     14:14:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):268:268 -> b
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):387:387 -> b
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):391:391 -> b
     15:15:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):268 -> b
     16:16:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):268:268 -> b
     1:5:com.android.tools.r8.cf.code.CfFrame$FrameType pop():99:103 -> c
@@ -6515,17 +6491,16 @@
     8:8:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedThis():0:0 -> c
     8:8:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):258 -> c
     9:9:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):261:261 -> c
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):387:387 -> c
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):391:391 -> c
     10:10:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):261 -> c
     11:11:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):261:261 -> c
     1:1:void setNoFrame():254:254 -> d
-com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.o7:
+com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.i7:
     com.android.tools.r8.cf.code.CfLabel target -> b
     1:2:void <init>(com.android.tools.r8.cf.code.CfLabel):30:31 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):42:42 -> a
     2:2:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):42 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):75:75 -> a
     4:4:void print(com.android.tools.r8.cf.CfPrinter):80:80 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):85:85 -> a
@@ -6534,7 +6509,7 @@
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):91 -> a
     int getCompareToId() -> s
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():62:62 -> t
-com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.q7:
+com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.k7:
     com.android.tools.r8.ir.code.ValueType type -> c
     com.android.tools.r8.ir.code.If$Type kind -> b
     boolean $assertionsDisabled -> e
@@ -6556,13 +6531,12 @@
     1:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):50:53 -> a
     5:5:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
     5:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):53 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void print(com.android.tools.r8.cf.CfPrinter):90:90 -> a
     7:7:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):103:103 -> a
     8:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):118:121 -> a
-    12:12:void com.android.tools.r8.ir.conversion.IRBuilder.addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1489:1489 -> a
+    12:12:void com.android.tools.r8.ir.conversion.IRBuilder.addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1445:1445 -> a
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):121 -> a
-    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1487:1487 -> a
+    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1443:1443 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):121 -> a
     14:16:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):139:139 -> a
     18:18:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):141:141 -> a
@@ -6570,10 +6544,10 @@
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):127 -> a
     1:1:int getCompareToId():44:44 -> s
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():66:66 -> t
-com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.p7:
+com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.j7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.s7:
+com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.m7:
     com.android.tools.r8.ir.code.ValueType type -> c
     com.android.tools.r8.ir.code.If$Type kind -> b
     boolean $assertionsDisabled -> e
@@ -6595,13 +6569,12 @@
     1:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):50:53 -> a
     5:5:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
     5:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):53 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void print(com.android.tools.r8.cf.CfPrinter):90:90 -> a
     7:7:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):103:103 -> a
     8:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):118:122 -> a
-    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1460:1460 -> a
+    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1416:1416 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):122 -> a
-    14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1458:1458 -> a
+    14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1414:1414 -> a
     14:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):122 -> a
     15:17:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):141:143 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():267:267 -> a
@@ -6609,10 +6582,10 @@
     1:1:int getCompareToId():44:44 -> s
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():66:66 -> t
     boolean isConditionalJump() -> u
-com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.r7:
+com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.l7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.t7:
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.n7:
     int var -> b
     int increment -> c
     1:3:void <init>(int,int):37:39 -> <init>
@@ -6626,7 +6599,7 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):88:88 -> a
     8:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):98:98 -> a
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.u7:
+com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.o7:
     com.android.tools.r8.graph.DexType clazz -> b
     1:2:void <init>(com.android.tools.r8.graph.DexType):35:36 -> <init>
     1:1:com.android.tools.r8.graph.DexType getClassValue():40:40 -> F
@@ -6634,7 +6607,7 @@
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):55 -> a
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):75:75 -> a
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):75 -> a
     5:9:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):76:80 -> a
     10:10:void print(com.android.tools.r8.cf.CfPrinter):85:85 -> a
@@ -6646,13 +6619,13 @@
     16:16:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):120 -> a
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfInstanceFieldRead -> com.android.tools.r8.internal.v7:
+com.android.tools.r8.cf.code.CfInstanceFieldRead -> com.android.tools.r8.internal.p7:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):21:21 -> <init>
     1:1:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):27:27 -> a
-com.android.tools.r8.cf.code.CfInstanceFieldWrite -> com.android.tools.r8.internal.w7:
+com.android.tools.r8.cf.code.CfInstanceFieldWrite -> com.android.tools.r8.internal.q7:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):20:20 -> <init>
     1:1:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):26:26 -> a
-com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.x7:
+com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.r7:
     com.android.tools.r8.graph.DexType type -> b
     1:2:void <init>(com.android.tools.r8.graph.DexType):33:34 -> <init>
     boolean isTypeInstruction() -> E
@@ -6660,7 +6633,7 @@
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):65 -> a
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):88:88 -> a
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):88 -> a
     5:5:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
     6:6:void print(com.android.tools.r8.cf.CfPrinter):94:94 -> a
@@ -6676,7 +6649,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.y7:
+com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.s7:
     1:1:void <init>():31:31 -> <init>
     boolean isInvokeStatic() -> A
     boolean isInvokeVirtual() -> B
@@ -6719,7 +6692,7 @@
     boolean isInvoke() -> x
     boolean isInvokeInterface() -> y
     boolean isInvokeSpecial() -> z
-com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.F7:
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.y7:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod method -> b
     int opcode -> c
@@ -6766,13 +6739,11 @@
     14:20:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):62 -> a
     14:20:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):105 -> a
     21:21:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):106:106 -> a
-    22:22:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    22:22:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     22:22:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):106 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     23:27:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):107:111 -> a
     28:44:int com.android.tools.r8.ir.code.Invoke$Type.getCfOpcode():150:166 -> a
     28:44:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):111 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     45:45:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):111:111 -> a
     51:51:void print(com.android.tools.r8.cf.CfPrinter):116:116 -> a
     52:66:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):122:136 -> a
@@ -6786,29 +6757,26 @@
     211:211:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):127:127 -> a
     212:212:void com.android.tools.r8.graph.UseRegistry.registerInvokeSpecial(com.android.tools.r8.graph.DexMethod,boolean):71:71 -> a
     212:212:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):127 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     213:213:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):133:133 -> a
     219:221:boolean isInvokeSuper(com.android.tools.r8.graph.DexType):147:149 -> a
     222:267:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):182:227 -> a
     268:268:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":616,"2":617,"3":618}}
-    616:616:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):227:227 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":617,"2":618,"3":619}}
     617:617:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):227:227 -> a
     618:618:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):227:227 -> a
+    619:619:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):227:227 -> a
     495:495:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):227:227 -> a
     496:534:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):185:223 -> a
     535:538:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):214:217 -> a
-    539:539:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.IRBuilder.dexItemFactory():495:495 -> a
-    539:539:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):191 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    540:591:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):191:242 -> a
-    592:599:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):241:248 -> a
-    600:600:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):83:83 -> a
-    600:600:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
-    601:601:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":619,"2":620,"3":621,"4":622,"5":623}}
-    619:619:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):83:83 -> a
-    619:619:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
+    539:539:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):191:191 -> a
+    540:540:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.IRBuilder.dexItemFactory():491:491 -> a
+    540:540:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):191 -> a
+    541:592:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):191:242 -> a
+    593:600:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):241:248 -> a
+    601:601:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):83:83 -> a
+    601:601:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
+    602:602:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":620,"2":621,"3":622,"4":623,"5":624}}
     620:620:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):83:83 -> a
     620:620:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
     621:621:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):83:83 -> a
@@ -6817,84 +6785,82 @@
     622:622:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
     623:623:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):83:83 -> a
     623:623:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
-    602:602:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):83:83 -> a
-    602:602:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
-    603:607:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):73:77 -> a
-    603:607:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
-    608:614:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):75:81 -> a
-    608:614:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
-    615:615:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):246:246 -> a
-    624:675:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):254:305 -> a
-    676:676:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1089,"2":1090,"3":1091}}
-    1089:1089:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):305:305 -> a
+    624:624:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):83:83 -> a
+    624:624:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
+    603:603:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):83:83 -> a
+    603:603:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
+    604:608:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):73:77 -> a
+    604:608:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
+    609:615:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.Invoke$Type.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):75:81 -> a
+    609:615:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247 -> a
+    616:616:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):246:246 -> a
+    625:676:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):254:305 -> a
+    677:677:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1090,"2":1091,"3":1092}}
     1090:1090:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):305:305 -> a
     1091:1091:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):305:305 -> a
-    981:981:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):305:305 -> a
-    982:982:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):263:263 -> a
-    983:983:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    983:983:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):263 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    984:1000:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):263:279 -> a
-    1001:1001:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    1001:1001:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):279 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1002:1003:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):280:281 -> a
-    1004:1004:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270:270 -> a
-    1005:1005:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):336:336 -> a
-    1005:1005:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270 -> a
-    1006:1006:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2796:2796 -> a
-    1006:1006:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):336 -> a
+    1092:1092:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):305:305 -> a
+    982:982:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):305:305 -> a
+    983:983:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):263:263 -> a
+    984:984:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    984:984:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):263 -> a
+    985:1001:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):263:279 -> a
+    1002:1002:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    1002:1002:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):279 -> a
+    1003:1004:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):280:281 -> a
+    1005:1005:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270:270 -> a
+    1006:1006:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):336:336 -> a
     1006:1006:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270 -> a
-    1007:1012:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):337:342 -> a
-    1007:1012:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270 -> a
-    1013:1014:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):347:348 -> a
-    1013:1014:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):342 -> a
-    1013:1014:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270 -> a
-    1015:1015:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    1015:1015:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):348 -> a
-    1015:1015:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):342 -> a
-    1015:1015:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270 -> a
-    1016:1031:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):349:364 -> a
-    1016:1031:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):342 -> a
-    1016:1031:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270 -> a
-    1032:1032:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):271:271 -> a
-    1033:1033:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    1033:1033:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):271 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1034:1061:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):271:298 -> a
-    1062:1062:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    1062:1062:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):298 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1063:1064:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):299:300 -> a
-    1065:1081:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):146:162 -> a
-    1065:1081:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):308 -> a
-    1082:1082:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:200 -> a
-    1082:1082:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):160 -> a
-    1082:1082:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):308 -> a
-    1083:1083:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():168:168 -> a
-    1083:1083:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):158 -> a
+    1007:1007:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2796:2796 -> a
+    1007:1007:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):336 -> a
+    1007:1007:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270 -> a
+    1008:1013:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):337:342 -> a
+    1008:1013:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270 -> a
+    1014:1015:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):347:348 -> a
+    1014:1015:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):342 -> a
+    1014:1015:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270 -> a
+    1016:1016:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    1016:1016:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):348 -> a
+    1016:1016:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):342 -> a
+    1016:1016:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270 -> a
+    1017:1032:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):349:364 -> a
+    1017:1032:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):342 -> a
+    1017:1032:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):270 -> a
+    1033:1033:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):271:271 -> a
+    1034:1034:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    1034:1034:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):271 -> a
+    1035:1062:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):271:298 -> a
+    1063:1063:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    1063:1063:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):298 -> a
+    1064:1065:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):299:300 -> a
+    1066:1082:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):146:162 -> a
+    1066:1082:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):308 -> a
+    1083:1083:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:200 -> a
+    1083:1083:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):160 -> a
     1083:1083:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):308 -> a
-    1084:1084:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):156:156 -> a
+    1084:1084:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():168:168 -> a
+    1084:1084:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):158 -> a
     1084:1084:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):308 -> a
-    1085:1085:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):154:154 -> a
+    1085:1085:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):156:156 -> a
     1085:1085:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):308 -> a
-    1086:1086:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):152:152 -> a
+    1086:1086:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):154:154 -> a
     1086:1086:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):308 -> a
-    1087:1087:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):150:150 -> a
+    1087:1087:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):152:152 -> a
     1087:1087:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):308 -> a
-    1088:1088:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):148:148 -> a
+    1088:1088:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):150:150 -> a
     1088:1088:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):308 -> a
-    1092:1098:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):323:329 -> a
-    1099:1099:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
-    1099:1099:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):330 -> a
+    1089:1089:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):148:148 -> a
+    1089:1089:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):308 -> a
+    1093:1099:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):323:329 -> a
+    1100:1100:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    1100:1100:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):330 -> a
     com.android.tools.r8.cf.code.CfInvoke asInvoke() -> i
     boolean canThrow() -> q
     1:1:int getCompareToId():63:63 -> s
     boolean isInvoke() -> x
     1:1:boolean isInvokeInterface():169:169 -> y
     1:1:boolean isInvokeSpecial():154:154 -> z
-com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.G7:
+com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.z7:
     com.android.tools.r8.graph.DexCallSite callSite -> b
     1:2:void <init>(com.android.tools.r8.graph.DexCallSite):43:44 -> <init>
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():125:125 -> F
@@ -6938,7 +6904,7 @@
     com.android.tools.r8.cf.code.CfInvokeDynamic asInvokeDynamic() -> j
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.H7:
+com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.A7:
     int local -> b
     1:2:void <init>(int):36:37 -> <init>
     1:1:int getLocal():93:93 -> F
@@ -6979,7 +6945,7 @@
     2:2:int getCompareToId():42 -> s
     3:3:com.android.tools.r8.errors.CompilationError com.android.tools.r8.cf.code.CfJsrRet.error():30:30 -> s
     3:3:int getCompareToId():42 -> s
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.I7:
+com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.B7:
     com.android.tools.r8.org.objectweb.asm.Label label -> b
     1:3:void <init>():26:28 -> <init>
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():31:34 -> F
@@ -6988,14 +6954,13 @@
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):45:45 -> a
     2:2:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):45 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void print(com.android.tools.r8.cf.CfPrinter):60:60 -> a
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):73:73 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):89:89 -> a
     com.android.tools.r8.cf.code.CfLabel asLabel() -> k
     boolean emitsIR() -> r
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.O7:
+com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.G7:
     com.android.tools.r8.ir.code.ValueType type -> c
     int var -> b
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):34:36 -> <init>
@@ -7022,7 +6987,7 @@
     24:24:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):131:131 -> a
     25:25:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):130:130 -> a
     26:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):105:107 -> a
-    29:29:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    29:29:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     29:29:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):107 -> a
     30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():271:271 -> a
     30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):118 -> a
@@ -7040,10 +7005,10 @@
     18:18:int getCompareToId():41 -> s
     15:15:int com.android.tools.r8.cf.code.CfLoad.getLoadType():63:63 -> s
     15:15:int getCompareToId():41 -> s
-com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.N7:
+com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.F7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():51:51 -> <clinit>
-com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.Q7:
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.I7:
     com.android.tools.r8.ir.code.NumericType type -> c
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> b
     boolean $assertionsDisabled -> d
@@ -7087,7 +7052,7 @@
     221:221:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):183 -> a
     222:231:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):185:194 -> a
     1:1:int getCompareToId():54:54 -> s
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.P7:
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.H7:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode[] $VALUES -> h
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Ushr -> d
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode And -> e
@@ -7098,7 +7063,7 @@
     1:6:void <clinit>():33:38 -> <clinit>
     7:7:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(java.lang.String,int):32:32 -> <init>
-com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.R7:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.J7:
     com.android.tools.r8.ir.code.Monitor$Type type -> b
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type):33:34 -> <init>
     1:1:com.android.tools.r8.ir.code.Monitor$Type getType():38:38 -> F
@@ -7108,19 +7073,17 @@
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):62:62 -> a
     4:4:void print(com.android.tools.r8.cf.CfPrinter):71:71 -> a
     5:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81:82 -> a
-    7:9:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1343:1345 -> a
+    7:9:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1299:1301 -> a
     7:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):82 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):100:100 -> a
     11:12:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):125:126 -> a
     11:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):100 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():275:275 -> a
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):88 -> a
     boolean canThrow() -> q
     1:1:int com.android.tools.r8.cf.code.CfMonitor.getAsmOpcode():66:66 -> s
     1:1:int getCompareToId():43 -> s
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.S7:
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.K7:
     com.android.tools.r8.graph.DexType type -> b
     int dimensions -> c
     boolean $assertionsDisabled -> d
@@ -7132,7 +7095,7 @@
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfMultiANewArray.getType():57:57 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):90 -> a
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):90:90 -> a
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):90 -> a
     5:5:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):91:91 -> a
     6:6:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):77:77 -> a
@@ -7150,7 +7113,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.U7:
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.M7:
     com.android.tools.r8.ir.code.NumericType type -> b
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):34:35 -> <init>
     1:14:int getAsmOpcode():72:85 -> F
@@ -7172,10 +7135,10 @@
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():339:339 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):113 -> a
     1:1:int getCompareToId():44:44 -> s
-com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.T7:
+com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.L7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():72:72 -> <clinit>
-com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.V7:
+com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.N7:
     com.android.tools.r8.graph.DexType type -> b
     1:2:void <init>(com.android.tools.r8.graph.DexType):34:35 -> <init>
     boolean isTypeInstruction() -> E
@@ -7183,7 +7146,7 @@
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):66 -> a
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):79:79 -> a
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):79 -> a
     5:5:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):80:80 -> a
     6:6:void print(com.android.tools.r8.cf.CfPrinter):85:85 -> a
@@ -7195,7 +7158,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.W7:
+com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.O7:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():32:32 -> <clinit>
@@ -7220,7 +7183,7 @@
     25:25:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):122:122 -> a
     26:34:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):97:105 -> a
     26:34:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):125 -> a
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     35:35:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):105 -> a
     35:35:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):125 -> a
     36:36:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):107:107 -> a
@@ -7239,7 +7202,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     1:1:int getCompareToId():63:63 -> s
-com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.X7:
+com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.P7:
     com.android.tools.r8.graph.DexType type -> b
     int ordinal -> c
     1:3:void <init>(com.android.tools.r8.graph.DexType,int):37:39 -> <init>
@@ -7252,7 +7215,6 @@
     5:5:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):94:94 -> a
     6:6:void com.android.tools.r8.graph.UseRegistry.registerNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType):116:116 -> a
     6:6:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):94 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):104:104 -> a
     8:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):122:122 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):303:303 -> a
@@ -7261,7 +7223,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.Y7:
+com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.Q7:
     1:1:void <init>():26:26 -> <init>
     void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens) -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):36:36 -> a
@@ -7271,7 +7233,7 @@
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):70:70 -> a
     boolean emitsIR() -> r
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.a8:
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.S7:
     com.android.tools.r8.ir.code.NumericType to -> c
     com.android.tools.r8.ir.code.NumericType from -> b
     boolean $assertionsDisabled -> d
@@ -7327,10 +7289,10 @@
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():339:339 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):184 -> a
     1:1:int getCompareToId():46:46 -> s
-com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.Z7:
+com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.R7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():84:84 -> <clinit>
-com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.e8:
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.W7:
     com.android.tools.r8.cf.code.CfLabel label -> b
     com.android.tools.r8.ir.code.Position position -> c
     1:3:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.Position):31:33 -> <init>
@@ -7342,7 +7304,6 @@
     3:4:void lambda$internalAcceptCompareTo$2(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):48:49 -> a
     5:5:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):43:43 -> a
     5:5:void lambda$internalAcceptCompareTo$2(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):49 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):62:62 -> a
     7:7:void print(com.android.tools.r8.cf.CfPrinter):67:67 -> a
     8:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):95:97 -> a
@@ -7351,7 +7312,7 @@
     com.android.tools.r8.cf.code.CfPosition asPosition() -> m
     boolean emitsIR() -> r
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfRecordFieldValues -> com.android.tools.r8.internal.p8:
+com.android.tools.r8.cf.code.CfRecordFieldValues -> com.android.tools.r8.internal.g8:
     com.android.tools.r8.graph.DexField[] fields -> b
     1:2:void <init>(com.android.tools.r8.graph.DexField[]):35:36 -> <init>
     1:1:com.android.tools.r8.graph.DexField[] getFields():67:67 -> F
@@ -7360,37 +7321,36 @@
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):53:53 -> a
     4:4:void print(com.android.tools.r8.cf.CfPrinter):72:72 -> a
     5:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):83:83 -> a
-    6:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88:96 -> a
-    15:15:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.IRBuilder.dexItemFactory():495:495 -> a
-    15:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97:97 -> a
-    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1537:1537 -> a
-    17:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
-    18:18:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
-    18:18:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
-    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1538 -> a
+    6:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88:97 -> a
+    16:16:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.IRBuilder.dexItemFactory():491:491 -> a
+    16:16:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97 -> a
+    17:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97:97 -> a
+    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1493:1493 -> a
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
-    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1538:1538 -> a
+    19:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
+    19:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
+    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1494 -> a
     19:19:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
-    20:20:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
-    20:20:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
-    20:20:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1538 -> a
+    20:20:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1494:1494 -> a
     20:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
-    21:28:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1538:1545 -> a
-    21:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
-    29:29:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1544:1544 -> a
-    29:29:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
-    30:35:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1542:1547 -> a
-    30:35:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
-    36:39:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):113:116 -> a
-    40:40:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
-    40:40:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):116 -> a
-    41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forRecordFieldValues():291:291 -> a
-    41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):103 -> a
+    21:21:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
+    21:21:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
+    21:21:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1494 -> a
+    21:21:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
+    22:29:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1494:1501 -> a
+    22:29:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
+    30:30:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1500:1500 -> a
+    30:30:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
+    31:36:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1498:1503 -> a
+    31:36:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
+    37:40:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):113:116 -> a
+    41:41:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    41:41:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):116 -> a
+    42:42:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forRecordFieldValues():291:291 -> a
+    42:42:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):103 -> a
     com.android.tools.r8.cf.code.CfRecordFieldValues asRecordFieldValues() -> n
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.t8:
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.k8:
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():29:29 -> <clinit>
@@ -7428,10 +7388,10 @@
     18:18:int getCompareToId():43 -> s
     15:15:int com.android.tools.r8.cf.code.CfReturn.getOpcode():65:65 -> s
     15:15:int getCompareToId():43 -> s
-com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.s8:
+com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.j8:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():53:53 -> <clinit>
-com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.u8:
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.l8:
     1:1:void <init>():26:26 -> <init>
     boolean isJump() -> C
     boolean isReturn() -> D
@@ -7443,11 +7403,11 @@
     6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():315:315 -> a
     6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):80 -> a
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfSafeCheckCast -> com.android.tools.r8.internal.v8:
+com.android.tools.r8.cf.code.CfSafeCheckCast -> com.android.tools.r8.internal.m8:
     1:1:void <init>(com.android.tools.r8.graph.DexType):17:17 -> <init>
     1:1:void addCheckCast(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState$Slot):22:22 -> a
     2:2:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):28:28 -> a
-com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.D8:
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.u8:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -7470,22 +7430,22 @@
     137:151:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):195:209 -> a
     152:158:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):270:276 -> a
     152:158:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):214 -> a
-    159:159:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    159:159:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     159:159:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):276 -> a
     159:159:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):214 -> a
     160:160:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):278:278 -> a
     160:160:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):214 -> a
-    161:161:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    161:161:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     161:161:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):278 -> a
     161:161:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):214 -> a
     162:162:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):280:280 -> a
     162:162:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):214 -> a
-    163:163:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    163:163:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     163:163:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):280 -> a
     163:163:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):214 -> a
     164:164:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):282:282 -> a
     164:164:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):214 -> a
-    165:165:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    165:165:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     165:165:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):282 -> a
     165:165:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):214 -> a
     166:166:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):210:210 -> a
@@ -7497,32 +7457,32 @@
     169:184:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):210:225 -> a
     185:194:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):317:326 -> a
     185:194:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     195:195:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):326 -> a
     195:195:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     196:196:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):328:328 -> a
     196:196:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    197:197:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    197:197:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     197:197:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):328 -> a
     197:197:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     198:198:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):330:330 -> a
     198:198:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    199:199:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    199:199:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     199:199:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):330 -> a
     199:199:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     200:200:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):332:332 -> a
     200:200:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    201:201:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    201:201:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     201:201:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):332 -> a
     201:201:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     202:202:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):334:334 -> a
     202:202:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    203:203:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    203:203:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     203:203:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):334 -> a
     203:203:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     204:204:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):336:336 -> a
     204:204:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    205:205:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    205:205:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     205:205:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):336 -> a
     205:205:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     206:206:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):226:226 -> a
@@ -7541,64 +7501,64 @@
     213:213:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):218:218 -> a
     214:222:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):181:189 -> a
     223:225:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):169:171 -> a
-    226:226:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    226:226:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     226:226:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):171 -> a
     227:228:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):173:174 -> a
-    229:229:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    229:229:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     229:229:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):174 -> a
     230:230:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):175:175 -> a
-    231:231:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    231:231:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     231:231:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):175 -> a
     232:239:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):155:162 -> a
     240:246:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):270:276 -> a
     240:246:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163 -> a
-    247:247:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    247:247:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     247:247:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):276 -> a
     247:247:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163 -> a
     248:248:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):278:278 -> a
     248:248:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163 -> a
-    249:249:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    249:249:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     249:249:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):278 -> a
     249:249:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163 -> a
     250:250:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):280:280 -> a
     250:250:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163 -> a
-    251:251:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    251:251:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     251:251:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):280 -> a
     251:251:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163 -> a
     252:252:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):282:282 -> a
     252:252:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163 -> a
-    253:253:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    253:253:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     253:253:void com.android.tools.r8.cf.code.CfStackInstruction.dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):282 -> a
     253:253:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163 -> a
     254:258:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146:150 -> a
     259:261:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):139:141 -> a
-    262:262:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    262:262:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     262:262:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):141 -> a
     263:266:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):130:133 -> a
     267:268:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):124:125 -> a
     269:274:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):253:258 -> a
-    275:275:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    275:275:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     275:275:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):258 -> a
     276:276:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):260:260 -> a
-    277:277:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    277:277:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     277:277:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):260 -> a
     278:278:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):262:262 -> a
-    279:279:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    279:279:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     279:279:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):262 -> a
     280:287:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):289:296 -> a
-    288:288:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    288:288:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     288:288:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):296 -> a
     289:289:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):298:298 -> a
-    290:290:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    290:290:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     290:290:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):298 -> a
     291:291:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):300:300 -> a
-    292:292:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    292:292:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     292:292:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):300 -> a
     293:293:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):302:302 -> a
-    294:294:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    294:294:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     294:294:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):302 -> a
     295:295:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):304:304 -> a
-    296:296:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    296:296:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     296:296:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):304 -> a
     297:297:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):347:347 -> a
     298:449:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):358:509 -> a
@@ -7606,7 +7566,6 @@
     450:450:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):503 -> a
     451:452:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):125:126 -> a
     451:452:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):503 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     453:453:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
     453:453:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):504 -> a
     454:455:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):125:126 -> a
@@ -7668,7 +7627,6 @@
     522:522:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):400 -> a
     523:524:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):125:126 -> a
     523:524:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):400 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     525:526:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):401:402 -> a
     527:527:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
     527:527:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):403 -> a
@@ -7682,7 +7640,6 @@
     537:537:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):388 -> a
     538:539:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):125:126 -> a
     538:539:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):388 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     540:540:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
     540:540:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):389 -> a
     541:542:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):125:126 -> a
@@ -7692,7 +7649,6 @@
     544:544:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):380 -> a
     545:546:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):125:126 -> a
     545:546:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):380 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     547:547:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):381:381 -> a
     548:549:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):370:371 -> a
     550:550:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
@@ -7706,13 +7662,12 @@
     555:555:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):362 -> a
     556:557:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):125:126 -> a
     556:557:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):362 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     boolean emitsIR() -> r
     1:1:int getCompareToId():88:88 -> s
-com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.C8:
+com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.t8:
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfStackInstruction$Opcode -> a
     1:1:void <clinit>():121:121 -> <clinit>
-com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.D8$a:
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.u8$a:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X2 -> j
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X1 -> i
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] $VALUES -> l
@@ -7729,15 +7684,15 @@
     1:2:void <init>(java.lang.String,int,int):46:47 -> <init>
     1:1:int access$000(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):33:33 -> a
     2:2:com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] values():33:33 -> a
-com.android.tools.r8.cf.code.CfStaticFieldRead -> com.android.tools.r8.internal.P8:
+com.android.tools.r8.cf.code.CfStaticFieldRead -> com.android.tools.r8.internal.F8:
     1:1:void <init>(com.android.tools.r8.graph.DexField):17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):21:21 -> <init>
     1:1:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):27:27 -> a
-com.android.tools.r8.cf.code.CfStaticFieldWrite -> com.android.tools.r8.internal.Q8:
+com.android.tools.r8.cf.code.CfStaticFieldWrite -> com.android.tools.r8.internal.G8:
     1:1:void <init>(com.android.tools.r8.graph.DexField):16:16 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):20:20 -> <init>
     1:1:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):26:26 -> a
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.S8:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.I8:
     com.android.tools.r8.ir.code.ValueType type -> c
     int var -> b
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):37:39 -> <init>
@@ -7759,7 +7714,7 @@
     17:17:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):90:90 -> a
     21:21:void print(com.android.tools.r8.cf.CfPrinter):95:95 -> a
     22:23:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):108:109 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    24:24:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     24:24:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):109 -> a
     25:60:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):132:167 -> a
     61:61:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):0:0 -> a
@@ -7790,10 +7745,10 @@
     18:18:int getCompareToId():44 -> s
     15:15:int com.android.tools.r8.cf.code.CfStore.getStoreType():66:66 -> s
     15:15:int getCompareToId():44 -> s
-com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.R8:
+com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.H8:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():54:54 -> <clinit>
-com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.U8:
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.K8:
     java.util.List targets -> e
     int[] keys -> d
     com.android.tools.r8.cf.code.CfSwitch$Kind kind -> b
@@ -7810,7 +7765,6 @@
     3:3:void lambda$internalAcceptCompareTo$1(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):61:61 -> a
     4:4:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):43:43 -> a
     4:4:void lambda$internalAcceptCompareTo$1(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):61 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:7:void lambda$internalAcceptCompareTo$1(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):61:63 -> a
     8:8:int[] lambda$internalAcceptCompareTo$0(com.android.tools.r8.cf.code.CfSwitch):62:62 -> a
     9:20:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):107:118 -> a
@@ -7821,17 +7775,17 @@
     35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():267:267 -> a
     35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):141 -> a
     1:1:int getCompareToId():50:50 -> s
-com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.T8:
+com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.J8:
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfSwitch$Kind -> a
     1:1:void <clinit>():111:111 -> <clinit>
-com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.U8$a:
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.K8$a:
     com.android.tools.r8.cf.code.CfSwitch$Kind TABLE -> c
     com.android.tools.r8.cf.code.CfSwitch$Kind[] $VALUES -> d
     com.android.tools.r8.cf.code.CfSwitch$Kind LOOKUP -> b
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(java.lang.String,int):32:32 -> <init>
     1:1:com.android.tools.r8.cf.code.CfSwitch$Kind[] values():32:32 -> a
-com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.V8:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.L8:
     1:1:void <init>():27:27 -> <init>
     boolean isJump() -> C
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):42:42 -> a
@@ -7843,7 +7797,7 @@
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):87 -> a
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.W8:
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.M8:
     com.android.tools.r8.cf.code.CfLabel start -> a
     com.android.tools.r8.cf.code.CfLabel end -> b
     java.util.List targets -> d
@@ -7858,17 +7812,15 @@
     5:5:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):56:56 -> a
     6:6:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):43:43 -> a
     6:6:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):56 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:8:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):56:57 -> a
     9:9:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):43:43 -> a
     9:9:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):57 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:12:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):57:59 -> a
     13:13:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):63:63 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel lambda$acceptCompareTo$1(com.android.tools.r8.cf.code.CfTryCatch):57:57 -> b
     1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.cf.code.CfTryCatch):58:58 -> c
     1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.cf.code.CfTryCatch):59:59 -> d
-com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.X8:
+com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.N8:
 com.android.tools.r8.code.AddDouble -> com.android.tools.r8.code.b:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
@@ -8147,12 +8099,12 @@
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
     int getSize() -> x
-com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.internal.k6:
-com.android.tools.r8.code.CfOrDexInstanceFieldRead -> com.android.tools.r8.internal.b8:
-com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.c8:
+com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.internal.g6:
+com.android.tools.r8.code.CfOrDexInstanceFieldRead -> com.android.tools.r8.internal.T7:
+com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.U7:
     com.android.tools.r8.cf.code.CfInstruction asCfInstruction() -> b
     com.android.tools.r8.code.Instruction asDexInstruction() -> c
-com.android.tools.r8.code.CfOrDexStaticFieldRead -> com.android.tools.r8.internal.d8:
+com.android.tools.r8.code.CfOrDexStaticFieldRead -> com.android.tools.r8.internal.V7:
 com.android.tools.r8.code.CheckCast -> com.android.tools.r8.code.K:
     boolean ignoreCompatRules -> i
     1:2:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):27:28 -> <init>
@@ -8161,7 +8113,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():99:99 -> M
     1:1:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):53:53 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):67:67 -> a
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):67 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68:68 -> a
     5:5:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
@@ -8179,9 +8131,9 @@
     11:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":93,"2":94,"3":95}}
     93:93:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):78:78 -> a
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     94:94:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):78 -> a
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     95:95:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):78 -> a
     90:90:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79:79 -> a
     91:91:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):95:95 -> a
@@ -8309,7 +8261,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():89:89 -> M
     1:1:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):38:38 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):67:67 -> a
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):67 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68:68 -> a
     5:5:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
@@ -8327,9 +8279,9 @@
     11:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":93,"2":94,"3":95}}
     93:93:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):78:78 -> a
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     94:94:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):78 -> a
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     95:95:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):78 -> a
     90:90:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79:79 -> a
     91:91:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):95:95 -> a
@@ -8407,15 +8359,12 @@
     86:86:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):87:87 -> a
     87:87:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):56:56 -> a
     88:88:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):107:107 -> a
-    89:97:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1272:1280 -> a
+    89:97:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1228:1236 -> a
     89:97:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):107 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    98:102:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1279:1283 -> a
+    98:102:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1235:1239 -> a
     98:102:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):107 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    103:103:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1273:1273 -> a
+    103:103:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1229:1229 -> a
     103:103:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):107 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":63,"2":64,"3":65}}
     63:63:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):61:61 -> b
@@ -8442,27 +8391,26 @@
     73:73:com.android.tools.r8.graph.DexProto getMethodType():35:35 -> a
     73:73:void registerUse(com.android.tools.r8.graph.UseRegistry):70 -> a
     74:74:void registerUse(com.android.tools.r8.graph.UseRegistry):70:70 -> a
-    75:75:com.android.tools.r8.graph.DexProto getMethodType():35:35 -> a
-    75:75:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):80 -> a
-    76:77:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):80:81 -> a
-    78:78:int com.android.tools.r8.graph.DexProto.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):109:109 -> a
-    78:78:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81 -> a
-    79:79:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85:85 -> a
-    80:80:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):95:95 -> a
-    80:80:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85 -> a
-    81:81:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):86:86 -> a
-    82:82:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83:83 -> a
-    83:83:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):55:55 -> a
-    84:84:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):101:101 -> a
-    85:93:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1287:1295 -> a
-    85:93:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):101 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    94:98:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1294:1298 -> a
-    94:98:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):101 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    99:99:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1288:1288 -> a
-    99:99:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):101 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    75:77:void com.android.tools.r8.graph.UseRegistry.registerProto(com.android.tools.r8.graph.DexProto):253:255 -> a
+    75:77:void registerUse(com.android.tools.r8.graph.UseRegistry):70 -> a
+    78:78:com.android.tools.r8.graph.DexProto getMethodType():35:35 -> a
+    78:78:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):80 -> a
+    79:80:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):80:81 -> a
+    81:81:int com.android.tools.r8.graph.DexProto.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):109:109 -> a
+    81:81:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81 -> a
+    82:82:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85:85 -> a
+    83:83:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):95:95 -> a
+    83:83:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85 -> a
+    84:84:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):86:86 -> a
+    85:85:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83:83 -> a
+    86:86:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):55:55 -> a
+    87:87:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):101:101 -> a
+    88:96:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1243:1251 -> a
+    88:96:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):101 -> a
+    97:101:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1250:1254 -> a
+    97:101:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):101 -> a
+    102:102:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1244:1244 -> a
+    102:102:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):101 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":62,"2":63,"3":64}}
     62:62:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):60:60 -> b
@@ -8498,9 +8446,8 @@
     95:95:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):98:98 -> a
     96:96:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):95:95 -> a
     97:97:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):103:103 -> a
-    98:100:void com.android.tools.r8.ir.conversion.IRBuilder.addConstString(int,com.android.tools.r8.graph.DexString):1306:1308 -> a
+    98:100:void com.android.tools.r8.ir.conversion.IRBuilder.addConstString(int,com.android.tools.r8.graph.DexString):1262:1264 -> a
     98:100:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):103 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":80,"2":81,"3":82}}
     80:80:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):78:78 -> b
@@ -8524,9 +8471,8 @@
     65:65:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):61:61 -> a
     62:62:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):61:61 -> a
     66:66:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
-    67:69:void com.android.tools.r8.ir.conversion.IRBuilder.addConstString(int,com.android.tools.r8.graph.DexString):1306:1308 -> a
+    67:69:void com.android.tools.r8.ir.conversion.IRBuilder.addConstString(int,com.android.tools.r8.graph.DexString):1262:1264 -> a
     67:69:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":58,"2":59,"3":60}}
     58:58:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):56:56 -> b
@@ -8694,14 +8640,14 @@
     150:150:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":208,"2":209,"3":210}}
     208:208:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):55:55 -> a
-    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     209:209:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):55 -> a
-    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     210:210:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):55 -> a
     206:207:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):56:57 -> a
     211:211:void registerUse(com.android.tools.r8.graph.UseRegistry):111:111 -> a
     212:212:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):123:123 -> a
-    213:213:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    213:213:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     213:213:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):123 -> a
     214:215:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):124:125 -> a
     216:235:int getOpcode(com.android.tools.r8.graph.DexField):86:105 -> a
@@ -8755,9 +8701,8 @@
     110:110:void registerUse(com.android.tools.r8.graph.UseRegistry):113 -> a
     111:111:void registerUse(com.android.tools.r8.graph.UseRegistry):113:113 -> a
     112:112:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):119:119 -> a
-    113:116:void com.android.tools.r8.ir.conversion.IRBuilder.addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1313:1316 -> a
+    113:116:void com.android.tools.r8.ir.conversion.IRBuilder.addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1269:1272 -> a
     113:116:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):119 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":91,"2":92,"3":93}}
     91:91:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):89:89 -> b
@@ -8779,13 +8724,13 @@
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68:68 -> a
     4:4:com.android.tools.r8.graph.DexType getType():77:77 -> a
     4:4:void registerUse(com.android.tools.r8.graph.UseRegistry):73 -> a
-    5:5:void com.android.tools.r8.graph.UseRegistry.registerNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType):116:116 -> a
-    5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):73 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):82:82 -> a
-    7:7:com.android.tools.r8.graph.DexType getType():77:77 -> a
-    7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):82 -> a
-    8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):82:82 -> a
+    5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):73:73 -> a
+    6:6:void com.android.tools.r8.graph.UseRegistry.registerNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType):116:116 -> a
+    6:6:void registerUse(com.android.tools.r8.graph.UseRegistry):73 -> a
+    7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):82:82 -> a
+    8:8:com.android.tools.r8.graph.DexType getType():77:77 -> a
+    8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):82 -> a
+    9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):82:82 -> a
     1:1:com.android.tools.r8.graph.DexType lambda$internalSubSpecify$0(com.android.tools.r8.code.Format21c):49:49 -> b
     boolean canThrow() -> m
     1:1:java.lang.String getName():34:34 -> r
@@ -8807,23 +8752,23 @@
     10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):131 -> a
     11:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):132:135 -> a
-    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1537:1537 -> a
+    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1493:1493 -> a
     15:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):135 -> a
     16:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
     16:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
-    16:16:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1538 -> a
+    16:16:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1494 -> a
     16:16:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):135 -> a
-    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1538:1538 -> a
+    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1494:1494 -> a
     17:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):135 -> a
     18:18:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
     18:18:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
-    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1538 -> a
+    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1494 -> a
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):135 -> a
-    19:26:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1538:1545 -> a
+    19:26:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1494:1501 -> a
     19:26:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):135 -> a
-    27:27:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1544:1544 -> a
+    27:27:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1500:1500 -> a
     27:27:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):135 -> a
-    28:33:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1542:1547 -> a
+    28:33:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1498:1503 -> a
     28:33:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):135 -> a
     1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):97:98 -> b
     3:10:void appendArguments(java.lang.StringBuilder):85:92 -> b
@@ -9000,7 +8945,7 @@
     3:3:com.android.tools.r8.graph.DexType getType():56:56 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):51 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):51:51 -> a
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):51 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52:52 -> a
     7:7:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
@@ -9019,9 +8964,9 @@
     13:13:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":95,"2":96,"3":97}}
     95:95:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76:76 -> a
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     96:96:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     97:97:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76 -> a
     90:90:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):77:77 -> a
     91:91:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):103:103 -> a
@@ -9042,7 +8987,7 @@
     3:3:com.android.tools.r8.graph.DexType getType():56:56 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):51 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):51:51 -> a
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):51 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52:52 -> a
     7:7:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
@@ -9061,9 +9006,9 @@
     13:13:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":95,"2":96,"3":97}}
     95:95:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76:76 -> a
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     96:96:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     97:97:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76 -> a
     90:90:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):77:77 -> a
     91:91:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):95:95 -> a
@@ -9838,14 +9783,12 @@
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.DexField[]):17:17 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):21:21 -> <init>
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):30:30 -> a
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):30 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):31:31 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):46:46 -> a
-    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
+    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):46 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47:47 -> a
     7:7:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):103:103 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47 -> a
@@ -9874,7 +9817,7 @@
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexType):28:28 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType():67:67 -> M
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):62:62 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):62 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63:63 -> a
     4:4:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
@@ -9894,9 +9837,9 @@
     12:12:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":108,"2":109,"3":110}}
     108:108:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):92:92 -> a
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     109:109:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):92 -> a
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     110:110:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):92 -> a
     105:105:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):93:93 -> a
     106:106:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):103:103 -> a
@@ -10782,53 +10725,48 @@
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68:68 -> a
-    3:4:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1589:1590 -> a
-    3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
-    5:5:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
-    5:5:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1592 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
-    6:6:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticPut():129:129 -> a
-    6:6:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298 -> a
-    6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1592 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
+    3:6:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1545:1548 -> a
+    3:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
     7:7:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1592 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1548 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
-    8:8:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticGet():133:133 -> a
+    8:8:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticPut():129:129 -> a
     8:8:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298 -> a
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1592 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1548 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
     9:9:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1592 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1548 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
-    10:22:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1593:1605 -> a
-    10:22:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
-    23:23:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
-    23:23:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
-    24:25:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52:53 -> a
-    26:27:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):164:165 -> a
-    26:27:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
-    28:28:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    28:28:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):165 -> a
-    28:28:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
-    29:32:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):166:169 -> a
-    29:32:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
-    33:33:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
-    33:33:void registerUse(com.android.tools.r8.graph.UseRegistry):58 -> a
-    34:34:void registerUse(com.android.tools.r8.graph.UseRegistry):58:58 -> a
-    35:35:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83:83 -> a
-    36:36:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):103:103 -> a
-    36:36:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83 -> a
-    37:37:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
-    37:37:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84 -> a
-    38:39:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84:85 -> a
-    40:40:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):111:111 -> a
-    40:40:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85 -> a
+    10:10:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticGet():133:133 -> a
+    10:10:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298 -> a
+    10:10:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1548 -> a
+    10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
+    11:11:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
+    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1548 -> a
+    11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
+    12:24:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1549:1561 -> a
+    12:24:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
+    25:25:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
+    25:25:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
+    26:27:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52:53 -> a
+    28:29:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):164:165 -> a
+    28:29:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
+    30:30:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    30:30:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):165 -> a
+    30:30:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
+    31:34:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):166:169 -> a
+    31:34:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
+    35:35:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
+    35:35:void registerUse(com.android.tools.r8.graph.UseRegistry):58 -> a
+    36:36:void registerUse(com.android.tools.r8.graph.UseRegistry):58:58 -> a
+    37:37:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83:83 -> a
+    38:38:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):103:103 -> a
+    38:38:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83 -> a
+    39:39:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
+    39:39:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84 -> a
+    40:41:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84:85 -> a
+    42:42:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):111:111 -> a
+    42:42:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85 -> a
     boolean canThrow() -> m
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> o
     1:1:java.lang.String getName():33:33 -> r
@@ -10911,14 +10849,12 @@
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):23:23 -> <init>
     com.android.tools.r8.ir.code.Invoke$Type getInvokeType() -> M
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):33:33 -> a
-    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):33 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):33:34 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52:52 -> a
-    6:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    6:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:9:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:55 -> a
     10:10:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):111:111 -> a
     10:10:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):55 -> a
@@ -10928,14 +10864,12 @@
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
     com.android.tools.r8.ir.code.Invoke$Type getInvokeType() -> M
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):33:33 -> a
-    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):33 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):33:34 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52:52 -> a
-    6:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    6:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:9:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:55 -> a
     10:10:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):111:111 -> a
     10:10:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):55 -> a
@@ -10986,7 +10920,7 @@
     35:35:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):103:103 -> a
     35:35:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-    36:36:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    36:36:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     36:36:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):103 -> a
     36:36:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -11007,7 +10941,7 @@
     43:43:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):119:119 -> a
     43:43:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-    44:44:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    44:44:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     44:44:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):119 -> a
     44:44:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -11090,7 +11024,7 @@
     4:4:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):119:119 -> a
     4:4:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-    5:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    5:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     5:5:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):119 -> a
     5:5:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -11114,7 +11048,7 @@
     14:14:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):61:61 -> a
     14:14:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-    15:15:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    15:15:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     15:15:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):61 -> a
     15:15:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -11347,9 +11281,8 @@
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    2:4:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1343:1345 -> a
+    2:4:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1299:1301 -> a
     2:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     boolean canThrow() -> m
     1:1:java.lang.String getName():24:24 -> r
     int getOpcode() -> v
@@ -11359,9 +11292,8 @@
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    2:4:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1343:1345 -> a
+    2:4:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1299:1301 -> a
     2:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     boolean canThrow() -> m
     1:1:java.lang.String getName():24:24 -> r
     int getOpcode() -> v
@@ -11466,7 +11398,7 @@
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     1:1:java.lang.String getName():25:25 -> r
     int getOpcode() -> v
@@ -11486,7 +11418,7 @@
     2:2:java.lang.String com.android.tools.r8.code.Format32x.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):70:70 -> a
     2:2:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):9 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     8:8:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):95:95 -> a
     8:8:void com.android.tools.r8.code.Format32x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):48 -> a
@@ -11529,7 +11461,7 @@
     2:2:java.lang.String com.android.tools.r8.code.Format22x.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):69:69 -> a
     2:2:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1350:1350 -> a
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39 -> a
     8:8:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47:47 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
@@ -11789,7 +11721,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():62:62 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52:52 -> a
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:53 -> a
     5:5:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
@@ -11811,9 +11743,9 @@
     13:13:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":99,"2":100,"3":101}}
     99:99:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82:82 -> a
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     100:100:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82 -> a
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     101:101:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82 -> a
     96:96:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83:83 -> a
     97:97:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):103:103 -> a
@@ -11833,7 +11765,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():80:80 -> M
     1:1:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):49:49 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):58:58 -> a
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):58 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):59:59 -> a
     5:5:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
@@ -11851,9 +11783,9 @@
     11:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":84,"2":85,"3":86}}
     84:84:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69:69 -> a
-    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     85:85:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69 -> a
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     86:86:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69 -> a
     81:81:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):70:70 -> a
     82:82:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):95:95 -> a
@@ -12206,14 +12138,12 @@
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.DexField[]):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):31:31 -> a
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):31 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):32:32 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42:42 -> a
-    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
+    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     7:7:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):95:95 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43 -> a
@@ -12603,11 +12533,13 @@
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>():34:34 -> <init>
     1:1:java.lang.Object or(java.lang.Object):48:48 -> a
+    2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):899:899 -> a
+    2:2:java.lang.Object or(java.lang.Object):48 -> a
     1:1:java.lang.String toString():91:91 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.h9:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.X8:
     1:1:void <init>():359:359 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.e9:
+com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.U8:
     com.android.tools.r8.com.google.common.base.CharMatcher$Any INSTANCE -> c
     1:1:void <clinit>():1011:1011 -> <clinit>
     1:1:void <init>():1014:1014 -> <init>
@@ -12615,7 +12547,7 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():127:127 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$Any.negate():1101 -> negate
     1:1:java.util.function.Predicate negate():1009 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.f9:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.V8:
     java.lang.String description -> b
     1:1:void com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.<init>():939:939 -> <init>
     1:1:void <init>(java.lang.String):957 -> <init>
@@ -12628,7 +12560,7 @@
     2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.apply(java.lang.Object):0 -> apply
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.lang.String toString():963:963 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.g9:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.W8:
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> c
     1:1:void <clinit>():1108:1108 -> <clinit>
     1:1:void <init>():1111:1111 -> <init>
@@ -12636,12 +12568,12 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():118:118 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$None.negate():1204 -> negate
     1:1:java.util.function.Predicate negate():1106 -> negate
-com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.o9:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.e9:
     java.nio.charset.Charset UTF_8 -> a
     1:50:void <clinit>():45:94 -> <clinit>
-com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.uc:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.Zb:
     1:1:void <init>():25:25 -> <init>
-com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.aj:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.Ii:
     1:1:void <init>():39:39 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -12649,8 +12581,7 @@
     2:2:int hash(java.lang.Object):112:112 -> b
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> c
     1:1:boolean test(java.lang.Object,java.lang.Object):76:76 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.internal.Yi:
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Zi:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Hi:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.lang.Object reference -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object,com.android.tools.r8.com.google.common.base.Equivalence$1):185:185 -> <init>
@@ -12659,27 +12590,27 @@
     1:11:boolean equals(java.lang.Object):209:219 -> equals
     1:1:int hashCode():228:228 -> hashCode
     1:1:java.lang.String toString():237:237 -> toString
-com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.Fl:
-com.android.tools.r8.com.google.common.base.Java8Usage -> com.android.tools.r8.internal.zv:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.jl:
+com.android.tools.r8.com.google.common.base.Java8Usage -> com.android.tools.r8.internal.Tu:
     void lambda$performCheck$0() -> a
     1:2:java.lang.String performCheck():39:40 -> b
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.Iv:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.bv:
     java.util.regex.Pattern pattern -> b
     1:2:void <init>(java.util.regex.Pattern):27:28 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence):33:33 -> a
     1:1:java.lang.String toString():48:48 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.Hv:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.av:
     java.util.regex.Matcher matcher -> a
     1:1:void com.android.tools.r8.com.google.common.base.CommonMatcher.<init>():25:25 -> <init>
     1:1:void <init>(java.util.regex.Matcher):54 -> <init>
     2:2:void <init>(java.util.regex.Matcher):55:55 -> <init>
-com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.MK:
+com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.IJ:
     1:1:boolean equal(java.lang.Object,java.lang.Object):52:52 -> a
-com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.dL:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.ZJ:
     1:1:void <init>():161:161 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93:93 -> a
-com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.oM:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.jL:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> a
     1:1:void <clinit>():33:33 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.base.PatternCompiler com.android.tools.r8.com.google.common.base.Platform.loadPatternCompiler():91:91 -> <clinit>
@@ -12688,11 +12619,10 @@
     1:2:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):82:83 -> a
     3:3:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler.compile(java.lang.String):101:101 -> a
     3:3:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):83 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.internal.lM:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.mM:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.hL:
     1:1:void <init>():98:98 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):98:98 -> <init>
-com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.DM:
+com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.wL:
     int $r8$clinit -> a
     1:9:void <clinit>():1439:1447 -> <clinit>
     1:1:void checkArgument(boolean):130:130 -> a
@@ -12700,56 +12630,54 @@
     3:3:void checkArgument(boolean,java.lang.String,char):179:179 -> a
     4:4:void checkArgument(boolean,java.lang.String,java.lang.Object):219:219 -> a
     5:5:java.lang.Object checkNotNull(java.lang.Object):880:880 -> a
-    6:6:java.lang.Object checkNotNull(java.lang.Object,java.lang.Object):899:899 -> a
-    7:7:int checkElementIndex(int,int):1329:1329 -> a
-    8:8:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1347:1347 -> a
+    6:6:int checkElementIndex(int,int):1329:1329 -> a
+    7:7:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1347:1347 -> a
+    7:7:int checkElementIndex(int,int):1329 -> a
+    8:8:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1358:1358 -> a
+    8:8:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1347 -> a
     8:8:int checkElementIndex(int,int):1329 -> a
-    9:9:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1358:1358 -> a
+    9:9:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1356:1356 -> a
     9:9:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1347 -> a
     9:9:int checkElementIndex(int,int):1329 -> a
-    10:10:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1356:1356 -> a
+    10:10:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1354:1354 -> a
     10:10:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1347 -> a
     10:10:int checkElementIndex(int,int):1329 -> a
-    11:11:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1354:1354 -> a
-    11:11:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1347 -> a
+    11:11:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1347:1347 -> a
     11:11:int checkElementIndex(int,int):1329 -> a
-    12:12:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1347:1347 -> a
-    12:12:int checkElementIndex(int,int):1329 -> a
-    13:17:java.lang.String badPositionIndex(int,int,java.lang.String):1399:1403 -> a
-    18:18:java.lang.String badPositionIndex(int,int,java.lang.String):1401:1401 -> a
-    19:19:void checkPositionIndexes(int,int,int):1422:1422 -> a
-    20:20:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1434:1434 -> a
+    12:16:java.lang.String badPositionIndex(int,int,java.lang.String):1399:1403 -> a
+    17:17:java.lang.String badPositionIndex(int,int,java.lang.String):1401:1401 -> a
+    18:18:void checkPositionIndexes(int,int,int):1422:1422 -> a
+    19:19:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1434:1434 -> a
+    19:19:void checkPositionIndexes(int,int,int):1422 -> a
+    20:20:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1431:1431 -> a
     20:20:void checkPositionIndexes(int,int,int):1422 -> a
-    21:21:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1431:1431 -> a
+    21:21:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1428:1428 -> a
     21:21:void checkPositionIndexes(int,int,int):1422 -> a
-    22:22:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1428:1428 -> a
-    22:22:void checkPositionIndexes(int,int,int):1422 -> a
-    23:23:void checkPositionIndexes(int,int,int):1422:1422 -> a
+    22:22:void checkPositionIndexes(int,int,int):1422:1422 -> a
     1:1:void checkState(boolean,java.lang.Object):510:510 -> b
     2:2:int checkPositionIndex(int,int):1374:1374 -> b
     3:3:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1392:1392 -> b
     3:3:int checkPositionIndex(int,int):1374 -> b
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.EM:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.xL:
     1:1:boolean test(java.lang.Object):79:79 -> test
-com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.PM:
+com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.HL:
     1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysFalse():57:57 -> a
     2:2:com.android.tools.r8.com.google.common.base.Predicate not(com.android.tools.r8.com.google.common.base.Predicate):83:83 -> a
     3:3:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):147:147 -> a
-    4:5:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    4:5:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):147 -> a
-    6:6:java.util.List com.android.tools.r8.com.google.common.base.Predicates.asList(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):689:689 -> a
-    6:6:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):147 -> a
-    7:7:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):147:147 -> a
+    4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
+    4:4:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):147 -> a
+    5:5:java.util.List com.android.tools.r8.com.google.common.base.Predicates.asList(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):689:689 -> a
+    5:5:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):147 -> a
+    6:6:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):147:147 -> a
     1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysTrue():51:51 -> b
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.HM:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.IM:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.AL:
     com.android.tools.r8.com.google.common.base.Predicate predicate -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Predicate):310:311 -> <init>
     1:1:boolean apply(java.lang.Object):316:316 -> apply
     1:3:boolean equals(java.lang.Object):326:328 -> equals
     1:1:int hashCode():321:321 -> hashCode
     1:1:java.lang.String toString():335:335 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.NM:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.FL:
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate IS_NULL -> d
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate NOT_NULL -> e
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_TRUE -> b
@@ -12757,19 +12685,19 @@
     1:37:void <clinit>():252:288 -> <clinit>
     1:1:void <init>(java.lang.String,int):250:250 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):250:250 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.JM:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.BL:
     1:1:void <init>(java.lang.String,int):252:252 -> <init>
     1:1:java.lang.String toString():260:260 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.KM:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.CL:
     1:1:void <init>(java.lang.String,int):264:264 -> <init>
     1:1:java.lang.String toString():272:272 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.LM:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.DL:
     1:1:void <init>(java.lang.String,int):276:276 -> <init>
     1:1:java.lang.String toString():284:284 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.MM:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.EL:
     1:1:void <init>(java.lang.String,int):288:288 -> <init>
     1:1:java.lang.String toString():296:296 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.OM:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.GL:
     java.util.List components -> b
     1:1:void <init>(java.util.List,com.android.tools.r8.com.google.common.base.Predicates$1):384:384 -> <init>
     2:3:void <init>(java.util.List):387:388 -> <init>
@@ -12780,7 +12708,7 @@
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.toStringHelper(java.lang.String,java.lang.Iterable):426:435 -> toString
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.access$800(java.lang.String,java.lang.Iterable):42 -> toString
     2:11:java.lang.String toString():419 -> toString
-com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.sW:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.RU:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy,boolean,com.android.tools.r8.com.google.common.base.CharMatcher,int):112:112 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):260:260 -> a
     2:2:com.android.tools.r8.com.google.common.base.Splitter com.android.tools.r8.com.google.common.base.Splitter.on(com.android.tools.r8.com.google.common.base.CommonPattern):222:222 -> a
@@ -12797,7 +12725,7 @@
     11:11:void com.android.tools.r8.com.google.common.base.Splitter.<init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):109:109 -> a
     11:11:com.android.tools.r8.com.google.common.base.Splitter com.android.tools.r8.com.google.common.base.Splitter.on(com.android.tools.r8.com.google.common.base.CommonPattern):226 -> a
     11:11:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):260 -> a
-com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.fY:
+com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.xW:
     1:5:java.lang.String repeat(java.lang.String,int):144:148 -> a
     6:6:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):192:192 -> a
     6:6:java.lang.String repeat(java.lang.String,int):147 -> a
@@ -12807,24 +12735,24 @@
     25:36:java.lang.String com.android.tools.r8.com.google.common.base.Strings.lenientToString(java.lang.Object):302:313 -> a
     25:36:java.lang.String lenientFormat(java.lang.String,java.lang.Object[]):267 -> a
     37:67:java.lang.String lenientFormat(java.lang.String,java.lang.Object[]):267:297 -> a
-com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.yY:
-com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.CY:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.QW:
+com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.UW:
     1:7:com.android.tools.r8.com.google.common.base.Supplier memoize(com.android.tools.r8.com.google.common.base.Supplier):102:108 -> a
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.AY:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.SW:
     java.lang.Object value -> d
     com.android.tools.r8.com.google.common.base.Supplier delegate -> b
     boolean initialized -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):119:120 -> <init>
     1:11:java.lang.Object get():126:136 -> get
     1:1:java.lang.String toString():142:142 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.BY:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.TW:
     java.lang.Object value -> d
     com.android.tools.r8.com.google.common.base.Supplier delegate -> b
     boolean initialized -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):157:158 -> <init>
     1:13:java.lang.Object get():164:176 -> get
     1:3:java.lang.String toString():181:183 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.jZ:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.zX:
     java.lang.Object jla -> a
     int $r8$clinit -> b
     1:3:java.lang.Object com.android.tools.r8.com.google.common.base.Throwables.getJLA():480:482 -> <clinit>
@@ -12906,43 +12834,39 @@
     1:3:void <init>(java.util.Map):116:118 -> <init>
     1:1:java.util.Map access$000(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):86:86 -> a
     2:2:int access$212(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,int):86:86 -> a
-    3:5:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.iteratorOrListIterator(java.util.Collection):580:582 -> a
-    3:5:java.util.Iterator access$100(java.util.Collection):86 -> a
-    6:6:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.removeValuesForKey(java.lang.Object):1113:1113 -> a
+    3:3:void access$300(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):86:86 -> a
+    4:4:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.removeValuesForKey(java.lang.Object):1113:1113 -> a
+    4:4:void access$300(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):86 -> a
+    5:5:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3539:3539 -> a
+    5:5:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.removeValuesForKey(java.lang.Object):1113 -> a
+    5:5:void access$300(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):86 -> a
+    6:6:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
+    6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3539 -> a
+    6:6:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.removeValuesForKey(java.lang.Object):1113 -> a
     6:6:void access$300(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):86 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3539:3539 -> a
+    7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3541:3541 -> a
     7:7:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.removeValuesForKey(java.lang.Object):1113 -> a
     7:7:void access$300(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):86 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    8:8:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3539 -> a
-    8:8:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.removeValuesForKey(java.lang.Object):1113 -> a
-    8:8:void access$300(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):86 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    9:9:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3541:3541 -> a
-    9:9:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.removeValuesForKey(java.lang.Object):1113 -> a
-    9:9:void access$300(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):86 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    10:15:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.removeValuesForKey(java.lang.Object):1113:1118 -> a
-    10:15:void access$300(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):86 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:java.util.Collection entries():1217:1217 -> a
-    17:20:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):1252:1255 -> a
-    21:21:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):1254:1254 -> a
+    8:13:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.removeValuesForKey(java.lang.Object):1113:1118 -> a
+    8:13:void access$300(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):86 -> a
+    14:14:boolean put(java.lang.Object,java.lang.Object):184:184 -> a
+    15:15:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createCollection(java.lang.Object):161:161 -> a
+    15:15:boolean put(java.lang.Object,java.lang.Object):186 -> a
+    16:16:java.util.List com.android.tools.r8.com.google.common.collect.ArrayListMultimap.createCollection():131:131 -> a
+    16:16:java.util.Collection com.android.tools.r8.com.google.common.collect.ArrayListMultimap.createCollection():61 -> a
+    16:16:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createCollection(java.lang.Object):161 -> a
+    16:16:boolean put(java.lang.Object,java.lang.Object):186 -> a
+    17:25:boolean put(java.lang.Object,java.lang.Object):187:195 -> a
+    26:28:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.iteratorOrListIterator(java.util.Collection):580:582 -> a
+    26:28:java.util.Iterator access$100(java.util.Collection):86 -> a
+    29:29:java.util.Collection entries():1217:1217 -> a
+    30:33:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):1252:1255 -> a
+    34:34:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):1254:1254 -> a
     1:1:int access$208(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):86:86 -> b
     2:2:int access$220(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,int):86:86 -> b
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1320:1320 -> b
     3:3:java.util.Map$Entry lambda$entrySpliterator$0(java.lang.Object,java.lang.Object):1255 -> b
     1:1:int access$210(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):86:86 -> c
-    2:2:boolean put(java.lang.Object,java.lang.Object):184:184 -> c
-    3:3:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createCollection(java.lang.Object):161:161 -> c
-    3:3:boolean put(java.lang.Object,java.lang.Object):186 -> c
-    4:4:java.util.List com.android.tools.r8.com.google.common.collect.ArrayListMultimap.createCollection():131:131 -> c
-    4:4:java.util.Collection com.android.tools.r8.com.google.common.collect.ArrayListMultimap.createCollection():61 -> c
-    4:4:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createCollection(java.lang.Object):161 -> c
-    4:4:boolean put(java.lang.Object,java.lang.Object):186 -> c
-    5:13:boolean put(java.lang.Object,java.lang.Object):187:195 -> c
     1:5:void clear():270:274 -> clear
     1:1:boolean containsKey(java.lang.Object):177:177 -> containsKey
     1:1:java.util.Map createAsMap():1270:1270 -> d
@@ -13152,7 +13076,6 @@
     1:3:void refreshIfEmpty():345:347 -> c
     4:4:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection.getDelegate():416:416 -> c
     4:4:void refreshIfEmpty():347 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:11:void refreshIfEmpty():347:353 -> c
     1:7:void clear():530:536 -> clear
     1:2:boolean contains(java.lang.Object):518:519 -> contains
@@ -13296,25 +13219,25 @@
     4:4:void forEachEntry(java.util.function.ObjIntConsumer):158 -> a
     5:5:void forEachEntry(java.util.function.ObjIntConsumer):159:159 -> a
     6:6:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,java.lang.Object,com.android.tools.r8.com.google.common.collect.Count):159:159 -> a
-    7:12:int setCount(java.lang.Object,int):301:306 -> a
-    13:13:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.getAndSet(com.android.tools.r8.com.google.common.collect.Count,int):326:326 -> a
-    13:13:int setCount(java.lang.Object,int):307 -> a
-    14:14:int setCount(java.lang.Object,int):317:317 -> a
+    7:26:int remove(java.lang.Object,int):274:293 -> a
+    27:27:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):192:192 -> a
+    27:27:int remove(java.lang.Object,int):276 -> a
     1:1:java.util.Map access$100(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):47:47 -> b
-    2:21:int remove(java.lang.Object,int):274:293 -> b
-    22:22:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):192:192 -> b
-    22:22:int remove(java.lang.Object,int):276 -> b
+    2:16:int add(java.lang.Object,int):252:266 -> b
+    17:17:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,long):205:205 -> b
+    17:17:int add(java.lang.Object,int):263 -> b
+    18:18:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):192:192 -> b
+    18:18:int add(java.lang.Object,int):254 -> b
     1:1:int distinctElements():173:173 -> c
-    2:16:int add(java.lang.Object,int):252:266 -> c
-    17:17:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,long):205:205 -> c
-    17:17:int add(java.lang.Object,int):263 -> c
-    18:18:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):192:192 -> c
-    18:18:int add(java.lang.Object,int):254 -> c
     1:5:void clear():164:168 -> clear
     1:2:java.util.Iterator elementIterator():85:86 -> d
     1:2:java.util.Iterator entryIterator():113:114 -> e
     1:1:java.util.Set entrySet():80:80 -> entrySet
-    1:2:int count(java.lang.Object):236:237 -> f
+    1:6:int setCount(java.lang.Object,int):301:306 -> f
+    7:7:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.getAndSet(com.android.tools.r8.com.google.common.collect.Count,int):326:326 -> f
+    7:7:int setCount(java.lang.Object,int):307 -> f
+    8:8:int setCount(java.lang.Object,int):317:317 -> f
+    1:2:int count(java.lang.Object):236:237 -> g
     1:1:int size():180:180 -> size
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 -> com.android.tools.r8.internal.t0:
     java.util.Map$Entry toRemove -> b
@@ -13432,22 +13355,22 @@
     java.util.Set elementSet -> b
     1:1:void <init>():45:45 -> <init>
     1:3:java.util.Set elementSet():131:133 -> D
+    int remove(java.lang.Object,int) -> a
     1:1:java.util.Set createElementSet():143:143 -> a
-    2:10:int com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int):924:932 -> a
-    2:10:int setCount(java.lang.Object,int):87 -> a
-    11:15:boolean com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int,int):940:944 -> a
-    11:15:boolean setCount(java.lang.Object,int,int):93 -> a
     1:1:boolean add(java.lang.Object):62:62 -> add
     1:1:boolean addAll(java.util.Collection):107:107 -> addAll
-    int remove(java.lang.Object,int) -> b
-    1:1:java.util.Set createEntrySet():191:191 -> b
+    1:1:int add(java.lang.Object,int):69:69 -> b
+    2:2:java.util.Set createEntrySet():191:191 -> b
     int distinctElements() -> c
-    1:1:int add(java.lang.Object,int):69:69 -> c
+    1:5:boolean com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int,int):940:944 -> c
+    1:5:boolean setCount(java.lang.Object,int,int):93 -> c
     1:1:boolean contains(java.lang.Object):55:55 -> contains
     java.util.Iterator elementIterator() -> d
     java.util.Iterator entryIterator() -> e
     1:3:java.util.Set entrySet():165:167 -> entrySet
     1:1:boolean equals(java.lang.Object):208:208 -> equals
+    1:9:int com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int):924:932 -> f
+    1:9:int setCount(java.lang.Object,int):87 -> f
     1:1:int hashCode():218:218 -> hashCode
     1:1:boolean isEmpty():50:50 -> isEmpty
     1:1:boolean remove(java.lang.Object):75:75 -> remove
@@ -13526,7 +13449,7 @@
     1:9:boolean com.android.tools.r8.com.google.common.collect.Multisets$EntrySet.remove(java.lang.Object):0 -> remove
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:int size():186:186 -> size
-com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.internal.h3:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.internal.f3:
     int expectedValuesPerKey -> h
     1:3:void <init>(int,int):112:114 -> <init>
     1:2:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.containsEntry(java.lang.Object,java.lang.Object):60:61 -> a
@@ -13543,30 +13466,30 @@
     2:3:boolean remove(java.lang.Object,java.lang.Object):61 -> remove
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():263:263 -> toString
     1:1:java.lang.String toString():61 -> toString
-com.android.tools.r8.com.google.common.collect.ArrayListMultimapGwtSerializationDependencies -> com.android.tools.r8.internal.i3:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimapGwtSerializationDependencies -> com.android.tools.r8.internal.g3:
     1:1:void com.android.tools.r8.com.google.common.collect.AbstractListMultimap.<init>(java.util.Map):44:44 -> <init>
     1:1:void <init>(java.util.Map):36 -> <init>
     1:1:java.util.List com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):76:76 -> a
     1:1:java.util.List com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
+    2:2:boolean com.android.tools.r8.com.google.common.collect.AbstractListMultimap.put(java.lang.Object,java.lang.Object):115:115 -> a
+    2:2:boolean com.android.tools.r8.com.google.common.collect.AbstractListMultimap.put(java.lang.Object,java.lang.Object):0 -> a
+      # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractListMultimap.asMap():126:126 -> b
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractListMultimap.asMap():0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-    1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractListMultimap.put(java.lang.Object,java.lang.Object):115:115 -> c
-    1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractListMultimap.put(java.lang.Object,java.lang.Object):0 -> c
-      # {"id":"com.android.tools.r8.synthesized"}
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractListMultimap.equals(java.lang.Object):137:137 -> equals
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractListMultimap.equals(java.lang.Object):0 -> equals
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):35:35 -> get
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):0 -> get
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.collect.BaseImmutableMultimap -> com.android.tools.r8.internal.p4:
+com.android.tools.r8.com.google.common.collect.BaseImmutableMultimap -> com.android.tools.r8.internal.m4:
     1:1:void <init>():25:25 -> <init>
-com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.H4:
+com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.E4:
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> g
-com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.V5:
+com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.S5:
     com.android.tools.r8.com.google.common.collect.Ordering ordering -> c
     com.android.tools.r8.com.google.common.base.Function function -> b
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Function,com.android.tools.r8.com.google.common.collect.Ordering):36:38 -> <init>
@@ -13576,11 +13499,11 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):77:77 -> hashCode
     2:2:int hashCode():60 -> hashCode
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.Yb:
+com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.Db:
     1:1:void checkEntryNotNull(java.lang.Object,java.lang.Object):32:32 -> a
     2:2:void checkEntryNotNull(java.lang.Object,java.lang.Object):30:30 -> a
     3:3:int checkNonnegative(int,java.lang.String):39:39 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.fc:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.Kb:
     1:1:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction,java.util.Comparator):98:98 -> a
     1:1:java.util.Spliterator indexed(int,int,java.util.function.IntFunction):42 -> a
     2:2:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):108:108 -> a
@@ -13595,7 +13518,7 @@
     11:11:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
     11:11:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):213 -> a
     12:12:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):214:214 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.Zb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.Eb:
     java.util.Spliterator val$fromSpliterator -> a
     java.util.function.Function val$function -> b
     1:1:void <init>(java.util.Spliterator,java.util.function.Function):110:110 -> <init>
@@ -13606,7 +13529,7 @@
     1:1:void forEachRemaining(java.util.function.Consumer):120:120 -> forEachRemaining
     1:1:boolean tryAdvance(java.util.function.Consumer):114:114 -> tryAdvance
     1:2:java.util.Spliterator trySplit():125:126 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.ac:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.Fb:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -13624,7 +13547,7 @@
     4:4:java.util.Spliterator trySplit():172 -> trySplit
     5:5:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):194:194 -> trySplit
     5:5:java.util.Spliterator trySplit():172 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.bc:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.Gb:
     java.util.function.IntFunction val$function -> b
     java.util.Spliterator$OfInt delegate -> a
     java.util.Comparator val$comparator -> d
@@ -13638,7 +13561,7 @@
     1:4:java.util.Comparator getComparator():91:94 -> getComparator
     1:1:boolean tryAdvance(java.util.function.Consumer):62:62 -> tryAdvance
     1:2:java.util.Spliterator trySplit():72:73 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator -> com.android.tools.r8.internal.dc:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator -> com.android.tools.r8.internal.Ib:
     long estimatedSize -> f
     java.util.function.Function function -> c
     java.util.Spliterator from -> b
@@ -13653,52 +13576,52 @@
     1:12:void forEachRemaining(java.util.function.Consumer):353:364 -> forEachRemaining
     1:9:boolean tryAdvance(java.util.function.Consumer):337:345 -> tryAdvance
     1:17:java.util.Spliterator trySplit():369:385 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory -> com.android.tools.r8.internal.cc:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory -> com.android.tools.r8.internal.Hb:
     java.util.Spliterator newFlatMapSpliterator(java.util.Spliterator,java.util.Spliterator,java.util.function.Function,int,long) -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliteratorOfObject -> com.android.tools.r8.internal.ec:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliteratorOfObject -> com.android.tools.r8.internal.Jb:
     1:1:void <init>(java.util.Spliterator,java.util.Spliterator,java.util.function.Function,int,long):425:425 -> <init>
-com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.vc:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.ac:
     java.util.Comparator comparator -> b
     1:2:void <init>(java.util.Comparator):31:32 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):37:37 -> compare
     1:3:boolean equals(java.lang.Object):45:47 -> equals
     1:1:int hashCode():54:54 -> hashCode
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset -> com.android.tools.r8.internal.td:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset -> com.android.tools.r8.internal.Vc:
     java.util.concurrent.ConcurrentMap countMap -> d
     1:3:void <init>(java.util.concurrent.ConcurrentMap):126:128 -> <init>
     1:1:java.util.concurrent.ConcurrentMap access$100(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):59:59 -> a
-    2:2:int setCount(java.lang.Object,int):348:348 -> a
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    3:3:int setCount(java.lang.Object,int):348 -> a
-    4:37:int setCount(java.lang.Object,int):349:382 -> a
-    38:38:boolean setCount(java.lang.Object,int,int):404:404 -> a
-    39:39:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    39:39:boolean setCount(java.lang.Object,int,int):404 -> a
-    40:71:boolean setCount(java.lang.Object,int,int):405:436 -> a
-    72:73:java.util.Set createElementSet():449:450 -> a
-    1:1:int remove(java.lang.Object,int):272:272 -> b
-    2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):0:0 -> b
-    2:2:int remove(java.lang.Object,int):274 -> b
-    3:15:int remove(java.lang.Object,int):276:288 -> b
-    16:16:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):54:54 -> b
-    16:16:int remove(java.lang.Object,int):274 -> b
-    17:17:java.util.Set createEntrySet():487:487 -> b
-    1:1:int add(java.lang.Object,int):204:204 -> c
+    2:2:int remove(java.lang.Object,int):272:272 -> a
+    3:3:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):0:0 -> a
+    3:3:int remove(java.lang.Object,int):274 -> a
+    4:16:int remove(java.lang.Object,int):276:288 -> a
+    17:17:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):54:54 -> a
+    17:17:int remove(java.lang.Object,int):274 -> a
+    18:19:java.util.Set createElementSet():449:450 -> a
+    1:1:int add(java.lang.Object,int):204:204 -> b
+    2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> b
+    2:2:int add(java.lang.Object,int):204 -> b
+    3:3:int add(java.lang.Object,int):206:206 -> b
+    4:4:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):0:0 -> b
+    4:4:int add(java.lang.Object,int):208 -> b
+    5:33:int add(java.lang.Object,int):211:239 -> b
+    34:34:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):54:54 -> b
+    34:34:int add(java.lang.Object,int):208 -> b
+    35:35:java.util.Set createEntrySet():487:487 -> b
+    1:1:boolean setCount(java.lang.Object,int,int):404:404 -> c
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> c
-    2:2:int add(java.lang.Object,int):204 -> c
-    3:3:int add(java.lang.Object,int):206:206 -> c
-    4:4:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):0:0 -> c
-    4:4:int add(java.lang.Object,int):208 -> c
-    5:33:int add(java.lang.Object,int):211:239 -> c
-    34:34:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):54:54 -> c
-    34:34:int add(java.lang.Object,int):208 -> c
+    2:2:boolean setCount(java.lang.Object,int,int):404 -> c
+    3:34:boolean setCount(java.lang.Object,int,int):405:436 -> c
     35:35:int distinctElements():492:492 -> c
     1:1:void clear():554:554 -> clear
     1:1:java.util.Iterator elementIterator():480:480 -> d
     1:21:java.util.Iterator entryIterator():504:524 -> e
     1:1:com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset create():89:89 -> f
-    2:3:int count(java.lang.Object):141:142 -> f
+    2:2:int setCount(java.lang.Object,int):348:348 -> f
+    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> f
+    3:3:int setCount(java.lang.Object,int):348 -> f
+    4:37:int setCount(java.lang.Object,int):349:382 -> f
+    1:2:int count(java.lang.Object):141:142 -> g
     1:1:boolean isEmpty():497:497 -> isEmpty
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.Multisets.iteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1043:1043 -> iterator
     1:1:java.util.Iterator iterator():549 -> iterator
@@ -13739,7 +13662,7 @@
     22:25:java.util.List com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset.snapshot():181:184 -> toArray
     22:25:java.lang.Object[] toArray(java.lang.Object[]):172 -> toArray
     26:26:java.lang.Object[] toArray(java.lang.Object[]):172:172 -> toArray
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1 -> com.android.tools.r8.internal.pd:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1 -> com.android.tools.r8.internal.Rc:
     java.util.Set val$delegate -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset,java.util.Set):450:450 -> <init>
     1:1:boolean contains(java.lang.Object):458:458 -> contains
@@ -13768,7 +13691,7 @@
     2:2:boolean removeAll(java.util.Collection):473 -> removeAll
     3:3:boolean com.android.tools.r8.com.google.common.collect.ForwardingSet.standardRemoveAll(java.util.Collection):77:77 -> removeAll
     3:3:boolean removeAll(java.util.Collection):473 -> removeAll
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2 -> com.android.tools.r8.internal.qd:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2 -> com.android.tools.r8.internal.Sc:
     java.util.Iterator mapEntries -> d
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):505:507 -> <init>
     1:7:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2.computeNext():512:518 -> l
@@ -13776,7 +13699,7 @@
     8:8:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):235:235 -> l
     8:8:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2.computeNext():518 -> l
     8:8:java.lang.Object computeNext():505 -> l
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3 -> com.android.tools.r8.internal.rd:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3 -> com.android.tools.r8.internal.Tc:
     java.util.Iterator val$readOnlyIterator -> c
     com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset this$0 -> d
     com.android.tools.r8.com.google.common.collect.Multiset$Entry last -> b
@@ -13789,7 +13712,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():540 -> remove
     3:4:void remove():541:542 -> remove
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$EntrySet -> com.android.tools.r8.internal.sd:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$EntrySet -> com.android.tools.r8.internal.Uc:
     com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):558:558 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset,com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1):558:558 -> <init>
@@ -13833,7 +13756,7 @@
     19:19:java.util.List com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$EntrySet.snapshot():582:582 -> toArray
     19:19:java.lang.Object[] toArray(java.lang.Object[]):576 -> toArray
     20:20:java.lang.Object[] toArray(java.lang.Object[]):576:576 -> toArray
-com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.je:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.Ld:
     int value -> b
     1:2:void <init>(int):30:31 -> <init>
     1:1:void add(int):39:39 -> a
@@ -13844,11 +13767,11 @@
     1:1:boolean equals(java.lang.Object):63:63 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.Ph:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.zh:
     com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap INSTANCE -> h
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():31:31 -> <init>
-com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.Rk:
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.vk:
     com.android.tools.r8.com.google.common.base.Optional iterableDelegate -> b
     1:2:void <init>():118:119 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.FluentIterable concat(java.lang.Iterable,java.lang.Iterable):191:191 -> a
@@ -13890,7 +13813,7 @@
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterators.toString(java.util.Iterator):281:290 -> toString
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterables.toString(java.lang.Iterable):241 -> toString
     3:12:java.lang.String toString():337 -> toString
-com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.Ok:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.sk:
     java.lang.Iterable val$inputs -> c
     1:1:void <init>(java.lang.Iterable):274:274 -> <init>
     1:1:java.util.Iterator iterator():277:277 -> iterator
@@ -13900,18 +13823,18 @@
     3:4:java.util.Iterator iterator():277 -> iterator
     5:5:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):546:546 -> iterator
     5:5:java.util.Iterator iterator():277 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.Qk:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.uk:
     java.lang.Iterable[] val$inputs -> c
     1:1:void <init>(java.lang.Iterable[]):288:288 -> <init>
     1:1:java.util.Iterator iterator():291:291 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):546:546 -> iterator
     2:2:java.util.Iterator iterator():291 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$3$1 -> com.android.tools.r8.internal.Pk:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3$1 -> com.android.tools.r8.internal.tk:
     com.android.tools.r8.com.google.common.collect.FluentIterable$3 this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.FluentIterable$3,int):293:293 -> <init>
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.FluentIterable$3$1.get(int):296:296 -> a
     1:1:java.lang.Object get(int):293 -> a
-com.android.tools.r8.com.google.common.collect.ForwardingIterator -> com.android.tools.r8.internal.al:
+com.android.tools.r8.com.google.common.collect.ForwardingIterator -> com.android.tools.r8.internal.Ek:
     1:1:void <init>():42:42 -> <init>
     1:1:boolean hasNext():49:49 -> hasNext
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3.delegate():529:529 -> hasNext
@@ -13921,11 +13844,11 @@
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3.delegate():529:529 -> next
     2:2:java.lang.Object next():55 -> next
     3:3:java.lang.Object next():55:55 -> next
-com.android.tools.r8.com.google.common.collect.ForwardingObject -> com.android.tools.r8.internal.bl:
+com.android.tools.r8.com.google.common.collect.ForwardingObject -> com.android.tools.r8.internal.Fk:
     1:1:void <init>():50:50 -> <init>
     java.lang.Object delegate() -> l
     1:1:java.lang.String toString():63:63 -> toString
-com.android.tools.r8.com.google.common.collect.ForwardingSet -> com.android.tools.r8.internal.cl:
+com.android.tools.r8.com.google.common.collect.ForwardingSet -> com.android.tools.r8.internal.Gk:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingCollection.<init>():53:53 -> <init>
     1:1:void <init>():53 -> <init>
     boolean com.android.tools.r8.com.google.common.collect.ForwardingCollection.standardContainsAll(java.util.Collection) -> a
@@ -14039,7 +13962,7 @@
     6:6:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ForwardingCollection.toArray(java.lang.Object[]):126:126 -> toArray
     6:6:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ForwardingCollection.toArray(java.lang.Object[]):0 -> toArray
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.Cm:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.fm:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry firstInKeyInsertionOrder -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry lastInKeyInsertionOrder -> e
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] hashTableKToV -> b
@@ -14122,19 +14045,21 @@
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap.values():493:493 -> values
     1:1:java.util.Collection values():58 -> values
     2:2:java.util.Set values():493:493 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.sm:
+    3:3:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.keySet():630:630 -> values
+    3:3:java.util.Set values():493 -> values
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.Vl:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):498:498 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.HashBiMap$1.output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):501:501 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):498 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.rm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.Ul:
     com.android.tools.r8.com.google.common.collect.HashBiMap$1 this$1 -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):507:508 -> <init>
     1:1:java.lang.Object getKey():513:513 -> getKey
     1:1:java.lang.Object getValue():518:518 -> getValue
     1:16:java.lang.Object setValue(java.lang.Object):523:538 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.tm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.Wl:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKToVBucket -> f
     int keyHash -> d
     int valueHash -> e
@@ -14142,7 +14067,7 @@
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKeyInsertionOrder -> h
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry prevInKeyInsertionOrder -> i
     1:3:void <init>(java.lang.Object,int,java.lang.Object,int):104:106 -> <init>
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.ym:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.bm:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):573:573 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap,com.android.tools.r8.com.google.common.collect.HashBiMap$1):573:573 -> <init>
@@ -14189,27 +14114,27 @@
     4:4:java.util.Set values():662:662 -> values
     5:5:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap.keySet():459:459 -> values
     5:5:java.util.Set values():662 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.vm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.Yl:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> g
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):667:667 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1.output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):670:670 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):667 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.um:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.Xl:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 this$2 -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):676:677 -> <init>
     1:1:java.lang.Object getKey():682:682 -> getKey
     1:1:java.lang.Object getValue():687:687 -> getValue
     1:12:java.lang.Object setValue(java.lang.Object):692:703 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.xm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.am:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):634:635 -> <init>
     1:1:java.util.Iterator iterator():651:651 -> iterator
     1:5:boolean remove(java.lang.Object):640:644 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.wm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.Zl:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet):651:651 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):654:654 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.zm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.cm:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry toRemove -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> f
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry next -> b
@@ -14226,33 +14151,33 @@
     5:5:void remove():448 -> remove
     6:8:void remove():449:451 -> remove
     9:9:void remove():446:446 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.Bm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.em:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):463:464 -> <init>
     1:1:java.util.Iterator iterator():469:469 -> iterator
     1:7:boolean remove(java.lang.Object):479:485 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.Am:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.dm:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet):469:469 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):472:472 -> a
-com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.Im:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.lm:
     1:1:void <init>():66:66 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.HashMultiset create():38:38 -> f
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.isEmpty():50:50 -> isEmpty
     1:1:boolean isEmpty():33 -> isEmpty
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.iterator():185:185 -> iterator
     1:1:java.util.Iterator iterator():33 -> iterator
-com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.Om:
+com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.rm:
     1:1:int smear(int):50:50 -> a
     2:2:int smearedHash(java.lang.Object):54:54 -> a
     3:4:int closedTableSize(int,double):62:63 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.Tn:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.yn:
     1:1:void <init>():34:34 -> <init>
     1:1:boolean contains(java.lang.Object):41:41 -> contains
     1:1:boolean isPartialView():56:56 -> e
     1:1:boolean isEmpty():51:51 -> isEmpty
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection() -> j
     1:1:int size():46:46 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.Vn:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.An:
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim.<init>():32:32 -> <init>
     1:1:void <init>():372 -> <init>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):407:407 -> a
@@ -14266,7 +14191,7 @@
     1:1:java.util.Collection values():41 -> values
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():388:388 -> values
     2:2:java.util.Set values():41 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.Un:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.zn:
     1:1:void <init>():176:176 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap build():170:170 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder put(java.lang.Object,java.lang.Object):189:189 -> a
@@ -14286,7 +14211,7 @@
     33:33:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():272 -> b
     34:34:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():67:67 -> b
     34:34:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():270 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Xn:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Cn:
     java.lang.Object[] EMPTY_ARRAY -> b
     1:1:void <clinit>():187:187 -> <clinit>
     1:1:void <init>():176:176 -> <init>
@@ -14323,18 +14248,18 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> toArray
     3:3:java.lang.Object[] toArray(java.lang.Object[]):197 -> toArray
     4:15:java.lang.Object[] toArray(java.lang.Object[]):198:209 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Wn:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Bn:
     1:1:void <init>():404:404 -> <init>
     1:1:int expandedCapacity(int,int):395:395 -> a
     2:2:int expandedCapacity(int,int):390:390 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.Zn:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.En:
     java.lang.Object key -> b
     java.lang.Object value -> c
     1:3:void <init>(java.lang.Object,java.lang.Object):29:31 -> <init>
     1:1:java.lang.Object getKey():36:36 -> getKey
     1:1:java.lang.Object getValue():41:41 -> getValue
     1:1:java.lang.Object setValue(java.lang.Object):46:46 -> setValue
-com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.ao:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.Fn:
     java.util.EnumMap delegate -> f
     1:3:void <init>(java.util.EnumMap):51:53 -> <init>
     1:8:com.android.tools.r8.com.google.common.collect.ImmutableMap asImmutable(java.util.EnumMap):38:45 -> a
@@ -14362,7 +14287,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94:94 -> u
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntryIterator(java.util.Iterator):1361:1361 -> u
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94 -> u
-com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.bo:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.Gn:
     java.util.EnumSet delegate -> e
     int hashCode -> f
     1:2:void <init>(java.util.EnumSet):57:58 -> <init>
@@ -14390,7 +14315,7 @@
     1:1:int size():83:83 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
     1:1:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.jo:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.Nn:
     int $r8$clinit -> c
     1:1:void <init>():377:377 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> a
@@ -14518,11 +14443,11 @@
     1:1:void sort(java.util.Comparator):565:565 -> sort
     1:1:java.util.Spliterator spliterator():580:580 -> spliterator
     1:1:java.util.List subList(int,int):60:60 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.fo:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.Jn:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,int,int):393:393 -> <init>
     1:1:java.lang.Object get(int):396:396 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.go:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.Kn:
     java.lang.Object[] contents -> a
     int size -> b
     boolean forceCopy -> c
@@ -14544,7 +14469,7 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):793 -> b
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):794:795 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.ho:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.Ln:
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):607:608 -> <init>
     1:1:boolean contains(java.lang.Object):626:626 -> contains
@@ -14580,7 +14505,7 @@
     2:2:java.util.ListIterator listIterator(int):604:604 -> listIterator
     1:1:int size():655:655 -> size
     1:1:java.util.List subList(int,int):604:604 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.io:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.Mn:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> f
     int offset -> d
     int length -> e
@@ -14596,14 +14521,14 @@
     2:2:java.util.ListIterator listIterator(int):455:455 -> listIterator
     1:1:int size():466:466 -> size
     1:1:java.util.List subList(int,int):455:455 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.lo:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.Pn:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):377:377 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):390:391 -> get
     1:2:java.util.Collection get(java.lang.Object):50 -> get
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():83:83 -> get
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):391 -> get
     3:3:java.util.Collection get(java.lang.Object):50 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.ko:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.On:
     1:1:void <init>():213:213 -> <init>
     1:4:com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.put(java.lang.Object,java.lang.Object):162:165 -> a
     1:4:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder put(java.lang.Object,java.lang.Object):218 -> a
@@ -14624,7 +14549,7 @@
     12:29:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.fromMapEntries(java.util.Collection,java.util.Comparator):356:373 -> a
     12:29:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():292 -> a
     12:29:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():302 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.qo:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.Un:
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> e
     com.android.tools.r8.com.google.common.collect.ImmutableCollection values -> d
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> b
@@ -14710,12 +14635,12 @@
     4:13:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3607:3616 -> toString
     4:13:java.lang.String toString():894 -> toString
     1:1:java.util.Collection values():63:63 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.mo:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.Qn:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator val$entryIterator -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.UnmodifiableIterator):752:752 -> <init>
     1:1:boolean hasNext():755:755 -> hasNext
     1:1:java.lang.Object next():760:760 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.no:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.Rn:
     java.util.Map$Entry[] entries -> b
     int size -> c
     java.util.Comparator valueComparator -> a
@@ -14731,20 +14656,22 @@
     9:10:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder put(java.lang.Object,java.lang.Object):281 -> a
     11:11:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder put(java.lang.Object,java.lang.Object):283:283 -> a
     12:13:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder orderEntriesByValue(java.util.Comparator):341:342 -> a
-    14:18:com.android.tools.r8.com.google.common.collect.ImmutableMap build():375:379 -> a
-    19:21:com.android.tools.r8.com.google.common.collect.Ordering com.android.tools.r8.com.google.common.collect.Ordering.from(java.util.Comparator):182:184 -> a
-    19:21:com.android.tools.r8.com.google.common.collect.ImmutableMap build():380 -> a
-    22:22:com.android.tools.r8.com.google.common.collect.ImmutableMap build():380:380 -> a
-    23:23:com.android.tools.r8.com.google.common.collect.Ordering com.android.tools.r8.com.google.common.collect.Ordering.onResultOf(com.android.tools.r8.com.google.common.base.Function):449:449 -> a
-    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap build():380 -> a
-    24:34:com.android.tools.r8.com.google.common.collect.ImmutableMap build():379:389 -> a
-    35:35:com.android.tools.r8.com.google.common.collect.ImmutableMap build():386:386 -> a
-    36:36:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):72:72 -> a
-    36:36:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of(java.lang.Object,java.lang.Object):119 -> a
-    36:36:com.android.tools.r8.com.google.common.collect.ImmutableMap build():386 -> a
-    37:37:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of():110:110 -> a
-    37:37:com.android.tools.r8.com.google.common.collect.ImmutableMap build():384 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap -> com.android.tools.r8.internal.po:
+    14:14:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):899:899 -> a
+    14:14:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder orderEntriesByValue(java.util.Comparator):342 -> a
+    15:19:com.android.tools.r8.com.google.common.collect.ImmutableMap build():375:379 -> a
+    20:22:com.android.tools.r8.com.google.common.collect.Ordering com.android.tools.r8.com.google.common.collect.Ordering.from(java.util.Comparator):182:184 -> a
+    20:22:com.android.tools.r8.com.google.common.collect.ImmutableMap build():380 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap build():380:380 -> a
+    24:24:com.android.tools.r8.com.google.common.collect.Ordering com.android.tools.r8.com.google.common.collect.Ordering.onResultOf(com.android.tools.r8.com.google.common.base.Function):449:449 -> a
+    24:24:com.android.tools.r8.com.google.common.collect.ImmutableMap build():380 -> a
+    25:35:com.android.tools.r8.com.google.common.collect.ImmutableMap build():379:389 -> a
+    36:36:com.android.tools.r8.com.google.common.collect.ImmutableMap build():386:386 -> a
+    37:37:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):72:72 -> a
+    37:37:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of(java.lang.Object,java.lang.Object):119 -> a
+    37:37:com.android.tools.r8.com.google.common.collect.ImmutableMap build():386 -> a
+    38:38:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of():110:110 -> a
+    38:38:com.android.tools.r8.com.google.common.collect.ImmutableMap build():384 -> a
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap -> com.android.tools.r8.internal.Tn:
     1:1:void <init>():475:475 -> <init>
     1:1:java.util.Set entrySet():475:475 -> entrySet
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():503:503 -> k
@@ -14753,28 +14680,28 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():508:508 -> m
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator() -> u
     1:1:java.util.Collection values():475:475 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.oo:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.Sn:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap):492:492 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():500:500 -> f
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl.iterator():500:500 -> iterator
     1:1:java.util.Iterator iterator():492 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():495:495 -> k
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.to:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.Xn:
     1:2:void <init>(java.lang.Object,java.lang.Object):47:48 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket() -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket() -> c
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.ro:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.Vn:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInValueBucket -> e
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):102:103 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():109:109 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.so:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.Wn:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInKeyBucket -> d
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):78:79 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():84:84 -> b
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.vo:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.Zn:
     1:1:void <init>():80:80 -> <init>
     1:4:boolean contains(java.lang.Object):91:94 -> contains
     1:1:boolean isPartialView():101:101 -> e
@@ -14784,7 +14711,7 @@
     2:2:boolean isHashCodeFast():107 -> i
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> k
     1:1:int size():86:86 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.uo:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.Yn:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> f
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList):43:45 -> <init>
@@ -14796,7 +14723,7 @@
     1:1:java.util.Iterator iterator():35 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():50:50 -> k
     1:1:java.util.Spliterator spliterator():66:66 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.wo:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.ao:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):38:39 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):70:70 -> a
@@ -14812,7 +14739,7 @@
     1:1:java.util.Iterator iterator():34 -> iterator
     1:1:int size():44:44 -> size
     1:1:java.util.Spliterator spliterator():54:54 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.zo:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.do:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):39:40 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):36:36 -> a
@@ -14839,18 +14766,18 @@
     1:1:java.util.Iterator iterator():35 -> iterator
     1:1:int size():45:45 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.xo:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.bo:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryItr -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):50:51 -> <init>
     1:1:boolean hasNext():55:55 -> hasNext
     1:1:java.lang.Object next():60:60 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.yo:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.co:
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues,com.android.tools.r8.com.google.common.collect.ImmutableList):83:83 -> <init>
     1:1:java.lang.Object get(int):86:86 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():91:91 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.Eo:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.io:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> f
     int size -> g
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):345:347 -> <init>
@@ -14890,7 +14817,7 @@
     1:1:int size():482:482 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():263:263 -> toString
     1:1:java.lang.String toString():68 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.Ao:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.eo:
     java.util.Iterator valueItr -> d
     java.util.Iterator asMapItr -> b
     java.lang.Object currentKey -> c
@@ -14901,45 +14828,40 @@
     7:7:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1320:1320 -> next
     7:7:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.next():581 -> next
     7:7:java.lang.Object next():563 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.Bo:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.fo:
     java.util.Map builderMap -> a
     1:2:void <init>():151:152 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.Co:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.go:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap multimap -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):530:531 -> <init>
     1:3:boolean contains(java.lang.Object):551:553 -> contains
     1:1:boolean isPartialView():541:541 -> e
     2:2:boolean com.android.tools.r8.com.google.common.collect.ImmutableMultimap.isPartialView():465:465 -> e
     2:2:boolean isPartialView():541 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():536:536 -> f
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMultimap.entryIterator():563:563 -> f
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():536 -> f
     1:1:int size():546:546 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():482:482 -> size
     2:2:int size():546 -> size
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.Do:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.ho:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> f
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):625:625 -> <init>
     1:1:boolean contains(java.lang.Object):628:628 -> contains
     2:2:boolean com.android.tools.r8.com.google.common.collect.ImmutableMultimap.containsKey(java.lang.Object):472:472 -> contains
     2:2:boolean contains(java.lang.Object):628 -> contains
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     boolean isPartialView() -> e
-    1:2:int count(java.lang.Object):633:634 -> f
+    1:2:int count(java.lang.Object):633:634 -> g
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():639:639 -> h
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMultimap.keySet():493:493 -> h
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():639 -> h
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):649:650 -> i
     3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):235:235 -> i
     3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):650 -> i
     1:1:int size():644:644 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():482:482 -> size
     2:2:int size():644 -> size
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.Jo:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.no:
     int $r8$clinit -> e
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
@@ -14947,15 +14869,15 @@
     1:1:void <init>():223 -> <init>
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys.elementSet():623:623 -> D
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList asList():254:255 -> a
-    3:3:int setCount(java.lang.Object,int):302:302 -> a
-    4:4:boolean setCount(java.lang.Object,int,int):316:316 -> a
-    5:7:int copyIntoArray(java.lang.Object[],int):322:324 -> a
-    1:1:int remove(java.lang.Object,int):288:288 -> b
-    1:1:int add(java.lang.Object,int):274:274 -> c
+    3:3:int remove(java.lang.Object,int):288:288 -> a
+    4:6:int copyIntoArray(java.lang.Object[],int):322:324 -> a
+    1:1:int add(java.lang.Object,int):274:274 -> b
+    1:1:boolean setCount(java.lang.Object,int,int):316:316 -> c
     1:1:boolean contains(java.lang.Object):260:260 -> contains
     1:1:java.util.Set entrySet():54:54 -> entrySet
     1:1:boolean equals(java.lang.Object):331:331 -> equals
     1:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():227:228 -> f
+    3:3:int setCount(java.lang.Object,int):302:302 -> f
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder builder():430:430 -> g
     2:2:void com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder.<init>():460:460 -> g
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder builder():430 -> g
@@ -14972,14 +14894,14 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():353 -> i
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():353:353 -> i
     1:1:java.lang.String toString():341:341 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.Fo:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.jo:
     java.util.Iterator val$entryIterator -> d
     java.lang.Object element -> c
     int remaining -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,java.util.Iterator):228:228 -> <init>
     1:1:boolean hasNext():234:234 -> hasNext
     1:7:java.lang.Object next():239:245 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.Go:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.ko:
     com.android.tools.r8.com.google.common.collect.Multiset contents -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):463:464 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder add(java.lang.Object):477:477 -> a
@@ -14999,7 +14921,7 @@
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):219:219 -> a
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyOf(java.lang.Iterable):193 -> a
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableMultiset build():567 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Ho:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$ElementSet -> com.android.tools.r8.internal.lo:
     java.util.List entries -> e
     com.android.tools.r8.com.google.common.collect.Multiset delegate -> f
     1:3:void <init>(java.util.List,com.android.tools.r8.com.google.common.collect.Multiset):584:586 -> <init>
@@ -15007,7 +14929,7 @@
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):591:591 -> get
     1:1:int size():606:606 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.Io:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.mo:
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset):363:363 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1):363:363 -> <init>
@@ -15017,7 +14939,7 @@
     1:1:java.lang.Object get(int):362 -> get
     1:1:int hashCode():394:394 -> hashCode
     1:1:int size():376:376 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.Qo:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.uo:
     int $r8$clinit -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
     1:1:void <init>():302:302 -> <init>
@@ -15068,7 +14990,7 @@
     1:1:int access$000(int):53 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():75:75 -> j
     2:14:int chooseTableSize(int):643:655 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.Ko:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.oo:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl impl -> a
     boolean forceCopy -> b
     1:1:void <init>():481:481 -> <init>
@@ -15096,7 +15018,7 @@
     5:5:void com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.copyIfNecessary():500:500 -> b
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):512 -> b
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):513:513 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.Mo:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.qo:
     1:1:void <init>():345:345 -> <init>
     1:1:int copyIntoArray(java.lang.Object[],int):369:369 -> a
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():350:350 -> f
@@ -15108,13 +15030,13 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed.iterator():350:350 -> iterator
     1:1:java.util.Iterator iterator():345 -> iterator
     1:1:java.util.Spliterator spliterator():355:355 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.Lo:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.po:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):374:374 -> <init>
     1:1:java.lang.Object get(int):377:377 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1.delegateCollection():382:382 -> j
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():374 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableSet$JdkBackedSetBuilderImpl -> com.android.tools.r8.internal.No:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$JdkBackedSetBuilderImpl -> com.android.tools.r8.internal.ro:
     java.util.Set delegate -> c
     1:4:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl):847:850 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl add(java.lang.Object):856:856 -> a
@@ -15129,7 +15051,7 @@
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():75:75 -> a
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableSet build():872 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl copy():865:865 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableSet$RegularSetBuilderImpl -> com.android.tools.r8.internal.Oo:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$RegularSetBuilderImpl -> com.android.tools.r8.internal.so:
     java.lang.Object[] hashTable -> c
     int hashCode -> f
     int maxRunBeforeFallback -> d
@@ -15160,7 +15082,7 @@
     4:12:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ImmutableSet.rebuildHashTable(int,java.lang.Object[],int):442:450 -> c
     4:12:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():816 -> c
     13:17:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():816:820 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl -> com.android.tools.r8.internal.Po:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl -> com.android.tools.r8.internal.to:
     java.lang.Object[] dedupedElements -> a
     int distinct -> b
     1:3:void <init>(int):566:568 -> <init>
@@ -15173,7 +15095,7 @@
     2:5:void addDedupedElement(java.lang.Object):591 -> b
     6:6:void addDedupedElement(java.lang.Object):592:592 -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review() -> c
-com.android.tools.r8.com.google.common.collect.IndexedImmutableSet -> com.android.tools.r8.internal.Yo:
+com.android.tools.r8.com.google.common.collect.IndexedImmutableSet -> com.android.tools.r8.internal.Co:
     1:1:void <init>():27:27 -> <init>
     1:1:int copyIntoArray(java.lang.Object[],int):52:52 -> a
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():32:32 -> f
@@ -15183,14 +15105,14 @@
     3:5:void forEach(java.util.function.Consumer):43:45 -> forEach
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():57:57 -> h
     1:1:java.util.Spliterator spliterator():37:37 -> spliterator
-com.android.tools.r8.com.google.common.collect.IndexedImmutableSet$1 -> com.android.tools.r8.internal.Xo:
+com.android.tools.r8.com.google.common.collect.IndexedImmutableSet$1 -> com.android.tools.r8.internal.Bo:
     com.android.tools.r8.com.google.common.collect.IndexedImmutableSet this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.IndexedImmutableSet):57:57 -> <init>
     1:1:boolean isPartialView():65:65 -> e
     1:1:java.lang.Object get(int):60:60 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():75:75 -> j
     1:1:int size():70:70 -> size
-com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.gv:
+com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.Au:
     1:2:boolean contains(java.lang.Iterable,java.lang.Object):136:137 -> a
     3:5:boolean com.android.tools.r8.com.google.common.collect.Collections2.safeContains(java.util.Collection,java.lang.Object):101:103 -> a
     3:5:boolean contains(java.lang.Iterable,java.lang.Object):138 -> a
@@ -15253,12 +15175,12 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> d
     2:2:java.lang.Iterable skip(java.lang.Iterable,int):852 -> d
     3:5:java.lang.Iterable skip(java.lang.Iterable,int):853:855 -> d
-com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.bv:
+com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.vu:
     1:1:void <init>():1023:1023 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):1023:1023 -> apply
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$10.apply(java.lang.Iterable):1026:1026 -> apply
     2:2:java.lang.Object apply(java.lang.Object):1023 -> apply
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.cv:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.wu:
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> d
     java.lang.Iterable val$unfiltered -> c
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):556:556 -> <init>
@@ -15289,7 +15211,7 @@
     4:4:java.util.Spliterator spliterator():575 -> spliterator
     5:5:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):194:194 -> spliterator
     5:5:java.util.Spliterator spliterator():575 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.dv:
+com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.xu:
     java.lang.Iterable val$fromIterable -> c
     com.android.tools.r8.com.google.common.base.Function val$function -> d
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):695:695 -> <init>
@@ -15307,7 +15229,7 @@
     4:4:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.transform(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):780:780 -> iterator
     4:4:java.util.Iterator iterator():698 -> iterator
     1:1:java.util.Spliterator spliterator():709:709 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.fv:
+com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.zu:
     int val$numberToSkip -> d
     java.lang.Iterable val$iterable -> c
     1:1:void <init>(java.lang.Iterable,int):855:855 -> <init>
@@ -15321,7 +15243,7 @@
     11:15:java.util.Iterator iterator():865 -> iterator
     16:16:java.util.Iterator iterator():872:872 -> iterator
     1:6:java.util.Spliterator spliterator():897:902 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.ev:
+com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.yu:
     java.util.Iterator val$iterator -> c
     boolean atStart -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Iterables$6,java.util.Iterator):872:873 -> <init>
@@ -15331,7 +15253,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():889 -> remove
     3:3:void remove():890:890 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.uv:
+com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.Ou:
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():88:88 -> a
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator emptyIterator():77 -> a
     2:6:boolean removeAll(java.util.Iterator,java.util.Collection):198:202 -> a
@@ -15357,48 +15279,51 @@
     20:20:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):482 -> a
     21:24:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):759:762 -> a
     21:24:boolean any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):661 -> a
-    25:25:java.util.Iterator limit(java.util.Iterator,int):905:905 -> a
-    26:26:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    26:26:java.util.Iterator limit(java.util.Iterator,int):905 -> a
-    27:28:java.util.Iterator limit(java.util.Iterator,int):906:907 -> a
-    29:29:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001:1001 -> a
-    30:35:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1013:1018 -> a
-    30:35:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
-    36:36:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():88:88 -> a
-    36:36:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1020 -> a
-    36:36:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
-    37:37:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1022:1022 -> a
+    25:25:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):899:899 -> a
+    25:25:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):759 -> a
+    25:25:boolean any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):661 -> a
+    26:26:java.util.Iterator limit(java.util.Iterator,int):905:905 -> a
+    27:27:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
+    27:27:java.util.Iterator limit(java.util.Iterator,int):905 -> a
+    28:29:java.util.Iterator limit(java.util.Iterator,int):906:907 -> a
+    30:30:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001:1001 -> a
+    31:36:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1013:1018 -> a
+    31:36:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
+    37:37:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():88:88 -> a
+    37:37:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1020 -> a
     37:37:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
-    38:38:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator singletonIterator(java.lang.Object):1049:1049 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.kv:
+    38:38:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1022:1022 -> a
+    38:38:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator singletonIterator(java.lang.Object):1049:1049 -> a
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.Eu:
     java.util.Iterator val$iterator -> b
     1:1:void <init>(java.util.Iterator):133:133 -> <init>
     1:1:boolean hasNext():136:136 -> hasNext
     1:1:java.lang.Object next():141:141 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.lv:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.Fu:
     java.util.Iterator iterator -> b
     java.lang.Iterable val$iterable -> c
     1:2:void <init>(java.lang.Iterable):391:392 -> <init>
     1:1:boolean hasNext():405:405 -> hasNext
     1:7:java.lang.Object next():410:416 -> next
     1:1:void remove():421:421 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.mv:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.Gu:
     java.lang.Object[] val$elements -> c
     int index -> b
     1:2:void <init>(java.lang.Object[]):450:451 -> <init>
     1:1:boolean hasNext():455:455 -> hasNext
     1:6:java.lang.Object next():460:465 -> next
     7:7:java.lang.Object next():461:461 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.nv:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.Hu:
     java.util.Iterator val$unfiltered -> d
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> e
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):632:632 -> <init>
     1:7:java.lang.Object computeNext():635:641 -> l
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.ov:
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.Iu:
     com.android.tools.r8.com.google.common.base.Function val$function -> c
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):780:780 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):783:783 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.pv:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.Ju:
     java.util.Iterator val$iterator -> d
     int count -> b
     int val$limitSize -> c
@@ -15407,21 +15332,21 @@
     1:5:java.lang.Object next():917:921 -> next
     6:6:java.lang.Object next():918:918 -> next
     1:1:void remove():926:926 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.qv:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.Ku:
     java.lang.Object val$value -> c
     boolean done -> b
     1:1:void <init>(java.lang.Object):1049:1049 -> <init>
     1:1:boolean hasNext():1054:1054 -> hasNext
     1:5:java.lang.Object next():1059:1063 -> next
     6:6:java.lang.Object next():1060:1060 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.rv:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.Lu:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> f
     int offset -> e
     1:1:void <clinit>():1026:1026 -> <clinit>
     1:3:void <init>(java.lang.Object[],int,int,int):1032:1034 -> <init>
     1:1:java.lang.Object get(int):1039:1039 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.sv:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.Mu:
     java.util.Iterator topMetaIterator -> d
     java.util.Iterator iterator -> c
     java.util.Iterator toRemove -> b
@@ -15441,14 +15366,14 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():1372 -> remove
     3:4:void remove():1373:1374 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.tv:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.Nu:
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> b
     1:1:void <clinit>():96:96 -> <clinit>
     1:1:void <init>(java.lang.String,int):95:95 -> <init>
     1:1:java.lang.Object next():105:105 -> next
     1:1:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     1:1:void remove():110 -> remove
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap -> com.android.tools.r8.internal.Dv:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap -> com.android.tools.r8.internal.Wu:
     com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap inverse -> i
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> f
     java.util.Map forwardDelegate -> g
@@ -15464,7 +15389,6 @@
     10:10:com.android.tools.r8.com.google.common.collect.ImmutableBiMap create(int,java.util.Map$Entry[]):38:38 -> a
     11:11:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableEntry.getKey():36:36 -> a
     11:11:com.android.tools.r8.com.google.common.collect.ImmutableBiMap create(int,java.util.Map$Entry[]):39 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:12:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableEntry.getValue():41:41 -> a
     12:12:com.android.tools.r8.com.google.common.collect.ImmutableBiMap create(int,java.util.Map$Entry[]):39 -> a
     13:13:com.android.tools.r8.com.google.common.collect.ImmutableBiMap create(int,java.util.Map$Entry[]):39:39 -> a
@@ -15485,8 +15409,7 @@
     boolean isPartialView() -> o
     1:1:int size():65:65 -> size
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():72:78 -> u
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$1 -> com.android.tools.r8.internal.Bv:
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$InverseEntries -> com.android.tools.r8.internal.Cv:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$InverseEntries -> com.android.tools.r8.internal.Vu:
     com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap):84:84 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap,com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$1):84:84 -> <init>
@@ -15497,7 +15420,7 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$InverseEntries.get(int):88 -> get
     3:3:java.lang.Object get(int):83 -> get
     1:1:int size():98:98 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMap -> com.android.tools.r8.internal.Ev:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMap -> com.android.tools.r8.internal.Xu:
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> g
     java.util.Map delegateMap -> f
     1:3:void <init>(java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableList):53:55 -> <init>
@@ -15519,7 +15442,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():86:86 -> m
     boolean isPartialView() -> o
     1:1:int size():60:60 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMultiset -> com.android.tools.r8.internal.Fv:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMultiset -> com.android.tools.r8.internal.Yu:
     com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet -> i
     long size -> h
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> g
@@ -15536,11 +15459,11 @@
     17:17:com.android.tools.r8.com.google.common.collect.ImmutableMultiset create(java.util.Collection):53 -> a
     18:18:com.android.tools.r8.com.google.common.collect.ImmutableMultiset create(java.util.Collection):53:53 -> a
     boolean isPartialView() -> e
-    1:1:int count(java.lang.Object):65:65 -> f
+    1:1:int count(java.lang.Object):65:65 -> g
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():72:73 -> h
     1:1:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):78:78 -> i
     1:1:int size():88:88 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableSet -> com.android.tools.r8.internal.Gv:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableSet -> com.android.tools.r8.internal.Zu:
     java.util.Set delegate -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> f
     1:3:void <init>(java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList):33:35 -> <init>
@@ -15548,7 +15471,7 @@
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):40:40 -> get
     1:1:int size():55:55 -> size
-com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.jC:
+com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.tB:
     1:1:void <init>():74:74 -> <init>
     2:2:void <init>(int):78:78 -> <init>
     1:2:int com.android.tools.r8.com.google.common.collect.Multisets.inferDistinctElements(java.lang.Iterable):378:379 -> a
@@ -15561,7 +15484,7 @@
     1:1:boolean isEmpty():41 -> isEmpty
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.iterator():185:185 -> iterator
     1:1:java.util.Iterator iterator():41 -> iterator
-com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.xC:
+com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.HB:
     1:1:java.util.ArrayList newArrayList(java.lang.Object[]):103:103 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
     2:2:java.util.ArrayList newArrayList(java.lang.Object[]):103 -> a
@@ -15585,19 +15508,18 @@
     27:44:boolean equalsImpl(java.util.List,java.lang.Object):969:986 -> a
     45:55:boolean com.android.tools.r8.com.google.common.collect.Iterators.elementsEqual(java.util.Iterator,java.util.Iterator):263:273 -> a
     45:55:boolean equalsImpl(java.util.List,java.lang.Object):986 -> a
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.uC:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.EB:
     1:1:void <init>(java.util.List):947:947 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.wC:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.GB:
     java.util.List forwardList -> b
     1:2:void <init>(java.util.List):810:811 -> <init>
-    1:1:java.util.List getForwardList():815:815 -> a
+    1:1:int access$000(com.android.tools.r8.com.google.common.collect.Lists$ReverseList,int):807:807 -> a
     2:2:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.size():862:862 -> a
     2:2:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.reversePosition(int):825 -> a
     2:2:int access$000(com.android.tools.r8.com.google.common.collect.Lists$ReverseList,int):807 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     3:3:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.reversePosition(int):826:826 -> a
     3:3:int access$000(com.android.tools.r8.com.google.common.collect.Lists$ReverseList,int):807 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4:4:java.util.List getForwardList():815:815 -> a
     1:1:void add(int,java.lang.Object):832:832 -> add
     2:2:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.size():862:862 -> add
     2:2:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.reversePosition(int):825 -> add
@@ -15650,7 +15572,7 @@
     7:7:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.reversePosition(int):826:826 -> subList
     7:7:java.util.List subList(int,int):868 -> subList
     8:8:java.util.List subList(int,int):868:868 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.vC:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.FB:
     java.util.ListIterator val$forwardIterator -> c
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> d
     boolean canRemoveOrSet -> b
@@ -15675,7 +15597,7 @@
     1:2:void set(java.lang.Object):938:939 -> set
     3:3:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean):494:494 -> set
     3:3:void set(java.lang.Object):938 -> set
-com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.XD:
+com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.eD:
     1:1:java.util.HashMap newHashMap():226:226 -> a
     2:2:int capacity(int):268:268 -> a
     3:3:java.lang.Object safeGet(java.util.Map,java.lang.Object):3513:3513 -> a
@@ -15685,22 +15607,22 @@
     1:1:java.util.HashMap newHashMapWithExpectedSize(int):259:259 -> b
     2:2:java.util.IdentityHashMap newIdentityHashMap():431:431 -> b
     1:1:java.util.LinkedHashMap newLinkedHashMapWithExpectedSize(int):325:325 -> c
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.LD:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.SC:
     1:1:void <init>(java.util.Iterator):117:117 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):117:117 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$1.transform(java.util.Map$Entry):120:120 -> a
     2:2:java.lang.Object transform(java.lang.Object):117 -> a
-com.android.tools.r8.com.google.common.collect.Maps$2 -> com.android.tools.r8.internal.MD:
+com.android.tools.r8.com.google.common.collect.Maps$2 -> com.android.tools.r8.internal.TC:
     1:1:void <init>(java.util.Iterator):126:126 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):126:126 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$2.transform(java.util.Map$Entry):129:129 -> a
     2:2:java.lang.Object transform(java.lang.Object):126 -> a
-com.android.tools.r8.com.google.common.collect.Maps$7 -> com.android.tools.r8.internal.ND:
+com.android.tools.r8.com.google.common.collect.Maps$7 -> com.android.tools.r8.internal.UC:
     java.util.Map$Entry val$entry -> b
     1:1:void <init>(java.util.Map$Entry):1346:1346 -> <init>
     1:1:java.lang.Object getKey():1349:1349 -> getKey
     1:1:java.lang.Object getValue():1354:1354 -> getValue
-com.android.tools.r8.com.google.common.collect.Maps$8 -> com.android.tools.r8.internal.OD:
+com.android.tools.r8.com.google.common.collect.Maps$8 -> com.android.tools.r8.internal.VC:
     java.util.Iterator val$entryIterator -> b
     1:1:void <init>(java.util.Iterator):1361:1361 -> <init>
     1:1:boolean hasNext():1364:1364 -> hasNext
@@ -15716,23 +15638,23 @@
     4:4:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1346:1346 -> next
     4:4:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps$8.next():1369 -> next
     4:4:java.lang.Object next():1361 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.RD:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.YC:
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction VALUE -> c
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction KEY -> b
     1:7:void <clinit>():92:98 -> <clinit>
     1:1:void <init>(java.lang.String,int):91:91 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.Maps$1):91:91 -> <init>
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.PD:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.WC:
     1:1:void <init>(java.lang.String,int):92:92 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):92:92 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1.apply(java.util.Map$Entry):95:95 -> apply
     2:2:java.lang.Object apply(java.lang.Object):92 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.QD:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.XC:
     1:1:void <init>(java.lang.String,int):98:98 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):98:98 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2.apply(java.util.Map$Entry):101:101 -> apply
     2:2:java.lang.Object apply(java.lang.Object):98 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.SD:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.ZC:
     1:1:void <init>():3900:3900 -> <init>
     java.util.Map map() -> a
     1:1:void clear():3910:3910 -> clear
@@ -15750,21 +15672,21 @@
     2:2:boolean retainAll(java.util.Collection):3951 -> retainAll
     3:13:boolean retainAll(java.util.Collection):3951:3961 -> retainAll
     1:1:int size():3905:3905 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.UD:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.bD:
     1:1:void <init>():3462:3462 -> <init>
     1:1:void forEachEntry(java.util.function.Consumer):3499:3499 -> a
     java.util.Iterator entryIterator() -> e
     1:1:java.util.Set entrySet():3475:3475 -> entrySet
     1:1:java.util.Spliterator entrySpliterator():3470:3470 -> k
     2:2:java.util.Spliterator entrySpliterator():3469:3469 -> k
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.TD:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.aD:
     com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap):3475:3475 -> <init>
     1:1:java.util.Map map():3478:3478 -> a
     1:1:void forEach(java.util.function.Consumer):3493:3493 -> forEach
     1:1:java.util.Iterator iterator():3483:3483 -> iterator
     1:1:java.util.Spliterator spliterator():3488:3488 -> spliterator
-com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.VD:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.cD:
     java.util.Map map -> b
     1:2:void <init>(java.util.Map):3629:3630 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):3646:3646 -> a
@@ -15784,7 +15706,7 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3634:3634 -> size
     1:1:int size():3651 -> size
     2:2:int size():3651:3651 -> size
-com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.WD:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.dD:
     java.util.Map map -> b
     1:2:void <init>(java.util.Map):3814:3815 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):3831:3831 -> a
@@ -15840,64 +15762,64 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$Values.map():3819:3819 -> size
     1:1:int size():3881 -> size
     2:2:int size():3881:3881 -> size
-com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.rG:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.oF:
     boolean containsEntry(java.lang.Object,java.lang.Object) -> a
     java.util.Collection entries() -> a
     java.util.Map asMap() -> b
     com.android.tools.r8.com.google.common.collect.Multiset keys() -> c
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.uG:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.rF:
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1664:1665 -> <init>
     1:1:java.util.Set elementSet():1759:1759 -> D
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.util.Map$Entry):1697:1697 -> a
-    1:19:int remove(java.lang.Object,int):1728:1746 -> b
+    2:20:int remove(java.lang.Object,int):1728:1746 -> a
     1:1:int distinctElements():1702:1702 -> c
     1:1:void clear():1754:1754 -> clear
     1:1:boolean contains(java.lang.Object):1712:1712 -> contains
     1:1:java.util.Iterator elementIterator():1764:1764 -> d
     1:2:java.util.Iterator entryIterator():1670:1671 -> e
-    1:2:int count(java.lang.Object):1722:1723 -> f
     1:1:void forEach(java.util.function.Consumer):1696:1696 -> forEach
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> forEach
     2:2:void forEach(java.util.function.Consumer):1696 -> forEach
     3:3:void forEach(java.util.function.Consumer):1697:1697 -> forEach
+    1:2:int count(java.lang.Object):1722:1723 -> g
     1:1:java.util.Iterator iterator():1717:1717 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):117:117 -> iterator
     2:2:java.util.Iterator iterator():1717 -> iterator
     1:1:int size():1707:1707 -> size
     1:1:java.util.Spliterator spliterator():1691:1691 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.tG:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.qF:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys,java.util.Iterator):1671:1671 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1671:1671 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1.transform(java.util.Map$Entry):1674:1674 -> a
     2:2:java.lang.Object transform(java.lang.Object):1671 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.sG:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.pF:
     java.util.Map$Entry val$backingEntry -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1674:1674 -> <init>
     1:1:int getCount():1682:1682 -> a
     1:1:java.lang.Object getElement():1677:1677 -> b
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.wG:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.tF:
     java.util.Set elementSet() -> D
-    int setCount(java.lang.Object,int) -> a
-    boolean setCount(java.lang.Object,int,int) -> a
+    int remove(java.lang.Object,int) -> a
     1:1:void forEachEntry(java.util.function.ObjIntConsumer):338:338 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
     2:2:void forEachEntry(java.util.function.ObjIntConsumer):338 -> a
     3:3:void forEachEntry(java.util.function.ObjIntConsumer):339:339 -> a
     4:4:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):339:339 -> a
     5:8:void lambda$forEach$1(java.util.function.Consumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):463:466 -> a
-    int remove(java.lang.Object,int) -> b
-    int add(java.lang.Object,int) -> c
-    int count(java.lang.Object) -> f
+    int add(java.lang.Object,int) -> b
+    boolean setCount(java.lang.Object,int,int) -> c
+    int setCount(java.lang.Object,int) -> f
     1:1:void forEach(java.util.function.Consumer):459:459 -> forEach
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> forEach
     2:2:void forEach(java.util.function.Consumer):459 -> forEach
     3:4:void forEach(java.util.function.Consumer):460:461 -> forEach
+    int count(java.lang.Object) -> g
     1:1:java.util.Spliterator spliterator():473:473 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.vG:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.sF:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.BG:
+com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.yF:
     1:13:boolean equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):858:870 -> a
     14:14:boolean addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Collection):881:881 -> a
     15:15:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
@@ -15920,26 +15842,26 @@
     42:42:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1131 -> a
     43:43:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):219:219 -> a
     43:43:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1131 -> a
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.xG:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.uF:
     1:1:void <init>():814:814 -> <init>
     1:4:boolean equals(java.lang.Object):821:824 -> equals
     1:2:int hashCode():835:836 -> hashCode
     1:3:java.lang.String toString():847:849 -> toString
-com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.yG:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.vF:
     com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount INSTANCE -> b
     1:1:void <clinit>():1135:1135 -> <clinit>
     1:1:void <init>():1134:1134 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1134:1134 -> compare
     2:2:int com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount.compare(com.android.tools.r8.com.google.common.collect.Multiset$Entry,com.android.tools.r8.com.google.common.collect.Multiset$Entry):1139:1139 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1134 -> compare
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.zG:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.wF:
     java.lang.Object element -> b
     int count -> c
     1:4:void <init>(java.lang.Object,int):242:245 -> <init>
     1:1:int getCount():255:255 -> a
     1:1:java.lang.Object getElement():250:250 -> b
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> c
-com.android.tools.r8.com.google.common.collect.Multisets$MultisetIteratorImpl -> com.android.tools.r8.internal.AG:
+com.android.tools.r8.com.google.common.collect.Multisets$MultisetIteratorImpl -> com.android.tools.r8.internal.xF:
     java.util.Iterator entryIterator -> c
     com.android.tools.r8.com.google.common.collect.Multiset$Entry currentEntry -> d
     int totalCount -> f
@@ -15954,7 +15876,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():1085 -> remove
     3:9:void remove():1086:1092 -> remove
-com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.NG:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.KF:
     com.android.tools.r8.com.google.common.collect.NaturalOrdering INSTANCE -> b
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():74:74 -> <init>
@@ -15970,7 +15892,7 @@
     5:5:int com.android.tools.r8.com.google.common.collect.NaturalOrdering.compare(java.lang.Comparable,java.lang.Comparable):38:38 -> compare
     5:5:int compare(java.lang.Object,java.lang.Object):26 -> compare
     1:1:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.hK:
+com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.dJ:
     1:1:java.lang.Object[] newArray(java.lang.Object[],int):59:59 -> a
     2:7:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):84:89 -> a
     2:7:java.lang.Object[] newArray(java.lang.Object[],int):59 -> a
@@ -15980,10 +15902,10 @@
     10:10:java.lang.Object com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementNotNull(java.lang.Object,int):225:225 -> a
     10:10:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):215 -> a
     10:10:java.lang.Object[] checkElementsNotNull(java.lang.Object[]):209 -> a
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.oL:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.kK:
     1:1:void <init>():391:391 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering natural():162:162 -> a
-com.android.tools.r8.com.google.common.collect.Platform -> com.android.tools.r8.internal.nM:
+com.android.tools.r8.com.google.common.collect.Platform -> com.android.tools.r8.internal.iL:
 # {"id":"sourceFile","fileName":"Platform.java"}
     int $r8$clinit -> a
     1:1:void <clinit>():33:33 -> <clinit>
@@ -15991,7 +15913,7 @@
     2:2:java.lang.Object[] copy(java.lang.Object[],int,int,java.lang.Object[]):95:95 -> a
     1:1:java.util.LinkedHashMap com.android.tools.r8.com.google.common.collect.Maps.newLinkedHashMap():292:292 -> b
     1:1:java.util.Map preservesInsertionOrderOnPutsMap():66 -> b
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.PS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.sR:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):35:37 -> <init>
@@ -16005,7 +15927,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():46:46 -> j
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.RegularImmutableAsList.listIterator(int):56:56 -> listIterator
     1:1:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.US:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.wR:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> k
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] keyTable -> f
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] valueTable -> g
@@ -16083,8 +16005,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():67:67 -> u
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():186 -> u
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():188:189 -> u
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.QS:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.TS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.vR:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap this$0 -> f
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):192:192 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap,com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1):192:192 -> <init>
@@ -16107,11 +16028,11 @@
     boolean isPartialView() -> o
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse.inverse():201:201 -> size
     1:1:int size():196 -> size
-    2:2:int com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.size():178:178 -> size
-    2:2:int size():196 -> size
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2:2:int size():196:196 -> size
+    3:3:int com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.size():178:178 -> size
+    3:3:int size():196 -> size
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():201:201 -> u
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.SS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.uR:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):236:236 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():254:254 -> f
@@ -16122,7 +16043,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet.iterator():254:254 -> iterator
     1:1:java.util.Iterator iterator():236 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():239:239 -> k
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.RS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.tR:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):264:264 -> <init>
     1:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):267:268 -> get
@@ -16131,7 +16052,7 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):268 -> get
     3:3:java.lang.Object get(int):264 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():273:273 -> j
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.VS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.xR:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> e
     1:1:void <clinit>():32:32 -> <clinit>
@@ -16153,7 +16074,7 @@
     1:1:java.util.ListIterator listIterator(int):29:29 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():88:88 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.YS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.AR:
     com.android.tools.r8.com.google.common.collect.ImmutableMap EMPTY -> i
     java.util.Map$Entry[] entries -> f
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> g
@@ -16205,7 +16126,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():257:257 -> m
     boolean isPartialView() -> o
     1:1:int size():191:191 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.WS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.yR:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):213:214 -> <init>
     1:1:boolean contains(java.lang.Object):224:224 -> contains
@@ -16214,8 +16135,7 @@
     1:1:int size():234:234 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.RegularImmutableMap.size():191:191 -> size
     2:2:int size():234 -> size
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.XS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.zR:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):264:265 -> <init>
     boolean isPartialView() -> e
@@ -16223,8 +16143,7 @@
     1:1:int size():275:275 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.RegularImmutableMap.size():191:191 -> size
     2:2:int size():275 -> size
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.aT:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.CR:
     com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet -> j
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] entries -> f
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> g
@@ -16248,17 +16167,17 @@
     41:41:com.android.tools.r8.com.google.common.collect.ImmutableMultiset create(java.util.Collection):79 -> a
     42:44:com.android.tools.r8.com.google.common.collect.ImmutableMultiset create(java.util.Collection):79:81 -> a
     boolean isPartialView() -> e
-    1:11:int count(java.lang.Object):159:169 -> f
-    12:12:int count(java.lang.Object):167:167 -> f
+    1:11:int count(java.lang.Object):159:169 -> g
+    12:12:int count(java.lang.Object):167:167 -> g
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():182:183 -> h
     1:1:int hashCode():193:193 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):188:188 -> i
     1:1:int size():177:177 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.ZS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.BR:
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> d
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):142:143 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():148:148 -> c
-com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.bT:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.DR:
     java.lang.Object[] elements -> e
     int hashCode -> h
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> i
@@ -16285,37 +16204,44 @@
     1:1:java.util.Iterator iterator():30 -> iterator
     1:1:int size():69:69 -> size
     1:1:java.util.Spliterator spliterator():79:79 -> spliterator
-com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.internal.rV:
+com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.internal.IT:
     1:1:java.util.HashSet newHashSetWithExpectedSize(int):255:255 -> a
     2:2:java.util.Set newConcurrentHashSet():269:269 -> a
     3:6:com.android.tools.r8.com.google.common.collect.Sets$SetView difference(java.util.Set,java.util.Set):859:862 -> a
-    7:8:int hashCodeImpl(java.util.Set):1710:1711 -> a
-    9:10:boolean removeAllImpl(java.util.Set,java.util.Iterator):1913:1914 -> a
-    11:11:boolean removeAllImpl(java.util.Set,java.util.Collection):1920:1920 -> a
-    12:12:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    12:12:boolean removeAllImpl(java.util.Set,java.util.Collection):1920 -> a
-    13:26:boolean removeAllImpl(java.util.Set,java.util.Collection):1921:1934 -> a
-    27:32:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4161:4166 -> a
-    27:32:java.util.Set combinations(java.util.Set,int):1610 -> a
-    33:36:java.util.Set combinations(java.util.Set,int):1611:1614 -> a
-    37:37:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():75:75 -> a
-    37:37:java.util.Set combinations(java.util.Set,int):1614 -> a
-    38:38:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):84:84 -> a
-    38:38:java.util.Set combinations(java.util.Set,int):1614 -> a
-    39:40:java.util.Set combinations(java.util.Set,int):1615:1616 -> a
-    41:41:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):84:84 -> a
-    41:41:java.util.Set combinations(java.util.Set,int):1616 -> a
-    42:42:java.util.Set combinations(java.util.Set,int):1618:1618 -> a
-    43:43:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int,int):303:303 -> a
-    43:43:java.util.Set combinations(java.util.Set,int):1612 -> a
+    7:7:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):899:899 -> a
+    7:7:com.android.tools.r8.com.google.common.collect.Sets$SetView difference(java.util.Set,java.util.Set):860 -> a
+    8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):899:899 -> a
+    8:8:com.android.tools.r8.com.google.common.collect.Sets$SetView difference(java.util.Set,java.util.Set):859 -> a
+    9:10:int hashCodeImpl(java.util.Set):1710:1711 -> a
+    11:12:boolean removeAllImpl(java.util.Set,java.util.Iterator):1913:1914 -> a
+    13:13:boolean removeAllImpl(java.util.Set,java.util.Collection):1920:1920 -> a
+    14:14:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
+    14:14:boolean removeAllImpl(java.util.Set,java.util.Collection):1920 -> a
+    15:28:boolean removeAllImpl(java.util.Set,java.util.Collection):1921:1934 -> a
+    29:34:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4161:4166 -> a
+    29:34:java.util.Set combinations(java.util.Set,int):1610 -> a
+    35:38:java.util.Set combinations(java.util.Set,int):1611:1614 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():75:75 -> a
+    39:39:java.util.Set combinations(java.util.Set,int):1614 -> a
+    40:40:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):84:84 -> a
+    40:40:java.util.Set combinations(java.util.Set,int):1614 -> a
+    41:42:java.util.Set combinations(java.util.Set,int):1615:1616 -> a
+    43:43:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):84:84 -> a
+    43:43:java.util.Set combinations(java.util.Set,int):1616 -> a
+    44:44:java.util.Set combinations(java.util.Set,int):1618:1618 -> a
+    45:45:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int,int):303:303 -> a
+    45:45:java.util.Set combinations(java.util.Set,int):1612 -> a
     1:1:java.util.HashSet newHashSet():178:178 -> b
     2:5:com.android.tools.r8.com.google.common.collect.Sets$SetView intersection(java.util.Set,java.util.Set):788:791 -> b
+    6:6:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):899:899 -> b
+    6:6:com.android.tools.r8.com.google.common.collect.Sets$SetView intersection(java.util.Set,java.util.Set):789 -> b
+    7:7:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):899:899 -> b
+    7:7:com.android.tools.r8.com.google.common.collect.Sets$SetView intersection(java.util.Set,java.util.Set):788 -> b
     1:1:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():431:431 -> c
     1:1:java.util.Set newIdentityHashSet():423 -> c
     2:2:java.util.Set newIdentityHashSet():423:423 -> c
     1:1:java.util.LinkedHashSet newLinkedHashSet():305:305 -> d
-com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.gV:
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.iV:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.zT:
     java.util.Set val$set2 -> c
     java.util.Set val$set1 -> b
     1:1:void <init>(java.util.Set,java.util.Set):791:791 -> <init>
@@ -16327,12 +16253,12 @@
     1:1:java.util.stream.Stream parallelStream():817:817 -> parallelStream
     1:2:int size():823:824 -> size
     1:1:java.util.stream.Stream stream():812:812 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.hV:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.yT:
     java.util.Iterator itr -> d
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):794:795 -> <init>
     1:7:java.lang.Object computeNext():799:805 -> l
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.kV:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.BT:
     java.util.Set val$set2 -> c
     java.util.Set val$set1 -> b
     1:1:void <init>(java.util.Set,java.util.Set):862:862 -> <init>
@@ -16345,12 +16271,12 @@
     1:1:java.util.stream.Stream parallelStream():888:888 -> parallelStream
     1:2:int size():894:895 -> size
     1:1:java.util.stream.Stream stream():883:883 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.jV:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.AT:
     java.util.Iterator itr -> d
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):865:866 -> <init>
     1:7:java.lang.Object computeNext():870:876 -> l
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.oV:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.FT:
     com.android.tools.r8.com.google.common.collect.ImmutableMap val$index -> c
     int val$size -> b
     1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMap):1618:1618 -> <init>
@@ -16358,32 +16284,32 @@
     1:1:java.util.Iterator iterator():1630:1630 -> iterator
     1:1:int size():1697:1697 -> size
     1:1:java.lang.String toString():1702:1702 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.nV:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.ET:
     java.util.BitSet bits -> d
     com.android.tools.r8.com.google.common.collect.Sets$5 this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5):1630:1631 -> <init>
     1:29:java.util.Set com.android.tools.r8.com.google.common.collect.Sets$5$1.computeNext():1635:1663 -> l
     1:29:java.lang.Object computeNext():1630 -> l
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.mV:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.DT:
     com.android.tools.r8.com.google.common.collect.Sets$5$1 this$1 -> c
     java.util.BitSet val$copy -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1,java.util.BitSet):1663:1663 -> <init>
     1:2:boolean contains(java.lang.Object):1666:1667 -> contains
     1:1:java.util.Iterator iterator():1672:1672 -> iterator
     1:1:int size():1688:1688 -> size
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.lV:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.CT:
     com.android.tools.r8.com.google.common.collect.Sets$5$1$1 this$2 -> e
     int i -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1$1):1672:1673 -> <init>
     1:5:java.lang.Object computeNext():1677:1681 -> l
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.pV:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.GT:
     1:1:void <init>():76:76 -> <init>
     1:1:boolean removeAll(java.util.Collection):79:79 -> removeAll
     1:1:boolean retainAll(java.util.Collection):84:84 -> retainAll
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> retainAll
     2:2:boolean retainAll(java.util.Collection):84 -> retainAll
     3:3:boolean retainAll(java.util.Collection):84:84 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.qV:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.HT:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):549:549 -> <init>
     2:2:void <init>():550:550 -> <init>
     1:1:boolean add(java.lang.Object):589:589 -> add
@@ -16393,7 +16319,7 @@
     1:1:boolean removeAll(java.util.Collection):628:628 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):641:641 -> removeIf
     1:1:boolean retainAll(java.util.Collection):654:654 -> retainAll
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.XV:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.wU:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap lazyInverse -> i
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> h
     java.lang.Object singleKey -> f
@@ -16418,7 +16344,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():91 -> l
     boolean isPartialView() -> o
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():99:105 -> u
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.YV:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.xU:
     java.lang.Object element -> d
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> e
@@ -16433,7 +16359,7 @@
     1:1:java.util.Spliterator spliterator():54:54 -> spliterator
     1:1:java.util.List subList(int,int):31:31 -> subList
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.ZV:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.yU:
     java.lang.Object element -> e
     int cachedHashCode -> f
     1:2:void <init>(java.lang.Object):43:44 -> <init>
@@ -16449,7 +16375,7 @@
     1:3:int hashCode():87:89 -> hashCode
     1:1:boolean isHashCodeFast():96:96 -> i
     1:1:java.lang.String toString():101:101 -> toString
-com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.zX:
+com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.UV:
     java.util.Spliterator lambda$concat$0(java.util.Spliterator) -> a
     1:3:java.util.stream.Stream stream(java.lang.Iterable):62:64 -> a
     4:15:java.util.stream.Stream concat(java.util.stream.Stream[]):162:173 -> a
@@ -16473,27 +16399,27 @@
     68:116:java.util.stream.Stream mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):423:471 -> a
     1:3:void com.android.tools.r8.com.google.common.collect.Streams.closeAll(java.util.stream.BaseStream[]):141:143 -> b
     1:3:void lambda$concat$1(java.util.stream.Stream[]):178 -> b
-com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.uX:
+com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.PV:
     java.util.function.BiFunction val$function -> c
     java.util.Iterator val$itrB -> b
     java.util.Iterator val$itrA -> a
     1:1:void <init>(long,int,java.util.Iterator,java.util.Iterator,java.util.function.BiFunction):319:319 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):322:323 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.vX:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.QV:
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> d
     java.lang.Object holder -> c
     1:2:void <init>(java.util.Spliterator,long,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):444:445 -> <init>
     1:1:void accept(java.lang.Object):450:450 -> accept
     1:7:boolean tryAdvance(java.util.function.Consumer):455:461 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.wX:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.RV:
     java.util.Iterator val$fromIterator -> b
     long index -> a
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> c
     1:2:void <init>(long,int,java.util.Iterator,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):426:427 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):431:432 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.xX:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.SV:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.yX:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.TV:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):732:734 -> <init>
@@ -16507,17 +16433,17 @@
     6:6:java.util.Spliterator trySplit():726 -> trySplit
     7:7:com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.trySplit():747:747 -> trySplit
     7:7:java.util.Spliterator trySplit():726 -> trySplit
-com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.XZ:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.nY:
     java.util.Iterator backingIterator -> b
     1:2:void <init>(java.util.Iterator):34:35 -> <init>
     java.lang.Object transform(java.lang.Object) -> a
     1:1:boolean hasNext():42:42 -> hasNext
     1:1:java.lang.Object next():47:47 -> next
     1:1:void remove():52:52 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.O10:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.e00:
     1:1:void <init>():36:36 -> <init>
     1:1:void remove():48:48 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.P10:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.f00:
     1:1:void <init>():33:33 -> <init>
     1:1:void add(java.lang.Object):45:45 -> add
     1:1:void set(java.lang.Object):58:58 -> set
@@ -16572,7 +16498,7 @@
     3:3:com.android.tools.r8.com.google.common.hash.Hasher putFloat(float):42:42 -> a
     4:4:com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset):55:55 -> a
     5:5:com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[]):60:60 -> a
-com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.Em:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.hm:
     char[] hexDigits -> b
     int $r8$clinit -> c
     1:1:void <clinit>():420:420 -> <clinit>
@@ -16584,7 +16510,6 @@
     5:5:boolean equals(java.lang.Object):373:373 -> equals
     6:6:int com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode.bits():259:259 -> equals
     6:6:boolean equals(java.lang.Object):373 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:boolean equals(java.lang.Object):373:373 -> equals
     1:1:int hashCode():387:387 -> hashCode
     2:2:int com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode.bits():259:259 -> hashCode
@@ -16599,21 +16524,20 @@
     2:2:byte[] com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode.getBytesInternal():304:304 -> toString
     2:2:java.lang.String toString():412 -> toString
     3:7:java.lang.String toString():413:417 -> toString
-com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.Dm:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.gm:
     byte[] bytes -> d
     1:2:void <init>(byte[]):253:254 -> <init>
     1:1:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):311:311 -> a
     2:2:byte[] com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode.getBytesInternal():304:304 -> a
     2:2:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):311 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:9:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):311:317 -> a
     10:10:byte[] com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode.getBytesInternal():304:304 -> a
     10:10:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):317 -> a
     11:11:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):317:317 -> a
-com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.Hm:
+com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.km:
     com.android.tools.r8.com.google.common.hash.HashCode hashString(java.lang.CharSequence,java.nio.charset.Charset) -> a
     com.android.tools.r8.com.google.common.hash.Hasher newHasher() -> a
-com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.Jm:
+com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.mm:
     com.android.tools.r8.com.google.common.hash.HashCode hash() -> a
     com.android.tools.r8.com.google.common.hash.Hasher putBoolean(boolean) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putByte(byte) -> a
@@ -16623,16 +16547,16 @@
     com.android.tools.r8.com.google.common.hash.Hasher putInt(int) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putLong(long) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset) -> a
-com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.Nm:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.qm:
 # {"id":"sourceFile","fileName":"Hashing.java"}
-    int GOOD_FAST_HASH_SEED -> a
+    int $r8$clinit -> a
     1:1:void <clinit>():91:91 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction murmur3_128():134:134 -> a
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction sha256():201:201 -> b
-com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.Mm:
+com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.pm:
     com.android.tools.r8.com.google.common.hash.HashFunction SHA_256 -> a
     1:1:void <clinit>():205:205 -> <clinit>
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.AE:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.ED:
     java.security.MessageDigest prototype -> b
     int bytes -> c
     java.lang.String toString -> e
@@ -16642,8 +16566,7 @@
     2:4:java.security.MessageDigest getMessageDigest(java.lang.String):82:84 -> a
     5:12:com.android.tools.r8.com.google.common.hash.Hasher newHasher():90:97 -> a
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.yE:
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.zE:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.DD:
     java.security.MessageDigest digest -> b
     int bytes -> c
     boolean done -> d
@@ -16663,7 +16586,7 @@
     3:3:void com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher.checkNotDone():152:152 -> b
     3:3:void update(byte[],int,int):141 -> b
     4:4:void update(byte[],int,int):142:142 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.DG:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.AF:
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_128 -> b
     1:3:void <clinit>():45:47 -> <clinit>
     1:1:void <init>(int):53:53 -> <init>
@@ -16671,7 +16594,7 @@
     1:3:boolean equals(java.lang.Object):74:76 -> equals
     1:1:int hashCode():83:83 -> hashCode
     1:1:java.lang.String toString():69:69 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.CG:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.zF:
     long h2 -> e
     int length -> f
     long h1 -> d
@@ -16889,7 +16812,7 @@
     185:185:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():187 -> a
     185:185:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.o4:
+com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.l4:
     com.android.tools.r8.com.google.common.io.BaseEncoding BASE64_URL -> a
     1:45:void <clinit>():320:364 -> <clinit>
     46:46:void com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding.<init>(java.lang.String,java.lang.String,java.lang.Character):571:571 -> <clinit>
@@ -16912,7 +16835,7 @@
     12:12:java.lang.String encode(byte[]):148 -> a
     13:13:com.android.tools.r8.com.google.common.io.BaseEncoding base64Url():360:360 -> a
     com.android.tools.r8.com.google.common.io.BaseEncoding omitPadding() -> b
-com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.internal.k4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.internal.h4:
     char[] chars -> b
     int bytesPerChunk -> f
     byte[] decodabet -> g
@@ -16929,19 +16852,19 @@
     1:3:boolean equals(java.lang.Object):551:553 -> equals
     1:1:int hashCode():560:560 -> hashCode
     1:1:java.lang.String toString():546:546 -> toString
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.l4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.i4:
     char[] encoding -> d
     1:1:void <init>(java.lang.String,java.lang.String):893:893 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):897:897 -> <init>
     3:14:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):890:901 -> <init>
     1:6:void encodeTo(java.lang.Appendable,byte[],int,int):907:912 -> a
     7:7:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):932:932 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.m4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.j4:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.Character):938:938 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):942:943 -> <init>
     1:12:void encodeTo(java.lang.Appendable,byte[],int,int):948:959 -> a
     13:13:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):989:989 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.n4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.k4:
     java.lang.Character paddingChar -> c
     com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet alphabet -> b
     1:4:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):574:577 -> <init>
@@ -16956,7 +16879,7 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):77:77 -> hashCode
     2:2:int hashCode():885 -> hashCode
     1:10:java.lang.String toString():861:870 -> toString
-com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.Y5:
+com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.V5:
     java.io.OutputStream NULL_OUTPUT_STREAM -> a
     int $r8$clinit -> b
     1:1:void <clinit>():640:640 -> <clinit>
@@ -16979,7 +16902,7 @@
     19:25:byte[] toByteArray(java.io.InputStream):221 -> a
     26:26:byte[] com.android.tools.r8.com.google.common.io.ByteStreams.toByteArrayInternal(java.io.InputStream,java.util.Queue,int):195:195 -> a
     26:26:byte[] toByteArray(java.io.InputStream):221 -> a
-com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.X5:
+com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.U5:
     1:1:void <init>():641:641 -> <init>
     1:1:java.lang.String toString():660:660 -> toString
     1:1:void write(byte[]):649:649 -> write
@@ -16988,7 +16911,7 @@
     3:3:void write(byte[],int,int):655:655 -> write
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> write
     4:4:void write(byte[],int,int):655 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.i9:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.Y8:
     java.lang.CharSequence seq -> b
     int mark -> d
     int pos -> c
@@ -17029,11 +16952,11 @@
     4:5:long skip(long):97:98 -> skip
     6:6:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,long):205:205 -> skip
     6:6:long skip(long):95 -> skip
-com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.l9:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.b9:
     1:1:void <init>():75:75 -> <init>
     java.io.Reader openStream() -> a
     1:3:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):480:482 -> a
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.j9:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.Z8:
     java.lang.CharSequence seq -> a
     1:1:void <clinit>():524:524 -> <clinit>
     1:2:void <init>(java.lang.CharSequence):528:529 -> <init>
@@ -17047,10 +16970,10 @@
     4:16:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):563:575 -> toString
     4:16:java.lang.String toString():608 -> toString
     17:17:java.lang.String toString():608:608 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.k9:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.a9:
     1:1:void <init>(java.lang.String):629:629 -> <init>
     1:1:java.io.Reader openStream():634:634 -> a
-com.android.tools.r8.com.google.common.io.CharStreams -> com.android.tools.r8.internal.m9:
+com.android.tools.r8.com.google.common.io.CharStreams -> com.android.tools.r8.internal.c9:
     1:2:java.lang.StringBuilder com.android.tools.r8.com.google.common.io.CharStreams.toStringBuilder(java.lang.Readable):176:177 -> a
     1:2:java.lang.String toString(java.lang.Readable):164 -> a
     3:3:long com.android.tools.r8.com.google.common.io.CharStreams.copyReaderToBuilder(java.io.Reader,java.lang.StringBuilder):115:115 -> a
@@ -17102,10 +17025,10 @@
     24:24:java.lang.StringBuilder com.android.tools.r8.com.google.common.io.CharStreams.toStringBuilder(java.lang.Readable):180 -> a
     24:24:java.lang.String toString(java.lang.Readable):164 -> a
     25:25:java.lang.String toString(java.lang.Readable):164:164 -> a
-com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.zb:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.fb:
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():37:37 -> <clinit>
-com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.Db:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.jb:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> b
     java.util.Deque stack -> c
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> d
@@ -17138,12 +17061,12 @@
     25:25:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfInstanceOf(java.lang.Throwable,java.lang.Class):104 -> close
     25:25:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfPossible(java.lang.Throwable,java.lang.Class):184 -> close
     25:25:void close():224 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.Ab:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.gb:
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
     1:1:void <clinit>():244:244 -> <clinit>
     1:1:void <init>():242:242 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):249:249 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.Bb:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.hb:
     com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():261:261 -> <clinit>
@@ -17154,9 +17077,9 @@
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):284:284 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):249:249 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):287 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.Cb:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.ib:
     void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable) -> a
-com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.yt:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.Us:
     int[] biggestBinomials -> a
     1:1:void <clinit>():676:676 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -17188,27 +17111,27 @@
     31:31:int checkedAdd(int,int):456:456 -> b
     32:32:void com.android.tools.r8.com.google.common.math.MathPreconditions.checkNoOverflow(boolean,java.lang.String,int,int):95:95 -> b
     32:32:int checkedAdd(int,int):456 -> b
-com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.xt:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.Ts:
     int[] $SwitchMap$java$math$RoundingMode -> a
     1:1:void <clinit>():120:120 -> <clinit>
-com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.eE:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.lD:
     1:1:int checkNonNegative(java.lang.String,int):54:54 -> a
-com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.xu:
+com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.Rt:
     int saturatedCast(long) -> a
-com.android.tools.r8.com.google.gson.ExclusionStrategy -> com.android.tools.r8.internal.jj:
+com.android.tools.r8.com.google.gson.ExclusionStrategy -> com.android.tools.r8.internal.Ri:
     boolean shouldSkipClass(java.lang.Class) -> a
     boolean shouldSkipField(com.android.tools.r8.com.google.gson.FieldAttributes) -> b
-com.android.tools.r8.com.google.gson.FieldNamingPolicy -> com.android.tools.r8.internal.Rj:
+com.android.tools.r8.com.google.gson.FieldNamingPolicy -> com.android.tools.r8.internal.yj:
     com.android.tools.r8.com.google.gson.FieldNamingPolicy IDENTITY -> b
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(java.lang.String,int):31:31 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.gson.FieldNamingPolicy$1):31:31 -> <init>
-com.android.tools.r8.com.google.gson.FieldNamingPolicy$1 -> com.android.tools.r8.internal.Qj:
+com.android.tools.r8.com.google.gson.FieldNamingPolicy$1 -> com.android.tools.r8.internal.xj:
     1:1:void <init>(java.lang.String,int):37:37 -> <init>
     1:1:java.lang.String translateName(java.lang.reflect.Field):39:39 -> a
-com.android.tools.r8.com.google.gson.FieldNamingStrategy -> com.android.tools.r8.internal.Sj:
+com.android.tools.r8.com.google.gson.FieldNamingStrategy -> com.android.tools.r8.internal.zj:
     java.lang.String translateName(java.lang.reflect.Field) -> a
-com.android.tools.r8.com.google.gson.Gson -> com.android.tools.r8.internal.nm:
+com.android.tools.r8.com.google.gson.Gson -> com.android.tools.r8.internal.Ql:
     com.android.tools.r8.com.google.gson.reflect.TypeToken NULL_KEY_SURROGATE -> j
     java.util.Map typeTokenCache -> b
     java.lang.ThreadLocal calls -> a
@@ -17241,9 +17164,9 @@
     3:3:com.android.tools.r8.com.google.gson.TypeAdapter atomicLongArrayAdapter(com.android.tools.r8.com.google.gson.TypeAdapter):388 -> b
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter longAdapter(com.android.tools.r8.com.google.gson.LongSerializationPolicy):332:332 -> c
     1:6:java.lang.String toString():982:987 -> toString
-com.android.tools.r8.com.google.gson.Gson$1 -> com.android.tools.r8.internal.hm:
+com.android.tools.r8.com.google.gson.Gson$1 -> com.android.tools.r8.internal.Kl:
     1:1:void <init>():112:112 -> <init>
-com.android.tools.r8.com.google.gson.Gson$2 -> com.android.tools.r8.internal.im:
+com.android.tools.r8.com.google.gson.Gson$2 -> com.android.tools.r8.internal.Ll:
     1:1:void <init>(com.android.tools.r8.com.google.gson.Gson):278:278 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):278:278 -> a
     2:5:void com.android.tools.r8.com.google.gson.Gson$2.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):288:291 -> a
@@ -17258,7 +17181,7 @@
     8:8:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):278 -> a
     9:13:java.lang.Double com.android.tools.r8.com.google.gson.Gson$2.read(com.android.tools.r8.com.google.gson.stream.JsonReader):280:284 -> a
     9:13:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):278 -> a
-com.android.tools.r8.com.google.gson.Gson$3 -> com.android.tools.r8.internal.jm:
+com.android.tools.r8.com.google.gson.Gson$3 -> com.android.tools.r8.internal.Ml:
     1:1:void <init>(com.android.tools.r8.com.google.gson.Gson):302:302 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):302:302 -> a
     2:5:void com.android.tools.r8.com.google.gson.Gson$3.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):312:315 -> a
@@ -17273,7 +17196,7 @@
     8:8:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):302 -> a
     9:13:java.lang.Float com.android.tools.r8.com.google.gson.Gson$3.read(com.android.tools.r8.com.google.gson.stream.JsonReader):304:308 -> a
     9:13:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):302 -> a
-com.android.tools.r8.com.google.gson.Gson$5 -> com.android.tools.r8.internal.km:
+com.android.tools.r8.com.google.gson.Gson$5 -> com.android.tools.r8.internal.Nl:
     com.android.tools.r8.com.google.gson.TypeAdapter val$longAdapter -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):353:353 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):353:353 -> a
@@ -17281,7 +17204,7 @@
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):353 -> a
     3:4:java.util.concurrent.atomic.AtomicLong com.android.tools.r8.com.google.gson.Gson$5.read(com.android.tools.r8.com.google.gson.stream.JsonReader):358:359 -> a
     3:4:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):353 -> a
-com.android.tools.r8.com.google.gson.Gson$6 -> com.android.tools.r8.internal.lm:
+com.android.tools.r8.com.google.gson.Gson$6 -> com.android.tools.r8.internal.Ol:
     com.android.tools.r8.com.google.gson.TypeAdapter val$longAdapter -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):365:365 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):365:365 -> a
@@ -17289,7 +17212,7 @@
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):365 -> a
     7:17:java.util.concurrent.atomic.AtomicLongArray com.android.tools.r8.com.google.gson.Gson$6.read(com.android.tools.r8.com.google.gson.stream.JsonReader):374:384 -> a
     7:17:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):365 -> a
-com.android.tools.r8.com.google.gson.Gson$FutureTypeAdapter -> com.android.tools.r8.internal.mm:
+com.android.tools.r8.com.google.gson.Gson$FutureTypeAdapter -> com.android.tools.r8.internal.Pl:
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> a
     1:1:void <init>():955:955 -> <init>
     1:4:void setDelegate(com.android.tools.r8.com.google.gson.TypeAdapter):959:962 -> a
@@ -17298,9 +17221,9 @@
     10:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):967:967 -> a
     11:14:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):973:976 -> a
     15:15:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):974:974 -> a
-com.android.tools.r8.com.google.gson.InstanceCreator -> com.android.tools.r8.internal.Np:
+com.android.tools.r8.com.google.gson.InstanceCreator -> com.android.tools.r8.internal.pp:
     java.lang.Object createInstance(java.lang.reflect.Type) -> a
-com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.Mv:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.fv:
     java.util.List elements -> b
     1:2:void <init>():39:40 -> <init>
     1:1:void add(java.lang.String):85:85 -> a
@@ -17314,7 +17237,7 @@
     1:1:com.android.tools.r8.com.google.gson.JsonElement get(int):183:183 -> i
     1:1:java.util.Iterator iterator():171:171 -> iterator
     1:1:int size():161:161 -> size
-com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.Nv:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.gv:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> a
     1:1:int getAsInt():243:243 -> b
@@ -17330,42 +17253,44 @@
     4:4:void com.android.tools.r8.com.google.gson.internal.Streams.write(com.android.tools.r8.com.google.gson.JsonElement,com.android.tools.r8.com.google.gson.stream.JsonWriter):72:72 -> toString
     4:4:java.lang.String toString():324 -> toString
     5:7:java.lang.String toString():325:327 -> toString
-com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.Ov:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.hv:
     1:1:void <init>(java.lang.String):29:29 -> <init>
     2:2:void <init>(java.lang.Throwable):43:43 -> <init>
-com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.Pv:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.iv:
     com.android.tools.r8.com.google.gson.JsonNull INSTANCE -> b
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>():39:39 -> <init>
     1:1:boolean equals(java.lang.Object):61:61 -> equals
     1:1:int hashCode():53:53 -> hashCode
-com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.Qv:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.jv:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap members -> b
     1:2:void <init>():32:33 -> <init>
-    1:3:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):55:57 -> a
-    4:4:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonObject.createJsonElement(java.lang.Object):122:122 -> a
-    4:4:void addProperty(java.lang.String,java.lang.Boolean):101 -> a
-    5:5:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
-    5:5:void addProperty(java.lang.String,java.lang.Boolean):101 -> a
-    6:6:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonObject.createJsonElement(java.lang.Object):122:122 -> a
+    1:1:void addProperty(java.lang.String,java.lang.Boolean):0:0 -> a
+    2:2:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonObject.createJsonElement(java.lang.Object):122:122 -> a
+    2:2:void addProperty(java.lang.String,java.lang.Boolean):101 -> a
+    3:3:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
+    3:3:void addProperty(java.lang.String,java.lang.Boolean):101 -> a
+    4:4:void addProperty(java.lang.String,java.lang.Number):0:0 -> a
+    5:5:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonObject.createJsonElement(java.lang.Object):122:122 -> a
+    5:5:void addProperty(java.lang.String,java.lang.Number):90 -> a
+    6:6:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
     6:6:void addProperty(java.lang.String,java.lang.Number):90 -> a
-    7:7:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
-    7:7:void addProperty(java.lang.String,java.lang.Number):90 -> a
-    8:8:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonObject.createJsonElement(java.lang.Object):122:122 -> a
-    8:8:void addProperty(java.lang.String,java.lang.String):79 -> a
-    9:9:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
-    9:9:void addProperty(java.lang.String,java.lang.String):79 -> a
-    10:10:com.android.tools.r8.com.google.gson.JsonElement get(java.lang.String):161:161 -> a
+    7:9:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):55:57 -> a
+    10:10:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonObject.createJsonElement(java.lang.Object):122:122 -> a
+    10:10:void addProperty(java.lang.String,java.lang.String):79 -> a
+    11:11:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
+    11:11:void addProperty(java.lang.String,java.lang.String):79 -> a
+    12:12: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:java.util.Set entrySet():132:132 -> entrySet
     1:2:boolean equals(java.lang.Object):196:197 -> equals
     1:1:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject(java.lang.String):191:191 -> g
     1:1:int hashCode():202:202 -> hashCode
-com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.Rv:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.kv:
     1:1:void <init>(java.lang.String):42:42 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):52:52 -> <init>
     3:3:void <init>(java.lang.Throwable):62:62 -> <init>
-com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.Sv:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.lv:
     1:1:void <init>():34:34 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonElement parse(java.lang.String):45:45 -> a
     2:4:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonParser.parse(java.io.Reader):58:60 -> a
@@ -17393,7 +17318,7 @@
     43:43:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):84 -> a
     44:44:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):88:88 -> a
     45:49:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):86:90 -> a
-com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.Tv:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.mv:
     java.lang.Class[] PRIMITIVE_TYPES -> c
     java.lang.Object value -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -17431,24 +17356,24 @@
     1:13:int hashCode():289:301 -> hashCode
     1:1:boolean isNumber():146:146 -> i
     1:1:boolean isString():166:166 -> j
-com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.Xv:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.qv:
     1:1:void <init>(java.lang.String):30:30 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):34:34 -> <init>
     3:3:void <init>(java.lang.Throwable):45:45 -> <init>
-com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.m00:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.CY:
     1:1:void <init>():119:119 -> <init>
     java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader) -> a
     void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter nullSafe():186:186 -> a
-com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.l00:
+com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.BY:
     com.android.tools.r8.com.google.gson.TypeAdapter this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):186:186 -> <init>
     1:3:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):189:191 -> a
     4:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):195:199 -> a
-com.android.tools.r8.com.google.gson.TypeAdapterFactory -> com.android.tools.r8.internal.n00:
+com.android.tools.r8.com.google.gson.TypeAdapterFactory -> com.android.tools.r8.internal.DY:
     com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken) -> a
-com.android.tools.r8.com.google.gson.annotations.JsonAdapter -> com.android.tools.r8.internal.Kv:
-com.android.tools.r8.com.google.gson.annotations.SerializedName -> com.android.tools.r8.internal.cV:
+com.android.tools.r8.com.google.gson.annotations.JsonAdapter -> com.android.tools.r8.internal.dv:
+com.android.tools.r8.com.google.gson.annotations.SerializedName -> com.android.tools.r8.internal.uT:
 com.android.tools.r8.com.google.gson.internal.$Gson$Preconditions -> com.android.tools.r8.internal.a:
 # {"id":"sourceFile","fileName":"$Gson$Preconditions.java"}
     1:1:java.lang.Object checkNotNull(java.lang.Object):39:39 -> a
@@ -17551,7 +17476,7 @@
     1167:1167:java.lang.String toString():582:582 -> toString
     1168:1168:java.lang.String toString():582:582 -> toString
     1165:1165:java.lang.String toString():582:582 -> toString
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor -> com.android.tools.r8.internal.de:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor -> com.android.tools.r8.internal.Fd:
     java.util.Map instanceCreators -> a
     1:2:void <init>(java.util.Map):51:52 -> <init>
     1:21:com.android.tools.r8.com.google.gson.internal.ObjectConstructor get(com.android.tools.r8.com.google.gson.reflect.TypeToken):56:76 -> a
@@ -17564,24 +17489,24 @@
     101:101:com.android.tools.r8.com.google.gson.internal.ObjectConstructor com.android.tools.r8.com.google.gson.internal.ConstructorConstructor.newUnsafeAllocator(java.lang.reflect.Type,java.lang.Class):218:218 -> a
     101:101:com.android.tools.r8.com.google.gson.internal.ObjectConstructor get(com.android.tools.r8.com.google.gson.reflect.TypeToken):94 -> a
     1:1:java.lang.String toString():234:234 -> toString
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$1 -> com.android.tools.r8.internal.Ud:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$1 -> com.android.tools.r8.internal.wd:
     com.android.tools.r8.com.google.gson.InstanceCreator val$typeCreator -> a
     java.lang.reflect.Type val$type -> b
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.InstanceCreator,java.lang.reflect.Type):64:64 -> <init>
     1:1:java.lang.Object construct():66:66 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$10 -> com.android.tools.r8.internal.Pd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$10 -> com.android.tools.r8.internal.rd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):186:186 -> <init>
     1:1:java.lang.Object construct():188:188 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$11 -> com.android.tools.r8.internal.Qd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$11 -> com.android.tools.r8.internal.sd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):192:192 -> <init>
     1:1:java.lang.Object construct():194:194 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$12 -> com.android.tools.r8.internal.Rd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$12 -> com.android.tools.r8.internal.td:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):199:199 -> <init>
     1:1:java.lang.Object construct():201:201 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$13 -> com.android.tools.r8.internal.Sd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$13 -> com.android.tools.r8.internal.ud:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):205:205 -> <init>
     1:1:java.lang.Object construct():207:207 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$14 -> com.android.tools.r8.internal.Td:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$14 -> com.android.tools.r8.internal.vd:
     com.android.tools.r8.com.google.gson.internal.UnsafeAllocator unsafeAllocator -> a
     java.lang.reflect.Type val$type -> c
     java.lang.Class val$rawType -> b
@@ -17593,12 +17518,12 @@
     233:233:java.lang.Object construct():226:226 -> a
     234:234:java.lang.Object construct():226:226 -> a
     231:231:java.lang.Object construct():226:226 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$2 -> com.android.tools.r8.internal.Vd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$2 -> com.android.tools.r8.internal.xd:
     com.android.tools.r8.com.google.gson.InstanceCreator val$rawTypeCreator -> a
     java.lang.reflect.Type val$type -> b
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.InstanceCreator,java.lang.reflect.Type):76:76 -> <init>
     1:1:java.lang.Object construct():78:78 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$3 -> com.android.tools.r8.internal.Wd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$3 -> com.android.tools.r8.internal.yd:
     java.lang.reflect.Constructor val$constructor -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,java.lang.reflect.Constructor):103:103 -> <init>
     1:11:java.lang.Object construct():108:118 -> a
@@ -17616,10 +17541,10 @@
     244:244:java.lang.Object construct():111:111 -> a
     245:245:java.lang.Object construct():111:111 -> a
     242:242:java.lang.Object construct():111:111 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$4 -> com.android.tools.r8.internal.Xd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$4 -> com.android.tools.r8.internal.zd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):136:136 -> <init>
     1:1:java.lang.Object construct():138:138 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$5 -> com.android.tools.r8.internal.Yd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$5 -> com.android.tools.r8.internal.Ad:
     java.lang.reflect.Type val$type -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,java.lang.reflect.Type):142:142 -> <init>
     1:6:java.lang.Object construct():145:150 -> a
@@ -17635,19 +17560,19 @@
     316:316:java.lang.Object construct():153:153 -> a
     317:317:java.lang.Object construct():153:153 -> a
     314:314:java.lang.Object construct():153:153 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$6 -> com.android.tools.r8.internal.Zd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$6 -> com.android.tools.r8.internal.Bd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):158:158 -> <init>
     1:1:java.lang.Object construct():160:160 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$7 -> com.android.tools.r8.internal.ae:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$7 -> com.android.tools.r8.internal.Cd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):164:164 -> <init>
     1:1:java.lang.Object construct():166:166 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$8 -> com.android.tools.r8.internal.be:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$8 -> com.android.tools.r8.internal.Dd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):170:170 -> <init>
     1:1:java.lang.Object construct():172:172 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$9 -> com.android.tools.r8.internal.ce:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$9 -> com.android.tools.r8.internal.Ed:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):180:180 -> <init>
     1:1:java.lang.Object construct():182:182 -> a
-com.android.tools.r8.com.google.gson.internal.Excluder -> com.android.tools.r8.internal.ij:
+com.android.tools.r8.com.google.gson.internal.Excluder -> com.android.tools.r8.internal.Qi:
     java.util.List serializationStrategies -> b
     java.util.List deserializationStrategies -> c
     com.android.tools.r8.com.google.gson.internal.Excluder DEFAULT -> d
@@ -17666,7 +17591,7 @@
     44:46:boolean excludeClass(java.lang.Class,boolean):205:207 -> a
     1:3:com.android.tools.r8.com.google.gson.internal.Excluder com.android.tools.r8.com.google.gson.internal.Excluder.clone():63:65 -> clone
     1:3:java.lang.Object clone():50 -> clone
-com.android.tools.r8.com.google.gson.internal.Excluder$1 -> com.android.tools.r8.internal.hj:
+com.android.tools.r8.com.google.gson.internal.Excluder$1 -> com.android.tools.r8.internal.Pi:
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> a
     com.android.tools.r8.com.google.gson.reflect.TypeToken val$type -> e
     com.android.tools.r8.com.google.gson.internal.Excluder this$0 -> f
@@ -17682,11 +17607,11 @@
     10:13:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.internal.Excluder$1.delegate():141:144 -> a
     10:13:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):137 -> a
     14:14:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):137:137 -> a
-com.android.tools.r8.com.google.gson.internal.JsonReaderInternalAccess -> com.android.tools.r8.internal.Wv:
+com.android.tools.r8.com.google.gson.internal.JsonReaderInternalAccess -> com.android.tools.r8.internal.pv:
     com.android.tools.r8.com.google.gson.internal.JsonReaderInternalAccess INSTANCE -> a
     1:1:void <init>():25:25 -> <init>
     void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader) -> a
-com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.jB:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.sA:
     java.lang.String value -> b
     1:2:void <init>(java.lang.String):30:31 -> <init>
     1:1:double doubleValue():63:63 -> doubleValue
@@ -17696,7 +17621,7 @@
     1:6:int intValue():37:42 -> intValue
     1:3:long longValue():50:52 -> longValue
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.rC:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.BB:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node root -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node header -> f
     boolean $assertionsDisabled -> j
@@ -17707,9 +17632,9 @@
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet keySet -> h
     java.util.Comparator comparator -> b
     1:3:void <clinit>():38:40 -> <clinit>
-    1:1:void <init>():60:60 -> <init>
-    2:2:void <init>(java.util.Comparator):71:71 -> <init>
-    3:27:void <init>(java.util.Comparator):48:72 -> <init>
+    1:72:void <init>(java.util.Comparator):0:71 -> <init>
+    73:97:void <init>(java.util.Comparator):48:72 -> <init>
+    98:98:void <init>():60:60 -> <init>
     1:57:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node find(java.lang.Object,boolean):122:178 -> a
     58:72:void replaceInParent(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node):285:299 -> a
     73:91:void rebalance(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,boolean):312:330 -> a
@@ -17741,12 +17666,12 @@
     2:2:java.lang.Object remove(java.lang.Object):111 -> remove
     3:3:java.lang.Object remove(java.lang.Object):112:112 -> remove
     1:1:int size():78:78 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.uB:
     1:1:void <init>():40:40 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):40:40 -> compare
     2:2:int com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1.compare(java.lang.Comparable,java.lang.Comparable):42:42 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):40 -> compare
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.mC:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.wB:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):560:560 -> <init>
     1:1:void clear():591:591 -> clear
@@ -17775,7 +17700,7 @@
     9:9:boolean remove(java.lang.Object):582 -> remove
     10:10:boolean remove(java.lang.Object):586:586 -> remove
     1:1:int size():562:562 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.lC:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.vB:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet):566:566 -> <init>
     1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():539:547 -> next
     1:9:java.util.Map$Entry com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1.next():568 -> next
@@ -17786,7 +17711,7 @@
     11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():541:541 -> next
     11:11:java.util.Map$Entry com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1.next():568 -> next
     11:11:java.lang.Object next():566 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.oC:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.yB:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):595:595 -> <init>
     1:1:void clear():617:617 -> clear
@@ -17799,7 +17724,7 @@
     3:3:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.removeInternalByKey(java.lang.Object):279:279 -> remove
     3:3:boolean remove(java.lang.Object):613 -> remove
     1:1:int size():597:597 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.nC:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.xB:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet):601:601 -> <init>
     1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():539:547 -> next
     1:9:java.lang.Object next():603 -> next
@@ -17808,7 +17733,7 @@
     11:11:java.lang.Object next():603 -> next
     12:12:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():541:541 -> next
     12:12:java.lang.Object next():603 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.pC:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.zB:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node lastReturned -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> e
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> b
@@ -17818,7 +17743,7 @@
     1:1:boolean hasNext():535:535 -> hasNext
     1:6:void remove():551:556 -> remove
     7:7:void remove():552:552 -> remove
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.qC:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.AB:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node right -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node left -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node prev -> f
@@ -17835,9 +17760,9 @@
     1:2:int hashCode():491:492 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):475:476 -> setValue
     1:1:java.lang.String toString():496:496 -> toString
-com.android.tools.r8.com.google.gson.internal.ObjectConstructor -> com.android.tools.r8.internal.nK:
+com.android.tools.r8.com.google.gson.internal.ObjectConstructor -> com.android.tools.r8.internal.jJ:
     java.lang.Object construct() -> a
-com.android.tools.r8.com.google.gson.internal.Primitives -> com.android.tools.r8.internal.pN:
+com.android.tools.r8.com.google.gson.internal.Primitives -> com.android.tools.r8.internal.gM:
     java.util.Map PRIMITIVE_TO_WRAPPER_TYPE -> a
     1:4:void <clinit>():45:48 -> <clinit>
     5:6:void com.android.tools.r8.com.google.gson.internal.Primitives.add(java.util.Map,java.util.Map,java.lang.Class,java.lang.Class):64:65 -> <clinit>
@@ -17868,7 +17793,7 @@
     29:30:void <clinit>():56 -> <clinit>
     31:32:void <clinit>():58:59 -> <clinit>
     1:1:boolean isPrimitive(java.lang.reflect.Type):72:72 -> a
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator -> com.android.tools.r8.internal.W10:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator -> com.android.tools.r8.internal.m00:
     1:1:void <init>():31:31 -> <init>
     1:62:com.android.tools.r8.com.google.gson.internal.UnsafeAllocator create():40:101 -> a
     63:68:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.assertInstantiable(java.lang.Class):115:120 -> a
@@ -17896,24 +17821,24 @@
     73:73:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.assertInstantiable(java.lang.Class):117:117 -> a
     73:73:void access$000(java.lang.Class):31 -> a
     java.lang.Object newInstance(java.lang.Class) -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$1 -> com.android.tools.r8.internal.S10:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$1 -> com.android.tools.r8.internal.i00:
     java.lang.Object val$unsafe -> b
     java.lang.reflect.Method val$allocateInstance -> a
     1:1:void <init>(java.lang.reflect.Method,java.lang.Object):45:45 -> <init>
     1:2:java.lang.Object newInstance(java.lang.Class):49:50 -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$2 -> com.android.tools.r8.internal.T10:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$2 -> com.android.tools.r8.internal.j00:
     int val$constructorId -> b
     java.lang.reflect.Method val$newInstance -> a
     1:1:void <init>(java.lang.reflect.Method,int):69:69 -> <init>
     1:2:java.lang.Object newInstance(java.lang.Class):73:74 -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$3 -> com.android.tools.r8.internal.U10:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$3 -> com.android.tools.r8.internal.k00:
     java.lang.reflect.Method val$newInstance -> a
     1:1:void <init>(java.lang.reflect.Method):89:89 -> <init>
     1:2:java.lang.Object newInstance(java.lang.Class):93:94 -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$4 -> com.android.tools.r8.internal.V10:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$4 -> com.android.tools.r8.internal.l00:
     1:1:void <init>():101:101 -> <init>
     1:1:java.lang.Object newInstance(java.lang.Class):104:104 -> b
-com.android.tools.r8.com.google.gson.internal.bind.ArrayTypeAdapter -> com.android.tools.r8.internal.l3:
+com.android.tools.r8.com.google.gson.internal.bind.ArrayTypeAdapter -> com.android.tools.r8.internal.j3:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> c
     com.android.tools.r8.com.google.gson.TypeAdapter componentTypeAdapter -> b
     java.lang.Class componentType -> a
@@ -17921,17 +17846,17 @@
     1:4:void <init>(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.TypeAdapter,java.lang.Class):57:60 -> <init>
     1:15:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):64:78 -> a
     16:25:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):86:95 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ArrayTypeAdapter$1 -> com.android.tools.r8.internal.k3:
+com.android.tools.r8.com.google.gson.internal.bind.ArrayTypeAdapter$1 -> com.android.tools.r8.internal.i3:
     1:1:void <init>():39:39 -> <init>
     1:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):42:43 -> a
     3:5:java.lang.reflect.Type com.android.tools.r8.com.google.gson.internal.$Gson$Types.getArrayComponentType(java.lang.reflect.Type):280:282 -> a
     3:5:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):47 -> a
     6:8:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):48:50 -> a
-com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory -> com.android.tools.r8.internal.lc:
+com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory -> com.android.tools.r8.internal.Qb:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     1:2:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):39:40 -> <init>
     1:13:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):45:57 -> a
-com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.kc:
+com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.Pb:
     com.android.tools.r8.com.google.gson.TypeAdapter elementTypeAdapter -> a
     com.android.tools.r8.com.google.gson.internal.ObjectConstructor constructor -> b
     1:4:void <init>(com.android.tools.r8.com.google.gson.Gson,java.lang.reflect.Type,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.internal.ObjectConstructor):67:70 -> <init>
@@ -17940,7 +17865,7 @@
     2:10:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):61 -> a
     11:22:java.util.Collection com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):74:85 -> a
     11:22:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):61 -> a
-com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter -> com.android.tools.r8.internal.De:
+com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter -> com.android.tools.r8.internal.ie:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> c
     java.text.DateFormat localFormat -> b
     java.text.DateFormat enUsFormat -> a
@@ -17957,16 +17882,16 @@
     31:31:java.util.Date com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter.deserializeToDate(java.lang.String):74:74 -> a
     31:31:java.util.Date com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):59 -> a
     31:31:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):41 -> a
-com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter$1 -> com.android.tools.r8.internal.Ce:
+com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter$1 -> com.android.tools.r8.internal.he:
     1:1:void <init>():42:42 -> <init>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):45:45 -> a
-com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory -> com.android.tools.r8.internal.Lv:
+com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory -> com.android.tools.r8.internal.ev:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     1:2:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):37:38 -> <init>
     1:6:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):44:49 -> a
     7:29:com.android.tools.r8.com.google.gson.TypeAdapter getTypeAdapter(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,com.android.tools.r8.com.google.gson.annotations.JsonAdapter):55:77 -> a
     30:30:com.android.tools.r8.com.google.gson.TypeAdapter getTypeAdapter(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,com.android.tools.r8.com.google.gson.annotations.JsonAdapter):71:71 -> a
-com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter -> com.android.tools.r8.internal.aw:
+com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter -> com.android.tools.r8.internal.tv:
     java.io.Writer UNWRITABLE_WRITER -> p
     com.android.tools.r8.com.google.gson.JsonPrimitive SENTINEL_CLOSED -> q
     java.lang.String pendingName -> n
@@ -18024,12 +17949,12 @@
     74:74:com.android.tools.r8.com.google.gson.JsonElement get():66:66 -> m
     75:75:com.android.tools.r8.com.google.gson.JsonElement get():66:66 -> m
     72:72:com.android.tools.r8.com.google.gson.JsonElement get():66:66 -> m
-com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter$1 -> com.android.tools.r8.internal.Zv:
+com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter$1 -> com.android.tools.r8.internal.sv:
     1:1:void <init>():34:34 -> <init>
     1:1:void close():42:42 -> close
     1:1:void flush():39:39 -> flush
     1:1:void write(char[],int,int):36:36 -> write
-com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory -> com.android.tools.r8.internal.ID:
+com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory -> com.android.tools.r8.internal.PC:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     boolean complexMapKeySerialization -> c
     1:3:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,boolean):110:112 -> <init>
@@ -18037,7 +17962,7 @@
     11:14:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory.getKeyAdapter(com.android.tools.r8.com.google.gson.Gson,java.lang.reflect.Type):140:140 -> a
     11:14:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):125 -> a
     15:20:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):126:131 -> a
-com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.HD:
+com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.OC:
     com.android.tools.r8.com.google.gson.TypeAdapter keyTypeAdapter -> a
     com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory this$0 -> d
     com.android.tools.r8.com.google.gson.TypeAdapter valueTypeAdapter -> b
@@ -18103,7 +18028,7 @@
     62:80:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):145 -> a
     81:97:java.util.Map com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory$Adapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):177:193 -> a
     81:97:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):145 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter -> com.android.tools.r8.internal.KK:
+com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter -> com.android.tools.r8.internal.GJ:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
     com.android.tools.r8.com.google.gson.Gson gson -> a
     1:1:void <clinit>():38:38 -> <clinit>
@@ -18113,21 +18038,24 @@
     37:37:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):82:82 -> a
     38:38:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):79:79 -> a
     39:39:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):76:76 -> a
-    40:45:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):67:72 -> a
-    46:51:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):58:63 -> a
-    52:56:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):96:100 -> a
-    57:57:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getAdapter(java.lang.Class):521:521 -> a
-    57:57:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):100 -> a
-    58:64:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):101:107 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter$1 -> com.android.tools.r8.internal.JK:
+    40:40:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):67:67 -> a
+    41:41:void com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.<init>():60:60 -> a
+    41:41:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):67 -> a
+    42:46:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):68:72 -> a
+    47:52:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):58:63 -> a
+    53:57:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):96:100 -> a
+    58:58:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getAdapter(java.lang.Class):521:521 -> a
+    58:58:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):100 -> a
+    59:65:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):101:107 -> a
+com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter$1 -> com.android.tools.r8.internal.FJ:
     1:1:void <init>():38:38 -> <init>
     1:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):41:42 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory -> com.android.tools.r8.internal.LS:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory -> com.android.tools.r8.internal.oR:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     com.android.tools.r8.com.google.gson.internal.Excluder excluder -> d
     com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory jsonAdapterFactory -> e
     com.android.tools.r8.com.google.gson.FieldNamingStrategy fieldNamingPolicy -> c
-    1:5:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.FieldNamingStrategy,com.android.tools.r8.com.google.gson.internal.Excluder,com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory):55:59 -> <init>
+    1:60:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.FieldNamingStrategy,com.android.tools.r8.com.google.gson.internal.Excluder,com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory):0:59 -> <init>
     1:1:boolean excludeField(java.lang.reflect.Field,boolean):63:63 -> a
     2:2:boolean com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory.excludeField(java.lang.reflect.Field,boolean,com.android.tools.r8.com.google.gson.internal.Excluder):67:67 -> a
     2:2:boolean excludeField(java.lang.reflect.Field,boolean):63 -> a
@@ -18145,7 +18073,7 @@
     61:70:java.util.Map com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory.getBoundFields(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,java.lang.Class):166:175 -> a
     61:70:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):100 -> a
     71:71:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):100:100 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1 -> com.android.tools.r8.internal.JS:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1 -> com.android.tools.r8.internal.mR:
     com.android.tools.r8.com.google.gson.reflect.TypeToken val$fieldType -> h
     boolean val$isPrimitive -> i
     java.lang.reflect.Field val$field -> d
@@ -18158,7 +18086,7 @@
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory,java.lang.String,boolean,boolean,java.lang.reflect.Field,boolean,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,boolean):118:118 -> <init>
     2:5:void com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$BoundField.<init>(java.lang.String,boolean,boolean):185:188 -> <init>
     2:5:void <init>(com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory,java.lang.String,boolean,boolean,java.lang.reflect.Field,boolean,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,boolean):118 -> <init>
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.KS:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.nR:
     java.util.Map boundFields -> b
     com.android.tools.r8.com.google.gson.internal.ObjectConstructor constructor -> a
     1:3:void <init>(com.android.tools.r8.com.google.gson.internal.ObjectConstructor,java.util.Map):199:201 -> <init>
@@ -18168,16 +18096,15 @@
     17:27:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):218:228 -> a
     28:28:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):226:226 -> a
     29:29:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):224:224 -> a
-    30:36:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):234:240 -> a
-    37:38:boolean com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1.writeField(java.lang.Object):135:136 -> a
-    37:38:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):241 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    39:39:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):242:242 -> a
-    40:43:void com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):122:125 -> a
-    40:43:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):243 -> a
-    44:44:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):249:249 -> a
-    45:45:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):247:247 -> a
-com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter -> com.android.tools.r8.internal.uW:
+    30:37:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):234:241 -> a
+    38:39:boolean com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1.writeField(java.lang.Object):135:136 -> a
+    38:39:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):241 -> a
+    40:40:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):242:242 -> a
+    41:44:void com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):122:125 -> a
+    41:44:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):243 -> a
+    45:45:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):249:249 -> a
+    46:46:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):247:247 -> a
+com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter -> com.android.tools.r8.internal.TU:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
     java.text.DateFormat format -> a
     1:1:void <clinit>():39:39 -> <clinit>
@@ -18188,10 +18115,10 @@
     11:11:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):38:38 -> a
     12:12:void com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.sql.Date):65:65 -> a
     12:12:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):38 -> a
-com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter$1 -> com.android.tools.r8.internal.tW:
+com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter$1 -> com.android.tools.r8.internal.SU:
     1:1:void <init>():39:39 -> <init>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):42:42 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter -> com.android.tools.r8.internal.yZ:
+com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter -> com.android.tools.r8.internal.OX:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
     java.text.DateFormat format -> a
     1:1:void <clinit>():41:41 -> <clinit>
@@ -18202,10 +18129,10 @@
     11:11:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):40:40 -> a
     12:12:void com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.sql.Time):64:64 -> a
     12:12:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):40 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter$1 -> com.android.tools.r8.internal.xZ:
+com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter$1 -> com.android.tools.r8.internal.NX:
     1:1:void <init>():41:41 -> <init>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):44:44 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper -> com.android.tools.r8.internal.o00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper -> com.android.tools.r8.internal.EY:
     java.lang.reflect.Type type -> c
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> b
     com.android.tools.r8.com.google.gson.Gson context -> a
@@ -18215,7 +18142,7 @@
     4:6:java.lang.reflect.Type com.android.tools.r8.com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper.getRuntimeTypeIfMoreSpecific(java.lang.reflect.Type,java.lang.Object):76:78 -> a
     4:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):54 -> a
     7:21:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):55:69 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.a10:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.qZ:
     com.android.tools.r8.com.google.gson.TypeAdapter FLOAT -> l
     com.android.tools.r8.com.google.gson.TypeAdapterFactory URL_FACTORY -> u
     com.android.tools.r8.com.google.gson.TypeAdapterFactory STRING_BUILDER_FACTORY -> s
@@ -18316,7 +18243,7 @@
     361:398:void <clinit>():787:824 -> <clinit>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapterFactory newFactory(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):850:850 -> a
     2:2:com.android.tools.r8.com.google.gson.TypeAdapterFactory newFactory(java.lang.Class,java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):863:863 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.z00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.PY:
     1:1:void <init>():69:69 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):69:69 -> a
     2:4:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Class):73:75 -> a
@@ -18333,35 +18260,35 @@
     6:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):69 -> a
     10:14:java.lang.Class com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1.read(com.android.tools.r8.com.google.gson.stream.JsonReader):81:85 -> a
     10:14:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):69 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.internal.p00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.internal.FY:
     1:1:void <init>():282:282 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):282:282 -> a
     2:6:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicIntegerArray):303:307 -> a
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):282 -> a
     7:21:java.util.concurrent.atomic.AtomicIntegerArray com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10.read(com.android.tools.r8.com.google.gson.stream.JsonReader):284:298 -> a
     7:21:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):282 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11 -> com.android.tools.r8.internal.q00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11 -> com.android.tools.r8.internal.GY:
     1:1:void <init>():313:313 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):313:313 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):328:328 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):313 -> a
     3:10:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11.read(com.android.tools.r8.com.google.gson.stream.JsonReader):316:323 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):313 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12 -> com.android.tools.r8.internal.r00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12 -> com.android.tools.r8.internal.HY:
     1:1:void <init>():332:332 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):332:332 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):343:343 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):332 -> a
     3:7:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12.read(com.android.tools.r8.com.google.gson.stream.JsonReader):335:339 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):332 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13 -> com.android.tools.r8.internal.s00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13 -> com.android.tools.r8.internal.IY:
     1:1:void <init>():347:347 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):347:347 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):358:358 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):347 -> a
     3:7:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13.read(com.android.tools.r8.com.google.gson.stream.JsonReader):350:354 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):347 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.t00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.JY:
     1:1:void <init>():362:362 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):362:362 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):378:378 -> a
@@ -18380,7 +18307,7 @@
     13:13:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
     14:14:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14.read(com.android.tools.r8.com.google.gson.stream.JsonReader):371:371 -> a
     14:14:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.internal.u00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.internal.KY:
     1:1:void <init>():384:384 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):384:384 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Character):399:399 -> a
@@ -18403,35 +18330,35 @@
     19:19:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
     14:14:java.lang.Character com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15.read(com.android.tools.r8.com.google.gson.stream.JsonReader):393:393 -> a
     14:14:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.internal.v00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.internal.LY:
     1:1:void <init>():406:406 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):406:406 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.String):422:422 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):406 -> a
     3:12:java.lang.String com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16.read(com.android.tools.r8.com.google.gson.stream.JsonReader):409:418 -> a
     3:12:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):406 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17 -> com.android.tools.r8.internal.w00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17 -> com.android.tools.r8.internal.MY:
     1:1:void <init>():426:426 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):426:426 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.math.BigDecimal):440:440 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):426 -> a
     3:10:java.math.BigDecimal com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17.read(com.android.tools.r8.com.google.gson.stream.JsonReader):428:435 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):426 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18 -> com.android.tools.r8.internal.x00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18 -> com.android.tools.r8.internal.NY:
     1:1:void <init>():444:444 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):444:444 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.math.BigInteger):458:458 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):444 -> a
     3:10:java.math.BigInteger com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18.read(com.android.tools.r8.com.google.gson.stream.JsonReader):446:453 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):444 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.y00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.OY:
     1:1:void <init>():464:464 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):464:464 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuilder):475:475 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):464 -> a
     3:7:java.lang.StringBuilder com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19.read(com.android.tools.r8.com.google.gson.stream.JsonReader):467:471 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):464 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.internal.L00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.internal.bZ:
     1:1:void <init>():92:92 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):92:92 -> a
     2:11:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.BitSet):136:145 -> a
@@ -18468,55 +18395,55 @@
     89:89:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
     68:81:java.util.BitSet com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2.read(com.android.tools.r8.com.google.gson.stream.JsonReader):117:130 -> a
     68:81:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.internal.A00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.internal.QY:
     1:1:void <init>():482:482 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):482:482 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuffer):493:493 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):482 -> a
     3:7:java.lang.StringBuffer com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20.read(com.android.tools.r8.com.google.gson.stream.JsonReader):485:489 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):482 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.internal.B00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.internal.RY:
     1:1:void <init>():500:500 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):500:500 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URL):512:512 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):500 -> a
     3:8:java.net.URL com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21.read(com.android.tools.r8.com.google.gson.stream.JsonReader):503:508 -> a
     3:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):500 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.internal.C00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.internal.SY:
     1:1:void <init>():518:518 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):518:518 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URI):534:534 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):518 -> a
     3:11:java.net.URI com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22.read(com.android.tools.r8.com.google.gson.stream.JsonReader):521:529 -> a
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):518 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.internal.D00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.internal.TY:
     1:1:void <init>():540:540 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):540:540 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.InetAddress):552:552 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):540 -> a
     3:8:java.net.InetAddress com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23.read(com.android.tools.r8.com.google.gson.stream.JsonReader):543:548 -> a
     3:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):540 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.internal.E00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.internal.UY:
     1:1:void <init>():559:559 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):559:559 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.UUID):570:570 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):559 -> a
     3:7:java.util.UUID com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24.read(com.android.tools.r8.com.google.gson.stream.JsonReader):562:566 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):559 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.internal.F00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.internal.VY:
     1:1:void <init>():576:576 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):576:576 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Currency):583:583 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):576 -> a
     3:3:java.util.Currency com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25.read(com.android.tools.r8.com.google.gson.stream.JsonReader):579:579 -> a
     3:3:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):576 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26 -> com.android.tools.r8.internal.H00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26 -> com.android.tools.r8.internal.XY:
     1:1:void <init>():588:588 -> <init>
     1:5:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):591:595 -> a
     6:6:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getAdapter(java.lang.Class):521:521 -> a
     6:6:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):595 -> a
     7:7:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):596:596 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26$1 -> com.android.tools.r8.internal.G00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26$1 -> com.android.tools.r8.internal.WY:
     com.android.tools.r8.com.google.gson.TypeAdapter val$dateTypeAdapter -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26,com.android.tools.r8.com.google.gson.TypeAdapter):596:596 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):596:596 -> a
@@ -18524,21 +18451,21 @@
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):596 -> a
     3:4:java.sql.Timestamp com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26$1.read(com.android.tools.r8.com.google.gson.stream.JsonReader):598:599 -> a
     3:4:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):596 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.I00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.YY:
     1:1:void <init>():609:609 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):609:609 -> a
     2:18:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Calendar):654:670 -> a
     2:18:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):609 -> a
     19:48:java.util.Calendar com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27.read(com.android.tools.r8.com.google.gson.stream.JsonReader):619:648 -> a
     19:48:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):609 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.internal.J00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.internal.ZY:
     1:1:void <init>():677:677 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):677:677 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Locale):708:708 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):677 -> a
     3:26:java.util.Locale com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28.read(com.android.tools.r8.com.google.gson.stream.JsonReader):680:703 -> a
     3:26:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):677 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.K00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.aZ:
     1:1:void <init>():714:714 -> <init>
     1:1:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonNull():74:74 -> a
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,com.android.tools.r8.com.google.gson.JsonElement):753 -> a
@@ -18570,17 +18497,17 @@
     37:38:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):720:721 -> b
     39:62:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):718:741 -> b
     63:68:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):728:733 -> b
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.S00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.iZ:
     1:1:void <init>():151:151 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):151:151 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Boolean):165:165 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):151 -> a
     3:10:java.lang.Boolean com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3.read(com.android.tools.r8.com.google.gson.stream.JsonReader):154:161 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):151 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$30 -> com.android.tools.r8.internal.M00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$30 -> com.android.tools.r8.internal.cZ:
     1:1:void <init>():824:824 -> <init>
     1:8:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):827:834 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$32 -> com.android.tools.r8.internal.N00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$32 -> com.android.tools.r8.internal.dZ:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> c
     java.lang.Class val$type -> b
     1:1:void <init>(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):850:850 -> <init>
@@ -18591,7 +18518,7 @@
     859:859:java.lang.String toString():856:856 -> toString
     860:860:java.lang.String toString():856:856 -> toString
     857:857:java.lang.String toString():856:856 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$33 -> com.android.tools.r8.internal.O00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$33 -> com.android.tools.r8.internal.eZ:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> d
     java.lang.Class val$unboxed -> b
     java.lang.Class val$boxed -> c
@@ -18603,7 +18530,7 @@
     874:874:java.lang.String toString():870:870 -> toString
     875:875:java.lang.String toString():870:870 -> toString
     871:872:java.lang.String toString():870:871 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34 -> com.android.tools.r8.internal.P00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34 -> com.android.tools.r8.internal.fZ:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> d
     java.lang.Class val$base -> b
     java.lang.Class val$sub -> c
@@ -18615,7 +18542,7 @@
     889:889:java.lang.String toString():885:885 -> toString
     890:890:java.lang.String toString():885:885 -> toString
     886:887:java.lang.String toString():885:886 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35 -> com.android.tools.r8.internal.R00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35 -> com.android.tools.r8.internal.hZ:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> c
     java.lang.Class val$clazz -> b
     1:1:void <init>(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):897:897 -> <init>
@@ -18626,7 +18553,7 @@
     923:923:java.lang.String toString():920:920 -> toString
     924:924:java.lang.String toString():920:920 -> toString
     921:921:java.lang.String toString():920:920 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35$1 -> com.android.tools.r8.internal.Q00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35$1 -> com.android.tools.r8.internal.gZ:
     com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35 this$0 -> b
     java.lang.Class val$requestedType -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35,java.lang.Class):904:904 -> <init>
@@ -18638,49 +18565,49 @@
     920:920:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):912:912 -> a
     921:921:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):912:912 -> a
     917:918:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):912:913 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4 -> com.android.tools.r8.internal.T00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4 -> com.android.tools.r8.internal.jZ:
     1:1:void <init>():173:173 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):173:173 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Boolean):183:183 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):173 -> a
     3:7:java.lang.Boolean com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4.read(com.android.tools.r8.com.google.gson.stream.JsonReader):175:179 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):173 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.U00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.kZ:
     1:1:void <init>():190:190 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):190:190 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):206:206 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):190 -> a
     3:11:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5.read(com.android.tools.r8.com.google.gson.stream.JsonReader):193:201 -> a
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):190 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.internal.V00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.internal.lZ:
     1:1:void <init>():213:213 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):213:213 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):228:228 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):213 -> a
     3:10:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6.read(com.android.tools.r8.com.google.gson.stream.JsonReader):216:223 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):213 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.internal.W00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.internal.mZ:
     1:1:void <init>():235:235 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):235:235 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):250:250 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):235 -> a
     3:10:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7.read(com.android.tools.r8.com.google.gson.stream.JsonReader):238:245 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):235 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.internal.X00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.internal.nZ:
     1:1:void <init>():256:256 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):256:256 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicInteger):265:265 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):256 -> a
     3:5:java.util.concurrent.atomic.AtomicInteger com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8.read(com.android.tools.r8.com.google.gson.stream.JsonReader):259:261 -> a
     3:5:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):256 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.internal.Y00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.internal.oZ:
     1:1:void <init>():271:271 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):271:271 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicBoolean):276:276 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):271 -> a
     3:3:java.util.concurrent.atomic.AtomicBoolean com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9.read(com.android.tools.r8.com.google.gson.stream.JsonReader):273:273 -> a
     3:3:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):271 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter -> com.android.tools.r8.internal.Z00:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter -> com.android.tools.r8.internal.pZ:
     java.util.Map nameToConstant -> a
     java.util.Map constantToName -> b
     1:1:void <init>(java.lang.Class):793:793 -> <init>
@@ -18690,7 +18617,7 @@
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):789 -> a
     3:7:java.lang.Enum com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):812:816 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):789 -> a
-com.android.tools.r8.com.google.gson.internal.bind.util.ISO8601Utils -> com.android.tools.r8.internal.Fn:
+com.android.tools.r8.com.google.gson.internal.bind.util.ISO8601Utils -> com.android.tools.r8.internal.kn:
     java.util.TimeZone TIMEZONE_UTC -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:52:java.util.Date parse(java.lang.String,java.text.ParsePosition):126:177 -> a
@@ -18721,7 +18648,7 @@
     1216:1216:int parseInt(java.lang.String,int,int):318:318 -> a
     1195:1195:int parseInt(java.lang.String,int,int):318:318 -> a
     1196:1196:int parseInt(java.lang.String,int,int):302:302 -> a
-com.android.tools.r8.com.google.gson.reflect.TypeToken -> com.android.tools.r8.internal.n10:
+com.android.tools.r8.com.google.gson.reflect.TypeToken -> com.android.tools.r8.internal.DZ:
     java.lang.reflect.Type type -> b
     java.lang.Class rawType -> a
     int hashCode -> c
@@ -18736,7 +18663,7 @@
     1:2:boolean equals(java.lang.Object):284:285 -> equals
     1:1:int hashCode():280:280 -> hashCode
     1:1:java.lang.String toString():289:289 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.Vv:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.ov:
     long peekedLong -> j
     int stackSize -> n
     char[] buffer -> d
@@ -18959,7 +18886,7 @@
     28:52:void skipValue():1240 -> t
     53:57:void skipValue():1248:1252 -> t
     1:1:java.lang.String toString():1445:1445 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonReader$1 -> com.android.tools.r8.internal.Uv:
+com.android.tools.r8.com.google.gson.stream.JsonReader$1 -> com.android.tools.r8.internal.nv:
     1:1:void <init>():1585:1585 -> <init>
     1:12:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1591:1602 -> a
     13:13:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):0:0 -> a
@@ -18968,12 +18895,12 @@
     1618:1618:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1602:1602 -> a
     1619:1619:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1602:1602 -> a
     1616:1616:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1603:1603 -> a
-com.android.tools.r8.com.google.gson.stream.JsonToken$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Yv:
+com.android.tools.r8.com.google.gson.stream.JsonToken$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.rv:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.bw:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.uv:
     java.lang.String separator -> f
     java.lang.String[] HTML_SAFE_REPLACEMENT_CHARS -> l
     java.lang.String deferredName -> i
@@ -19047,7 +18974,7 @@
     1:1:boolean isLenient():242:242 -> h
     1:7:void newline():597:603 -> i
     1:10:com.android.tools.r8.com.google.gson.stream.JsonWriter nullValue():446:455 -> j
-    1:2:void setIndent(java.lang.String):217:218 -> k
+    1:219:void setIndent(java.lang.String):0:218 -> k
     1:1:void writeDeferredName():400:400 -> l
     2:5:int com.android.tools.r8.com.google.gson.stream.JsonWriter.peek():366:369 -> l
     2:5:void com.android.tools.r8.com.google.gson.stream.JsonWriter.beforeName():612 -> l
@@ -19063,7 +18990,7 @@
     15:15:int com.android.tools.r8.com.google.gson.stream.JsonWriter.peek():367:367 -> l
     15:15:void com.android.tools.r8.com.google.gson.stream.JsonWriter.beforeName():612 -> l
     15:15:void writeDeferredName():401 -> l
-com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.FD:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.MC:
     1:1:void <init>(java.lang.String):29:29 -> <init>
 com.android.tools.r8.compatproguard.CompatProguard -> com.android.tools.r8.compatproguard.CompatProguard:
     1:23:void run(java.lang.String[]):210:232 -> a
@@ -19138,7 +19065,7 @@
     86:106:com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions parse(java.lang.String[]):146:166 -> a
 com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions$1 -> com.android.tools.r8.compatproguard.a:
     1:1:void <init>():83:83 -> <init>
-com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.Mc:
+com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.pc:
     java.util.Map seenSetForTesting -> c
     java.lang.Thread mainThread -> b
     java.util.function.Consumer testingConsumer -> a
@@ -19159,13 +19086,12 @@
     68:68:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):53:53 -> a
     63:63:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):53:53 -> a
     69:71:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():66:68 -> a
-com.android.tools.r8.contexts.CompilationContext$1 -> com.android.tools.r8.internal.Hc:
-com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.Ic:
+com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.lc:
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.contexts.CompilationContext$1):17:17 -> <init>
     java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder) -> a
     java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder) -> b
-com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.android.tools.r8.internal.Jc:
+com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.android.tools.r8.internal.mc:
     com.android.tools.r8.graph.ProgramMethod method -> b
     int nextId -> c
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext parent -> a
@@ -19185,24 +19111,29 @@
     3:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.buildSuffix(java.lang.StringBuilder):148:150 -> b
     3:5:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):162 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod getMethodContext():143:143 -> c
-com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.Kc:
+com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.nc:
     com.android.tools.r8.contexts.CompilationContext parent -> a
     int processorId -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():72:72 -> <clinit>
     1:1:void <init>(com.android.tools.r8.contexts.CompilationContext,int,com.android.tools.r8.contexts.CompilationContext$1):72:72 -> <init>
     2:4:void <init>(com.android.tools.r8.contexts.CompilationContext,int):76:78 -> <init>
-    1:1:boolean access$500(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):72:72 -> a
+    1:1:boolean com.android.tools.r8.contexts.CompilationContext$ProcessorContext.verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):82:82 -> a
+    1:1:boolean access$500(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):72 -> a
     2:2:boolean com.android.tools.r8.contexts.CompilationContext$ProcessorContext.verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):82:82 -> a
     2:2:boolean access$500(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):72 -> a
-    3:4:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod):94:95 -> a
-    5:5:boolean com.android.tools.r8.contexts.CompilationContext$ProcessorContext.verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):82:82 -> a
-    5:5:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod):95 -> a
-    6:6:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):100:100 -> a
-    6:6:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):105 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:boolean com.android.tools.r8.contexts.CompilationContext$ProcessorContext.verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):82:82 -> a
+    3:3:boolean access$500(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):72 -> a
+    4:4:boolean access$500(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):72:72 -> a
+    5:6:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod):94:95 -> a
+    7:7:boolean com.android.tools.r8.contexts.CompilationContext$ProcessorContext.verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):82:82 -> a
+    7:7:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod):95 -> a
+    8:8:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):100:100 -> a
+    8:8:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):105 -> a
     1:1:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):100:100 -> b
     1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):110 -> b
-com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.Lc:
+com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.oc:
     com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext parent -> a
     int positionId -> b
     1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,int,com.android.tools.r8.contexts.CompilationContext$1):166:166 -> <init>
@@ -19221,13 +19152,13 @@
     5:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSyntheticSuffix(java.lang.StringBuilder):186 -> b
     5:5:java.lang.String getSyntheticSuffix():194 -> b
     6:6:java.lang.String getSyntheticSuffix():194:194 -> b
-com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.Nf:
+com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.vf:
     com.android.tools.r8.utils.InternalOptions options -> b
     com.android.tools.r8.naming.NamingLens namingLens -> a
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):53:56 -> <init>
     1:1:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():68:68 -> a
     1:1:void runIfNecessary(com.android.tools.r8.utils.Timing):60 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     2:2:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():68 -> a
     2:2:void runIfNecessary(com.android.tools.r8.utils.Timing):60 -> a
     3:3:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():68:68 -> a
@@ -19382,28 +19313,28 @@
     5:5:void lambda$readDexSources$0(com.android.tools.r8.dex.DexParser,java.util.Queue,com.android.tools.r8.graph.ApplicationReaderMap):380:380 -> a
     6:23:void readClassSources(java.util.List,java.util.Queue):403:420 -> a
     24:24:void readClassSources(java.util.List,java.util.Queue):419:419 -> a
-    25:25:java.lang.Object lambda$readClassSources$2(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource):422:422 -> a
-    26:26:void com.android.tools.r8.graph.JarClassFileReader.read(com.android.tools.r8.ProgramResource):92:92 -> a
-    26:26:java.lang.Object lambda$readClassSources$2(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource):422 -> a
-    27:33:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):473:479 -> a
-    34:51:com.android.tools.r8.utils.ClassProvider buildClassProvider(com.android.tools.r8.graph.ClassKind,java.util.Queue,java.util.List,com.android.tools.r8.graph.JarApplicationReader):451:468 -> a
-    34:51:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):478 -> a
-    52:57:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):481:486 -> a
-    58:75:com.android.tools.r8.utils.ClassProvider buildClassProvider(com.android.tools.r8.graph.ClassKind,java.util.Queue,java.util.List,com.android.tools.r8.graph.JarApplicationReader):451:468 -> a
-    58:75:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):485 -> a
-    76:76:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):488:488 -> a
-    77:77:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    77:77:void lambda$readClassSources$1(java.util.Queue,com.android.tools.r8.graph.DexProgramClass):411 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    78:88:boolean includeAnnotationClass(com.android.tools.r8.graph.DexProgramClass):388:398 -> a
-    78:88:void lambda$readClassSources$1(java.util.Queue,com.android.tools.r8.graph.DexProgramClass):411 -> a
-    89:89:void lambda$readClassSources$1(java.util.Queue,com.android.tools.r8.graph.DexProgramClass):414:414 -> a
+    25:25:void lambda$readClassSources$1(java.util.Queue,com.android.tools.r8.graph.DexProgramClass):411:411 -> a
+    26:26:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    26:26:void lambda$readClassSources$1(java.util.Queue,com.android.tools.r8.graph.DexProgramClass):411 -> a
+    27:37:boolean includeAnnotationClass(com.android.tools.r8.graph.DexProgramClass):388:398 -> a
+    27:37:void lambda$readClassSources$1(java.util.Queue,com.android.tools.r8.graph.DexProgramClass):411 -> a
+    38:38:void lambda$readClassSources$1(java.util.Queue,com.android.tools.r8.graph.DexProgramClass):414:414 -> a
+    39:39:java.lang.Object lambda$readClassSources$2(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource):422:422 -> a
+    40:40:void com.android.tools.r8.graph.JarClassFileReader.read(com.android.tools.r8.ProgramResource):92:92 -> a
+    40:40:java.lang.Object lambda$readClassSources$2(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource):422 -> a
+    41:47:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):473:479 -> a
+    48:65:com.android.tools.r8.utils.ClassProvider buildClassProvider(com.android.tools.r8.graph.ClassKind,java.util.Queue,java.util.List,com.android.tools.r8.graph.JarApplicationReader):451:468 -> a
+    48:65:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):478 -> a
+    66:71:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):481:486 -> a
+    72:89:com.android.tools.r8.utils.ClassProvider buildClassProvider(com.android.tools.r8.graph.ClassKind,java.util.Queue,java.util.List,com.android.tools.r8.graph.JarApplicationReader):451:468 -> a
+    72:89:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):485 -> a
+    90:90:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):488:488 -> a
     1:24:void readDexSources(java.util.List,java.util.Queue):355:378 -> b
     25:25:void readDexSources(java.util.List,java.util.Queue):377:377 -> b
     26:38:void readSources():431:443 -> b
-com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver -> com.android.tools.r8.internal.q2:
+com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver -> com.android.tools.r8.internal.p2:
     com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.internal.B2:
+com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.internal.A2:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> k
     com.android.tools.r8.dex.CodeToKeep desugaredLibraryCodeToKeep -> f
@@ -19432,17 +19363,12 @@
     309:311:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):296 -> a
     312:312:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):298:298 -> a
     316:316:com.android.tools.r8.graph.DexString access$000(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):79:79 -> a
-    317:317:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):181:181 -> a
-    317:317:void lambda$rewriteSourceFile$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProgramClass):440 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    318:318:java.util.List distribute(java.util.concurrent.ExecutorService):194:194 -> a
-    319:319:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():472:472 -> a
-    319:319:java.util.List distribute(java.util.concurrent.ExecutorService):194 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    320:320:java.util.List distribute(java.util.concurrent.ExecutorService):195:195 -> a
-    321:321:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():488:488 -> a
+    317:317:java.util.List distribute(java.util.concurrent.ExecutorService):194:194 -> a
+    318:318:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():473:473 -> a
+    318:318:java.util.List distribute(java.util.concurrent.ExecutorService):194 -> a
+    319:320:java.util.List distribute(java.util.concurrent.ExecutorService):195:196 -> a
+    321:321:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():489:489 -> a
     321:321:java.util.List distribute(java.util.concurrent.ExecutorService):196 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     322:331:java.util.List distribute(java.util.concurrent.ExecutorService):196:205 -> a
     332:333:void encodeChecksums(java.lang.Iterable):215:216 -> a
     334:334:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.<init>(int):110:110 -> a
@@ -19479,157 +19405,166 @@
     446:446:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):307 -> a
     447:449:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):308:308 -> a
     454:481:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):313:340 -> a
-    482:482:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    482:482:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     482:482:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):340 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     483:491:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):340:348 -> a
     492:492:java.lang.Boolean lambda$write$0(java.util.List,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):278:278 -> a
     493:493:void lambda$write$1(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):284:284 -> a
     494:506:com.android.tools.r8.SourceFileEnvironment createSourceFileEnvironment(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):409:421 -> a
-    507:510:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):519:522 -> a
-    511:518:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):520:527 -> a
-    519:527:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):526:534 -> a
-    528:561:void com.android.tools.r8.dex.ApplicationWriter.adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):583:616 -> a
-    528:561:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):537 -> a
-    562:593:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):542:573 -> a
-    594:627:void com.android.tools.r8.dex.ApplicationWriter.adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):583:616 -> a
-    594:627:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):572 -> a
-    628:628:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):549:549 -> a
-    629:638:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):548:557 -> a
-    639:645:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):552:558 -> a
-    646:646:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1216,"2":1217,"3":1218,"4":1219,"5":1220}}
-    1216:1216:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
-    1217:1217:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
+    507:507:void lambda$rewriteSourceFile$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProgramClass):440:440 -> a
+    508:508:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):181:181 -> a
+    508:508:void lambda$rewriteSourceFile$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProgramClass):440 -> a
+    509:512:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):519:522 -> a
+    513:520:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):520:527 -> a
+    521:529:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):526:534 -> a
+    530:563:void com.android.tools.r8.dex.ApplicationWriter.adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):583:616 -> a
+    530:563:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):537 -> a
+    564:595:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):542:573 -> a
+    596:629:void com.android.tools.r8.dex.ApplicationWriter.adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):583:616 -> a
+    596:629:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):572 -> a
+    630:630:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):549:549 -> a
+    631:640:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):548:557 -> a
+    641:647:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):552:558 -> a
+    648:648:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1218,"2":1219,"3":1220,"4":1221,"5":1222}}
     1218:1218:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
     1219:1219:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
     1220:1220:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
-    1206:1206:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):560:560 -> a
-    1207:1207:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):551:551 -> a
-    1208:1208:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):550:550 -> a
-    1221:1221:void insertAttributeAnnotations():623:623 -> a
-    1222:1236:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):631:645 -> a
-    1222:1236:void insertAttributeAnnotations():624 -> a
-    1237:1237:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):644:644 -> a
-    1237:1237:void insertAttributeAnnotations():624 -> a
-    1238:1246:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):643:651 -> a
-    1238:1246:void insertAttributeAnnotations():624 -> a
-    1247:1247:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):650:650 -> a
-    1247:1247:void insertAttributeAnnotations():624 -> a
-    1248:1264:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):649:665 -> a
-    1248:1264:void insertAttributeAnnotations():624 -> a
-    1265:1271:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):664:670 -> a
-    1265:1271:void insertAttributeAnnotations():624 -> a
-    1272:1281:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):183:192 -> a
-    1272:1281:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):668 -> a
-    1272:1281:void insertAttributeAnnotations():624 -> a
-    1282:1290:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):667:675 -> a
-    1282:1290:void insertAttributeAnnotations():624 -> a
-    1291:1291:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):674:674 -> a
-    1291:1291:void insertAttributeAnnotations():624 -> a
-    1292:1303:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):673:684 -> a
-    1292:1303:void insertAttributeAnnotations():624 -> a
-    1304:1312:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):683:691 -> a
-    1304:1312:void insertAttributeAnnotations():624 -> a
-    1313:1319:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):276:282 -> a
-    1313:1319:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):691 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1313:1319:void insertAttributeAnnotations():624 -> a
-    1320:1320:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):691:691 -> a
-    1320:1320:void insertAttributeAnnotations():624 -> a
-    1321:1321:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):690:690 -> a
-    1321:1321:void insertAttributeAnnotations():624 -> a
-    1322:1333:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):689:700 -> a
-    1322:1333:void insertAttributeAnnotations():624 -> a
-    1334:1334:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71:71 -> a
-    1334:1334:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
-    1334:1334:void insertAttributeAnnotations():624 -> a
-    1335:1335:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
-    1335:1335:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71 -> a
-    1335:1335:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
-    1335:1335:void insertAttributeAnnotations():624 -> a
-    1336:1337:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:73 -> a
-    1336:1337:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
-    1336:1337:void insertAttributeAnnotations():624 -> a
-    1338:1348:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698:708 -> a
-    1338:1348:void insertAttributeAnnotations():624 -> a
-    1349:1350:void insertAttributeAnnotations():625:626 -> a
-    1351:1360:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):712:721 -> a
-    1361:1367:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:482 -> a
-    1361:1367:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):721 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1368:1368:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):721:721 -> a
-    1369:1369:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):720:720 -> a
-    1370:1370:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):718:718 -> a
-    1371:1371:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):717:717 -> a
-    1372:1379:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):716:723 -> a
-    1380:1389:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):727:736 -> a
-    1390:1396:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:884 -> a
-    1390:1396:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):736 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1397:1397:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):736:736 -> a
-    1398:1398:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):735:735 -> a
-    1399:1399:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):733:733 -> a
-    1400:1400:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):732:732 -> a
-    1401:1408:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):731:738 -> a
-    1409:1409:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):747:747 -> a
-    1410:1410:void lambda$setCallSiteContexts$6(com.android.tools.r8.graph.ProgramMethod):749:749 -> a
-    1411:1423:void rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):764:776 -> a
-    1424:1431:void lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.ProgramMethod):779:786 -> a
-    1432:1443:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.utils.Timing):793:804 -> a
-    1444:1444:com.android.tools.r8.dex.FileWriter lambda$writeDexFile$8(com.android.tools.r8.dex.FileWriter):802:802 -> a
-    1445:1446:java.lang.String com.android.tools.r8.dex.ApplicationWriter.mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):808:809 -> a
-    1445:1446:void lambda$writeMainDexList$10(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):820 -> a
-    1447:1447:void lambda$writeMainDexList$10(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):820:820 -> a
-    1448:1455:java.lang.String writeMainDexList(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):814:821 -> a
+    1221:1221:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
+    1222:1222:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
+    1208:1208:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):560:560 -> a
+    1209:1209:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):551:551 -> a
+    1210:1210:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):550:550 -> a
+    1223:1223:void insertAttributeAnnotations():623:623 -> a
+    1224:1238:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):631:645 -> a
+    1224:1238:void insertAttributeAnnotations():624 -> a
+    1239:1239:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):644:644 -> a
+    1239:1239:void insertAttributeAnnotations():624 -> a
+    1240:1248:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):643:651 -> a
+    1240:1248:void insertAttributeAnnotations():624 -> a
+    1249:1249:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):650:650 -> a
+    1249:1249:void insertAttributeAnnotations():624 -> a
+    1250:1266:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):649:665 -> a
+    1250:1266:void insertAttributeAnnotations():624 -> a
+    1267:1273:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):664:670 -> a
+    1267:1273:void insertAttributeAnnotations():624 -> a
+    1274:1283:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):183:192 -> a
+    1274:1283:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):668 -> a
+    1274:1283:void insertAttributeAnnotations():624 -> a
+    1284:1292:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):667:675 -> a
+    1284:1292:void insertAttributeAnnotations():624 -> a
+    1293:1293:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):674:674 -> a
+    1293:1293:void insertAttributeAnnotations():624 -> a
+    1294:1305:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):673:684 -> a
+    1294:1305:void insertAttributeAnnotations():624 -> a
+    1306:1314:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):683:691 -> a
+    1306:1314:void insertAttributeAnnotations():624 -> a
+    1315:1321:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):276:282 -> a
+    1315:1321:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):691 -> a
+    1315:1321:void insertAttributeAnnotations():624 -> a
+    1322:1322:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):691:691 -> a
+    1322:1322:void insertAttributeAnnotations():624 -> a
+    1323:1323:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):690:690 -> a
+    1323:1323:void insertAttributeAnnotations():624 -> a
+    1324:1335:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):689:700 -> a
+    1324:1335:void insertAttributeAnnotations():624 -> a
+    1336:1336:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71:71 -> a
+    1336:1336:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
+    1336:1336:void insertAttributeAnnotations():624 -> a
+    1337:1337:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
+    1337:1337:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71 -> a
+    1337:1337:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
+    1337:1337:void insertAttributeAnnotations():624 -> a
+    1338:1339:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:73 -> a
+    1338:1339:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
+    1338:1339:void insertAttributeAnnotations():624 -> a
+    1340:1350:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698:708 -> a
+    1340:1350:void insertAttributeAnnotations():624 -> a
+    1351:1352:void insertAttributeAnnotations():625:626 -> a
+    1353:1362:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):712:721 -> a
+    1363:1369:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:482 -> a
+    1363:1369:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):721 -> a
+    1370:1370:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):721:721 -> a
+    1371:1371:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):720:720 -> a
+    1372:1372:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):718:718 -> a
+    1373:1373:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):717:717 -> a
+    1374:1381:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):716:723 -> a
+    1382:1391:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):727:736 -> a
+    1392:1398:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:884 -> a
+    1392:1398:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):736 -> a
+    1399:1399:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):736:736 -> a
+    1400:1400:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):735:735 -> a
+    1401:1401:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):733:733 -> a
+    1402:1402:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):732:732 -> a
+    1403:1410:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):731:738 -> a
+    1411:1411:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):747:747 -> a
+    1412:1412:void lambda$setCallSiteContexts$6(com.android.tools.r8.graph.ProgramMethod):749:749 -> a
+    1413:1425:void rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):764:776 -> a
+    1426:1433:void lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.ProgramMethod):779:786 -> a
+    1434:1445:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.utils.Timing):793:804 -> a
+    1446:1446:com.android.tools.r8.dex.FileWriter lambda$writeDexFile$8(com.android.tools.r8.dex.FileWriter):802:802 -> a
+    1447:1448:java.lang.String com.android.tools.r8.dex.ApplicationWriter.mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):808:809 -> a
+    1447:1448:void lambda$writeMainDexList$10(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):820 -> a
+    1449:1449:void lambda$writeMainDexList$10(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):820:820 -> a
+    1450:1457:java.lang.String writeMainDexList(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):814:821 -> a
     1:1:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":381,"2":382,"3":383}}
-    381:381:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
-    382:382:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
-    383:383:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":385,"2":386,"3":387}}
+    385:385:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
+    386:386:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
+    387:387:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
     329:329:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
     330:340:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):461:471 -> b
     330:340:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
-    341:341:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():488:488 -> b
+    341:341:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():489:489 -> b
     341:341:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):471 -> b
     341:341:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
-    342:348:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):474:480 -> b
-    342:348:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
-    349:349:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():484:484 -> b
-    349:349:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):480 -> b
-    349:349:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
-    350:366:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):485:501 -> b
-    350:366:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
-    367:379:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):498:510 -> b
-    367:379:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
-    380:380:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):330:330 -> b
-    384:389:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):435:440 -> b
-    390:392:void setCallSiteContexts(java.util.concurrent.ExecutorService):742:742 -> b
-    393:393:com.android.tools.r8.dex.FileWriter$ByteBufferResult lambda$writeDexFile$9(com.android.tools.r8.dex.FileWriter):804:804 -> b
+    342:342:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):472:472 -> b
+    342:342:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    343:343:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():489:489 -> b
+    343:343:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):472 -> b
+    343:343:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    344:350:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):474:480 -> b
+    344:350:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    351:351:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():485:485 -> b
+    351:351:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):480 -> b
+    351:351:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    352:352:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):481:481 -> b
+    352:352:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    353:353:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():485:485 -> b
+    353:353:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):481 -> b
+    353:353:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    354:370:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):485:501 -> b
+    354:370:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    371:383:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):498:510 -> b
+    371:383:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    384:384:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):330:330 -> b
+    388:393:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):435:440 -> b
+    394:396:void setCallSiteContexts(java.util.concurrent.ExecutorService):742:742 -> b
+    397:397:com.android.tools.r8.dex.FileWriter$ByteBufferResult lambda$writeDexFile$9(com.android.tools.r8.dex.FileWriter):804:804 -> b
     1:1:void write(java.util.concurrent.ExecutorService):236:236 -> c
     2:2:boolean com.android.tools.r8.dex.ApplicationWriter.willComputeProguardMap():231:231 -> c
     2:2:void write(java.util.concurrent.ExecutorService):236 -> c
     3:4:void write(java.util.concurrent.ExecutorService):236:237 -> c
-com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.internal.u2:
+com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.internal.t2:
     com.android.tools.r8.dex.ApplicationWriter this$0 -> d
     com.android.tools.r8.utils.Box val$delayedProguardMapId -> c
     1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.Box):359:359 -> <init>
     1:3:com.android.tools.r8.graph.DexString internalCompute():363:365 -> b
     4:4:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.Marker.toDexString(com.android.tools.r8.graph.DexItemFactory):296:296 -> b
     4:4:com.android.tools.r8.graph.DexString internalCompute():365 -> b
-com.android.tools.r8.dex.ApplicationWriter$2 -> com.android.tools.r8.internal.v2:
+com.android.tools.r8.dex.ApplicationWriter$2 -> com.android.tools.r8.internal.u2:
     com.android.tools.r8.dex.ApplicationWriter this$0 -> d
     com.android.tools.r8.utils.Box val$delayedProguardMapId -> c
     1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.Box):397:397 -> <init>
     1:1:com.android.tools.r8.graph.DexString internalCompute():400:400 -> b
-com.android.tools.r8.dex.ApplicationWriter$3 -> com.android.tools.r8.internal.w2:
+com.android.tools.r8.dex.ApplicationWriter$3 -> com.android.tools.r8.internal.v2:
     1:1:void <init>():409:409 -> <init>
-com.android.tools.r8.dex.ApplicationWriter$4 -> com.android.tools.r8.internal.x2:
+com.android.tools.r8.dex.ApplicationWriter$4 -> com.android.tools.r8.internal.w2:
     com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId val$proguardMapId -> a
     1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):421:421 -> <init>
     1:1:java.lang.String getMapHash():429:429 -> getMapHash
     1:1:java.lang.String getMapId():424:424 -> getMapId
-com.android.tools.r8.dex.ApplicationWriter$5 -> com.android.tools.r8.internal.y2:
+com.android.tools.r8.dex.ApplicationWriter$5 -> com.android.tools.r8.internal.x2:
     com.android.tools.r8.dex.ResourceAdapter val$resourceAdapter -> a
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> b
     java.util.Set val$generatedResourceNames -> d
@@ -19647,14 +19582,14 @@
     629:629:void visit(com.android.tools.r8.DataEntryResource):609:609 -> visit
     622:622:void visit(com.android.tools.r8.DataEntryResource):610:610 -> visit
     623:626:void visit(com.android.tools.r8.DataEntryResource):609:612 -> visit
-com.android.tools.r8.dex.ApplicationWriter$LazyDexString -> com.android.tools.r8.internal.z2:
+com.android.tools.r8.dex.ApplicationWriter$LazyDexString -> com.android.tools.r8.internal.y2:
     boolean computed -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():824:824 -> <clinit>
     1:2:void <init>():824:825 -> <init>
     1:3:com.android.tools.r8.graph.DexString compute():830:832 -> a
     com.android.tools.r8.graph.DexString internalCompute() -> b
-com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.internal.A2:
+com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.internal.z2:
     com.android.tools.r8.naming.NamingLens namingLens -> a
     1:2:void <init>(com.android.tools.r8.naming.NamingLens):97:98 -> <init>
     boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode) -> a
@@ -19680,7 +19615,7 @@
     1:1:int getUleb128():44:44 -> d
     1:1:int getUleb128p1():52 -> d
     1:2:int getUshort():62:63 -> e
-com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.tb:
+com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.Za:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap dictionary -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -19697,7 +19632,7 @@
     15:15:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> b
     15:15:void tryParseAndAppend(com.android.tools.r8.graph.DexString):65 -> b
     16:16:void tryParseAndAppend(com.android.tools.r8.graph.DexString):66:66 -> b
-com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.internal.Ub:
+com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.internal.zb:
     1:1:void <init>():24:24 -> <init>
     void generateKeepRules(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isNop() -> a
@@ -19705,14 +19640,12 @@
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
-    1:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:28 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):29 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:8:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):29:33 -> a
-    9:9:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):31:31 -> a
-com.android.tools.r8.dex.CodeToKeep$1 -> com.android.tools.r8.internal.Pb:
-com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.internal.Sb:
+    1:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    4:4:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):29 -> a
+    5:9:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):29:33 -> a
+    10:10:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):31:31 -> a
+com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.internal.xb:
     java.util.Map toKeep -> c
     com.android.tools.r8.naming.NamingLens namingLens -> a
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -19756,10 +19689,8 @@
     1:1:void keepClass(com.android.tools.r8.graph.DexType):141:141 -> b
     2:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):427:434 -> b
     2:9:void keepClass(com.android.tools.r8.graph.DexType):141 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):432:436 -> b
     10:14:void keepClass(com.android.tools.r8.graph.DexType):141 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:void keepClass(com.android.tools.r8.graph.DexType):142:142 -> b
     1:4:boolean shouldKeep(com.android.tools.r8.graph.DexType):74:77 -> c
     5:5:boolean shouldKeep(com.android.tools.r8.graph.DexType):0:0 -> c
@@ -19769,18 +19700,18 @@
     90:90:boolean shouldKeep(com.android.tools.r8.graph.DexType):77:77 -> c
     82:86:boolean shouldKeep(com.android.tools.r8.graph.DexType):77:81 -> c
     87:87:boolean shouldKeep(com.android.tools.r8.graph.DexType):78:78 -> c
-com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$2 -> com.android.tools.r8.internal.Qb:
+com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$2 -> com.android.tools.r8.internal.vb:
     1:1:void <init>():209:209 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):209:209 -> compare
     2:2:int com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$2.compare(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):212:212 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):209 -> compare
-com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$KeepStruct -> com.android.tools.r8.internal.Rb:
+com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$KeepStruct -> com.android.tools.r8.internal.wb:
     java.util.Set fields -> a
     java.util.Set methods -> b
     boolean all -> c
     1:5:void <init>():52:56 -> <init>
     6:6:void <init>(com.android.tools.r8.dex.CodeToKeep$1):52:52 -> <init>
-com.android.tools.r8.dex.CodeToKeep$NopCodeToKeep -> com.android.tools.r8.internal.Tb:
+com.android.tools.r8.dex.CodeToKeep$NopCodeToKeep -> com.android.tools.r8.internal.yb:
     1:1:void <init>():218:218 -> <init>
     boolean isNop() -> a
     void recordClass(com.android.tools.r8.graph.DexType) -> a
@@ -19788,7 +19719,7 @@
     void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:1:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):242:242 -> a
-com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.Gc:
+com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.kc:
     java.nio.ByteBuffer buffer -> a
     1:2:void <init>(java.nio.ByteBuffer):21:22 -> <init>
     1:1:java.nio.ByteBuffer com.android.tools.r8.dex.CompatByteBuffer.asByteBuffer():34:34 -> a
@@ -19856,12 +19787,12 @@
     1:1:java.nio.Buffer com.android.tools.r8.dex.CompatByteBuffer.asBuffer():30:30 -> m
     1:1:void rewind():48 -> m
     2:2:void rewind():48:48 -> m
-com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.Od:
+com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.qd:
     byte[] VDEX_FILE_MAGIC_PREFIX -> b
     byte[] DEX_FILE_MAGIC_PREFIX -> a
     com.android.tools.r8.cf.CfVersion CORRESPONDING_CLASS_FILE_VERSION -> c
     1:12:void <clinit>():10:21 -> <clinit>
-com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.Ke:
+com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.pe:
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     java.nio.ByteBuffer buffer -> d
     com.android.tools.r8.graph.DexDebugInfoForWriting info -> c
@@ -19941,7 +19872,7 @@
     1:2:void putInt(int):125:126 -> f
 com.android.tools.r8.dex.DexOutputBuffer$1 -> com.android.tools.r8.dex.d:
     1:1:void <init>():30:30 -> <init>
-com.android.tools.r8.dex.DexParser -> com.android.tools.r8.dex.j:
+com.android.tools.r8.dex.DexParser -> com.android.tools.r8.dex.i:
     com.android.tools.r8.graph.OffsetToObjectMapping indexedItems -> h
     com.android.tools.r8.graph.ClassKind classKind -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap checksums -> g
@@ -19965,13 +19896,11 @@
     16:17:com.android.tools.r8.graph.DexAnnotation parseAnnotation():452:453 -> a
     18:18:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
     18:18:com.android.tools.r8.graph.DexAnnotation parseAnnotation():453 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:19:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
     19:19:com.android.tools.r8.graph.DexAnnotation parseAnnotation():453 -> a
     20:20:com.android.tools.r8.graph.DexAnnotation parseAnnotation():455:455 -> a
     21:21:byte com.android.tools.r8.dex.BinaryReader.get():97:97 -> a
     21:21:com.android.tools.r8.graph.DexAnnotation parseAnnotation():455 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     22:22:com.android.tools.r8.graph.DexAnnotation parseAnnotation():456:456 -> a
     23:23:com.android.tools.r8.graph.DexAnnotation annotationAt(int):460:460 -> a
     24:29:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):655:660 -> a
@@ -19985,7 +19914,7 @@
     45:46:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):672 -> a
     47:50:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):674:677 -> a
     51:61:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):676:686 -> a
-    62:62:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():475:475 -> a
+    62:62:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():498:498 -> a
     62:62:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):687 -> a
     63:63:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):688:688 -> a
     64:71:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):698:705 -> a
@@ -20063,75 +19992,71 @@
     156:156:com.android.tools.r8.graph.DexCode parseCodeItem():976 -> a
     156:156:void ensureCodesInited(int):169 -> a
     156:156:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):710 -> a
-    157:160:com.android.tools.r8.graph.DexCode parseCodeItem():978:981 -> a
-    157:160:void ensureCodesInited(int):169 -> a
-    157:160:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):710 -> a
-    161:161:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):733:733 -> a
-    161:161:com.android.tools.r8.graph.DexCode parseCodeItem():982 -> a
-    161:161:void ensureCodesInited(int):169 -> a
-    161:161:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):710 -> a
-    162:162:com.android.tools.r8.graph.DexCode parseCodeItem():987:987 -> a
+    157:161:com.android.tools.r8.graph.DexCode parseCodeItem():978:982 -> a
+    157:161:void ensureCodesInited(int):169 -> a
+    157:161:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):710 -> a
+    162:162:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):733:733 -> a
+    162:162:com.android.tools.r8.graph.DexCode parseCodeItem():982 -> a
     162:162:void ensureCodesInited(int):169 -> a
     162:162:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):710 -> a
-    163:163:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    163:163:com.android.tools.r8.graph.DexCode parseCodeItem():987 -> a
+    163:163:com.android.tools.r8.graph.DexCode parseCodeItem():987:987 -> a
     163:163:void ensureCodesInited(int):169 -> a
     163:163:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):710 -> a
-    164:169:com.android.tools.r8.graph.DexCode parseCodeItem():988:993 -> a
-    164:169:void ensureCodesInited(int):169 -> a
-    164:169:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):710 -> a
-    170:171:void ensureCodesInited(int) -> a
-    170:171:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):710 -> a
-    172:180:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):711:719 -> a
-    181:182:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):286:287 -> a
-    181:182:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    183:186:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721:724 -> a
-    187:204:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):723:740 -> a
-    205:224:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):746:765 -> a
-    225:225:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    225:225:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):765 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    226:226:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    164:164:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
+    164:164:com.android.tools.r8.graph.DexCode parseCodeItem():987 -> a
+    164:164:void ensureCodesInited(int):169 -> a
+    164:164:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):710 -> a
+    165:170:com.android.tools.r8.graph.DexCode parseCodeItem():988:993 -> a
+    165:170:void ensureCodesInited(int):169 -> a
+    165:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):710 -> a
+    171:172:void ensureCodesInited(int):170:171 -> a
+    171:172:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):710 -> a
+    173:181:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):711:719 -> a
+    182:183:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):286:287 -> a
+    182:183:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    184:187:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721:724 -> a
+    188:205:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):723:740 -> a
+    206:225:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):746:765 -> a
+    226:226:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
     226:226:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):765 -> a
-    227:229:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):767:769 -> a
-    230:230:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    230:230:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):769 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    231:233:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):769:771 -> a
-    234:234:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    234:234:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):771 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    235:273:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):771:809 -> a
-    274:274:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    274:274:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):809 -> a
-    275:275:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):810:810 -> a
-    276:276:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    276:276:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):810 -> a
-    277:277:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):811:811 -> a
-    278:278:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    278:278:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):811 -> a
-    279:279:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):812:812 -> a
-    280:280:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    280:280:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):812 -> a
-    281:283:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):814:814 -> a
-    285:326:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):816:857 -> a
-    327:348:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):839:860 -> a
-    349:349:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787:787 -> a
-    350:350:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1140,"2":1141,"3":1142}}
-    1140:1140:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787:787 -> a
+    227:227:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    227:227:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):765 -> a
+    228:230:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):767:769 -> a
+    231:231:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
+    231:231:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):769 -> a
+    232:234:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):769:771 -> a
+    235:235:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
+    235:235:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):771 -> a
+    236:274:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):771:809 -> a
+    275:275:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    275:275:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):809 -> a
+    276:276:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):810:810 -> a
+    277:277:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    277:277:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):810 -> a
+    278:278:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):811:811 -> a
+    279:279:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    279:279:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):811 -> a
+    280:280:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):812:812 -> a
+    281:281:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    281:281:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):812 -> a
+    282:284:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):814:814 -> a
+    286:327:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):816:857 -> a
+    328:349:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):839:860 -> a
+    350:350:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787:787 -> a
+    351:351:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1141,"2":1142,"3":1143}}
     1141:1141:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787:787 -> a
     1142:1142:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787:787 -> a
-    1137:1137:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787:787 -> a
-    1138:1138:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    1138:1138:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    1138:1138:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787 -> a
-    1139:1139:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787:787 -> a
-    1143:1143:long lambda$addClassDefsTo$0(java.lang.Long,com.android.tools.r8.graph.DexProgramClass):836:836 -> a
+    1143:1143:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787:787 -> a
+    1138:1138:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787:787 -> a
+    1139:1139:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    1139:1139:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    1139:1139:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787 -> a
+    1140:1140:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):787:787 -> a
+    1144:1144:long lambda$addClassDefsTo$0(java.lang.Long,com.android.tools.r8.graph.DexProgramClass):836:836 -> a
     1:2:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():464:465 -> b
     3:3:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> b
     3:3:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():465 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
     4:4:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():465 -> b
     5:13:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():467:475 -> b
@@ -20207,7 +20132,6 @@
     6:15:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():530:539 -> e
     16:17:int com.android.tools.r8.dex.BinaryReader.getUbyte():101:102 -> e
     16:17:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():539 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:18:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():606:606 -> e
     19:22:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():597:600 -> e
     23:23:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():592:592 -> e
@@ -20241,7 +20165,6 @@
     126:126:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():541:541 -> e
     127:128:int com.android.tools.r8.dex.BinaryReader.getUbyte():101:102 -> e
     127:128:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():541 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     129:130:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():620:621 -> e
     1:1:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():316:316 -> f
     2:2:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> f
@@ -20268,7 +20191,6 @@
     4:4:com.android.tools.r8.graph.DexValue parseEncodedValue():191:191 -> h
     5:5:byte com.android.tools.r8.dex.BinaryReader.get():97:97 -> h
     5:5:com.android.tools.r8.graph.DexValue parseEncodedValue():191 -> h
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.graph.DexValue parseEncodedValue():194:194 -> h
     7:7:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):95:95 -> h
     7:7:com.android.tools.r8.graph.DexValue parseEncodedValue():194 -> h
@@ -20371,32 +20293,28 @@
     1:1:com.android.tools.r8.dex.DexSection[] parseMap():888:888 -> i
     2:3:int com.android.tools.r8.dex.BinaryReader.getUint(int):72:73 -> i
     2:3:com.android.tools.r8.dex.DexSection[] parseMap():888 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:12:com.android.tools.r8.dex.DexSection[] parseMap():889:897 -> i
     13:13:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
     13:13:com.android.tools.r8.dex.DexSection[] parseMap():897 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:com.android.tools.r8.dex.DexSection[] parseMap():910:910 -> i
     15:15:com.android.tools.r8.dex.DexSection[] parseMap():898:898 -> i
     16:16:com.android.tools.r8.dex.DexSection[] parseMap():0:0 -> i
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":942,"2":943,"3":944}}
-    942:942:com.android.tools.r8.dex.DexSection[] parseMap():898:898 -> i
-    943:943:com.android.tools.r8.dex.DexSection[] parseMap():898:898 -> i
-    944:944:com.android.tools.r8.dex.DexSection[] parseMap():898:898 -> i
-    917:917:com.android.tools.r8.dex.DexSection[] parseMap():901:901 -> i
-    918:918:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
-    918:918:com.android.tools.r8.dex.DexSection[] parseMap():907 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    919:919:com.android.tools.r8.dex.DexSection[] parseMap():907:907 -> i
-    920:920:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> i
-    920:920:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> i
-    920:920:com.android.tools.r8.dex.DexSection[] parseMap():907 -> i
-    921:931:com.android.tools.r8.dex.DexSection[] parseMap():907:917 -> i
-    932:939:com.android.tools.r8.dex.DexSection[] parseMap():916:923 -> i
-    940:940:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
-    940:940:com.android.tools.r8.dex.DexSection[] parseMap():923 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    941:941:com.android.tools.r8.dex.DexSection[] parseMap():923:923 -> i
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":948,"2":949,"3":950}}
+    948:948:com.android.tools.r8.dex.DexSection[] parseMap():898:898 -> i
+    949:949:com.android.tools.r8.dex.DexSection[] parseMap():898:898 -> i
+    950:950:com.android.tools.r8.dex.DexSection[] parseMap():898:898 -> i
+    917:923:com.android.tools.r8.dex.DexSection[] parseMap():901:907 -> i
+    924:924:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
+    924:924:com.android.tools.r8.dex.DexSection[] parseMap():907 -> i
+    925:925:com.android.tools.r8.dex.DexSection[] parseMap():907:907 -> i
+    926:926:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> i
+    926:926:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> i
+    926:926:com.android.tools.r8.dex.DexSection[] parseMap():907 -> i
+    927:937:com.android.tools.r8.dex.DexSection[] parseMap():907:917 -> i
+    938:945:com.android.tools.r8.dex.DexSection[] parseMap():916:923 -> i
+    946:946:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
+    946:946:com.android.tools.r8.dex.DexSection[] parseMap():923 -> i
+    947:947:com.android.tools.r8.dex.DexSection[] parseMap():923:923 -> i
     1:8:void parseStringIDs():865:872 -> j
     1:5:com.android.tools.r8.graph.DexTypeList parseTypeList():176:180 -> k
     1:3:void populateStrings():1009:1011 -> l
@@ -20437,7 +20355,6 @@
     52:57:void populateIndexTables():1000 -> l
     58:59:int com.android.tools.r8.dex.BinaryReader.getUint(int):72:73 -> l
     58:59:com.android.tools.r8.graph.DexType typeAt(int):1256 -> l
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     58:59:void populateTypes():1037 -> l
     58:59:void populateIndexTables():1000 -> l
     60:60:com.android.tools.r8.graph.DexType typeAt(int):1257:1257 -> l
@@ -20516,38 +20433,36 @@
     277:277:void populateIndexTables():1004 -> l
     278:281:void populateCallSites():1024:1027 -> l
     278:281:void populateIndexTables():1005 -> l
-    282:286:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1313:1317 -> l
-    282:286:void populateCallSites():1027 -> l
-    282:286:void populateIndexTables():1005 -> l
-    287:288:int com.android.tools.r8.dex.BinaryReader.getUint(int):72:73 -> l
-    287:288:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1318 -> l
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    287:288:void populateCallSites():1027 -> l
-    287:288:void populateIndexTables():1005 -> l
-    289:291:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1319:1321 -> l
-    289:291:void populateCallSites():1027 -> l
-    289:291:void populateIndexTables():1005 -> l
-    292:292:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> l
-    292:292:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1321 -> l
-    292:292:void populateCallSites():1027 -> l
-    292:292:void populateIndexTables():1005 -> l
-    293:295:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1321:1323 -> l
-    293:295:void populateCallSites():1027 -> l
-    293:295:void populateIndexTables():1005 -> l
-    296:296:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> l
-    296:296:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1323 -> l
-    296:296:void populateCallSites():1027 -> l
-    296:296:void populateIndexTables():1005 -> l
-    297:304:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1323:1330 -> l
-    297:304:void populateCallSites():1027 -> l
-    297:304:void populateIndexTables():1005 -> l
-    305:305:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1325:1325 -> l
-    305:305:void populateCallSites():1027 -> l
-    305:305:void populateIndexTables():1005 -> l
-    306:306:void populateCallSites():1027:1027 -> l
+    282:287:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1313:1318 -> l
+    282:287:void populateCallSites():1027 -> l
+    282:287:void populateIndexTables():1005 -> l
+    288:289:int com.android.tools.r8.dex.BinaryReader.getUint(int):72:73 -> l
+    288:289:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1318 -> l
+    288:289:void populateCallSites():1027 -> l
+    288:289:void populateIndexTables():1005 -> l
+    290:292:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1319:1321 -> l
+    290:292:void populateCallSites():1027 -> l
+    290:292:void populateIndexTables():1005 -> l
+    293:293:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> l
+    293:293:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1321 -> l
+    293:293:void populateCallSites():1027 -> l
+    293:293:void populateIndexTables():1005 -> l
+    294:296:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1321:1323 -> l
+    294:296:void populateCallSites():1027 -> l
+    294:296:void populateIndexTables():1005 -> l
+    297:297:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> l
+    297:297:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1323 -> l
+    297:297:void populateCallSites():1027 -> l
+    297:297:void populateIndexTables():1005 -> l
+    298:305:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1323:1330 -> l
+    298:305:void populateCallSites():1027 -> l
+    298:305:void populateIndexTables():1005 -> l
+    306:306:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1325:1325 -> l
+    306:306:void populateCallSites():1027 -> l
     306:306:void populateIndexTables():1005 -> l
-com.android.tools.r8.dex.DexParser$1 -> com.android.tools.r8.dex.f:
-com.android.tools.r8.dex.DexParser$AnnotationsDirectory -> com.android.tools.r8.dex.g:
+    307:307:void populateCallSites():1027:1027 -> l
+    307:307:void populateIndexTables():1005 -> l
+com.android.tools.r8.dex.DexParser$AnnotationsDirectory -> com.android.tools.r8.dex.f:
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] NO_METHOD_ANNOTATIONS -> g
     com.android.tools.r8.dex.DexParser$AnnotationsDirectory THE_EMPTY_ANNOTATIONS_DIRECTORY -> h
     com.android.tools.r8.graph.DexAnnotationSet clazz -> a
@@ -20559,7 +20474,7 @@
     1:11:void <clinit>():1367:1377 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1389:1393 -> <init>
     1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1397:1397 -> a
-com.android.tools.r8.dex.DexParser$AttributesAndAnnotations -> com.android.tools.r8.dex.h:
+com.android.tools.r8.dex.DexParser$AttributesAndAnnotations -> com.android.tools.r8.dex.g:
     com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMethodAttribute -> b
     java.util.List lazyAnnotations -> d
     com.android.tools.r8.graph.DexAnnotationSet originalAnnotations -> a
@@ -20578,7 +20493,7 @@
     12:13:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1529:1530 -> a
     1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1424:1424 -> b
     1:1:java.util.List getInnerClasses():1420:1420 -> c
-com.android.tools.r8.dex.DexParser$MemberAnnotationIterator -> com.android.tools.r8.dex.i:
+com.android.tools.r8.dex.DexParser$MemberAnnotationIterator -> com.android.tools.r8.dex.h:
     java.util.function.Supplier emptyValue -> c
     com.android.tools.r8.graph.DexMemberAnnotation[] annotations -> b
     int index -> a
@@ -20587,7 +20502,7 @@
     3:10:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):626:633 -> <init>
     1:7:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.DexMember):643:649 -> a
     8:8:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.DexMember):647:647 -> a
-com.android.tools.r8.dex.DexReader -> com.android.tools.r8.dex.k:
+com.android.tools.r8.dex.DexReader -> com.android.tools.r8.dex.j:
     com.android.tools.r8.utils.DexVersion version -> d
     1:2:void <init>(com.android.tools.r8.ProgramResource):27:28 -> <init>
     3:4:void <init>(com.android.tools.r8.origin.Origin,byte[]):37:38 -> <init>
@@ -20612,7 +20527,7 @@
     8:8:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> g
     8:8:void setByteOrder():98 -> g
     9:9:void setByteOrder():98:98 -> g
-com.android.tools.r8.dex.DexSection -> com.android.tools.r8.dex.l:
+com.android.tools.r8.dex.DexSection -> com.android.tools.r8.dex.k:
     boolean $assertionsDisabled -> e
     int end -> d
     int length -> b
@@ -20645,7 +20560,7 @@
     2:2:java.lang.String typeName():33:33 -> toString
     2:2:java.lang.String toString():83 -> toString
     3:3:java.lang.String toString():83:83 -> toString
-com.android.tools.r8.dex.FileWriter -> com.android.tools.r8.internal.tk:
+com.android.tools.r8.dex.FileWriter -> com.android.tools.r8.internal.Yj:
     com.android.tools.r8.graph.GraphLens graphLens -> d
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     com.android.tools.r8.graph.DexApplication application -> b
@@ -20819,7 +20734,6 @@
     908:908:void writeCallSite(com.android.tools.r8.graph.DexCallSite):721:721 -> a
     909:909:boolean com.android.tools.r8.dex.DexOutputBuffer.isAligned(int):163:163 -> a
     909:909:void writeCallSite(com.android.tools.r8.graph.DexCallSite):721 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     910:911:void writeCallSite(com.android.tools.r8.graph.DexCallSite):721:722 -> a
     912:912:void com.android.tools.r8.dex.FileWriter.checkThatInvokeCustomIsAllowed():1385:1385 -> a
     912:912:void writeCallSite(com.android.tools.r8.graph.DexCallSite):720 -> a
@@ -20829,7 +20743,6 @@
     920:926:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):698:704 -> a
     927:927:boolean com.android.tools.r8.dex.DexOutputBuffer.isAligned(int):163:163 -> a
     927:927:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):704 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     928:930:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):704:706 -> a
     931:931:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
     931:931:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):708 -> a
@@ -20849,7 +20762,7 @@
     23:30:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():171 -> b
     31:32:boolean com.android.tools.r8.dex.FileWriter.verifyNames():320:321 -> b
     31:32:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():171 -> b
-    33:33:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):209:209 -> b
+    33:33:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):222:222 -> b
     33:33:boolean com.android.tools.r8.dex.FileWriter.verifyNames():321 -> b
     33:33:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():171 -> b
     34:41:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():173:180 -> b
@@ -20868,7 +20781,6 @@
     79:83:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():196:200 -> b
     84:84:boolean com.android.tools.r8.dex.DexOutputBuffer.isAligned(int):163:163 -> b
     84:84:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     85:91:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200:206 -> b
     92:92:void com.android.tools.r8.dex.FileWriter.writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):380:380 -> b
     92:92:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
@@ -20948,7 +20860,6 @@
     268:268:void writeClassData(com.android.tools.r8.graph.DexProgramClass):670:670 -> b
     269:269:boolean com.android.tools.r8.graph.DexProgramClass.hasMethodsOrFields():601:601 -> b
     269:269:void writeClassData(com.android.tools.r8.graph.DexProgramClass):670 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     270:272:void writeClassData(com.android.tools.r8.graph.DexProgramClass):670:672 -> b
     273:273:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):79:79 -> b
     273:273:void writeClassData(com.android.tools.r8.graph.DexProgramClass):672 -> b
@@ -20971,13 +20882,12 @@
     33:33:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):478:478 -> c
     34:36:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):477:479 -> c
     37:37:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):623:623 -> c
-com.android.tools.r8.dex.FileWriter$1 -> com.android.tools.r8.internal.ok:
-com.android.tools.r8.dex.FileWriter$ByteBufferResult -> com.android.tools.r8.internal.pk:
+com.android.tools.r8.dex.FileWriter$ByteBufferResult -> com.android.tools.r8.internal.Uj:
     com.android.tools.r8.dex.CompatByteBuffer buffer -> a
     int length -> b
     1:1:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int,com.android.tools.r8.dex.FileWriter$1):87:87 -> <init>
     2:4:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int):93:95 -> <init>
-com.android.tools.r8.dex.FileWriter$Layout -> com.android.tools.r8.internal.qk:
+com.android.tools.r8.dex.FileWriter$Layout -> com.android.tools.r8.internal.Vj:
     int annotationSetsOffset -> n
     int annotationSetRefListsOffset -> o
     int stringDataOffsets -> l
@@ -21032,7 +20942,7 @@
     3:4:void setStringDataOffsets(int):974:975 -> l
     1:2:int getTypeListsOffset():959:960 -> m
     3:4:void setTypeListsOffset(int):964:965 -> m
-com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.internal.rk:
+com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.internal.Wj:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap debugInfos -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap typeLists -> c
@@ -21051,38 +20961,41 @@
     2:2:void <init>(com.android.tools.r8.utils.InternalOptions):1100:1100 -> <init>
     3:33:void <init>(com.android.tools.r8.utils.InternalOptions):1071:1101 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1066:1066 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1089:1090 -> a
-    4:5:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1105:1106 -> a
-    6:6:boolean add(com.android.tools.r8.graph.DexProgramClass):1122:1122 -> a
-    7:7:boolean add(com.android.tools.r8.graph.DexEncodedArray):1127:1127 -> a
-    8:11:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1134:1137 -> a
-    12:12:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode):1147:1147 -> a
-    13:14:boolean com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1113:1114 -> a
-    13:14:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode):1147 -> a
-    15:15:boolean add(com.android.tools.r8.graph.DexDebugInfoForWriting):1152:1152 -> a
-    16:19:boolean add(com.android.tools.r8.graph.DexTypeList):1157:1160 -> a
-    20:23:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1165:1168 -> a
-    24:24:boolean add(com.android.tools.r8.graph.DexAnnotation):1173:1173 -> a
-    25:27:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1179:1181 -> a
-    28:28:boolean add(com.android.tools.r8.graph.DexString):1185:1185 -> a
-    29:30:boolean com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1113:1114 -> a
-    29:30:boolean add(com.android.tools.r8.graph.DexString):1185 -> a
-    31:32:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1232:1233 -> a
-    33:34:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1304:1305 -> a
-    35:35:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfoForWriting,int):1314:1314 -> a
-    36:36:void setOffsetFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode,int):1318:1318 -> a
-    37:38:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1309:1310 -> a
-    37:38:void setOffsetFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode,int):1318 -> a
-    39:40:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1322:1323 -> a
-    41:41:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1327:1327 -> a
-    42:43:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1309:1310 -> a
-    42:43:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1327 -> a
-    44:44:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1331:1331 -> a
-    45:46:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1337:1338 -> a
-    47:47:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1342:1342 -> a
-    48:48:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1346:1346 -> a
-    49:49:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1350:1350 -> a
-    50:51:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1354:1355 -> a
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1089:1089 -> a
+    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.<init>():176:176 -> a
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1089 -> a
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1090:1090 -> a
+    5:6:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1105:1106 -> a
+    7:7:boolean add(com.android.tools.r8.graph.DexProgramClass):1122:1122 -> a
+    8:8:boolean add(com.android.tools.r8.graph.DexEncodedArray):1127:1127 -> a
+    9:12:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1134:1137 -> a
+    13:13:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode):1147:1147 -> a
+    14:15:boolean com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1113:1114 -> a
+    14:15:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode):1147 -> a
+    16:16:boolean add(com.android.tools.r8.graph.DexDebugInfoForWriting):1152:1152 -> a
+    17:20:boolean add(com.android.tools.r8.graph.DexTypeList):1157:1160 -> a
+    21:24:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1165:1168 -> a
+    25:25:boolean add(com.android.tools.r8.graph.DexAnnotation):1173:1173 -> a
+    26:28:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1179:1181 -> a
+    29:29:boolean add(com.android.tools.r8.graph.DexString):1185:1185 -> a
+    30:31:boolean com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1113:1114 -> a
+    30:31:boolean add(com.android.tools.r8.graph.DexString):1185 -> a
+    32:33:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1232:1233 -> a
+    34:35:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1304:1305 -> a
+    36:36:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfoForWriting,int):1314:1314 -> a
+    37:37:void setOffsetFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode,int):1318:1318 -> a
+    38:39:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1309:1310 -> a
+    38:39:void setOffsetFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode,int):1318 -> a
+    40:41:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1322:1323 -> a
+    42:42:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1327:1327 -> a
+    43:44:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1309:1310 -> a
+    43:44:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1327 -> a
+    45:45:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1331:1331 -> a
+    46:47:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1337:1338 -> a
+    48:48:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1342:1342 -> a
+    49:49:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1346:1346 -> a
+    50:50:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1350:1350 -> a
+    51:52:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1354:1355 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1095:1095 -> b
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.<init>():176:176 -> b
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1095 -> b
@@ -21101,7 +21014,6 @@
     1:1:java.util.Collection getAnnotationDirectories():1221:1221 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> c
     2:2:java.util.Collection getAnnotationDirectories():1221 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:7:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1271:1275 -> c
     8:8:int getOffsetFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode):1300:1300 -> c
     9:10:int com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1241:1242 -> c
@@ -21109,46 +21021,37 @@
     1:1:java.util.Collection getAnnotationSetRefLists():1213:1213 -> d
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> d
     2:2:java.util.Collection getAnnotationSetRefLists():1213 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.util.Collection getAnnotationSets():1209:1209 -> e
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> e
     2:2:java.util.Collection getAnnotationSets():1209 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.util.Collection getAnnotations():1205:1205 -> f
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> f
     2:2:java.util.Collection getAnnotations():1205 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.util.Collection getClassesWithData():1217:1217 -> g
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> g
     2:2:java.util.Collection getClassesWithData():1217 -> g
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.util.Collection getCodes():1189:1189 -> h
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.keySet():87:87 -> h
     2:2:java.util.Collection getCodes():1189 -> h
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.util.Collection getDebugInfos():1193:1193 -> i
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> i
     2:2:java.util.Collection getDebugInfos():1193 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.util.Collection getEncodedArrays():1225:1225 -> j
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> j
     2:2:java.util.Collection getEncodedArrays():1225 -> j
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.util.Collection getStringData():1201:1201 -> k
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.keySet():87:87 -> k
     2:2:java.util.Collection getStringData():1201 -> k
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.util.Collection getTypeLists():1197:1197 -> l
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> l
     2:2:java.util.Collection getTypeLists():1197 -> l
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.android.tools.r8.internal.sk:
+com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.android.tools.r8.internal.Xj:
     java.util.Set includedClasses -> c
     com.android.tools.r8.dex.FileWriter this$0 -> d
     1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1363:1364 -> <init>
     3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1361:1365 -> <init>
     1:4:void visit(com.android.tools.r8.graph.DexClass):1376:1379 -> b
-com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.Zo:
+com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.Do:
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
@@ -21161,7 +21064,7 @@
     boolean addField(com.android.tools.r8.graph.DexField) -> b
     boolean addMethod(com.android.tools.r8.graph.DexMethod) -> b
     boolean addType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.dex.InheritanceClassInDexDistributor -> com.android.tools.r8.internal.gp:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor -> com.android.tools.r8.internal.Ko:
     java.util.Comparator DEX_PROGRAM_CLASS_COMPARATOR -> l
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.InitClassLens initClassLens -> i
@@ -21232,50 +21135,35 @@
     585:599:void updateGroupsNumberOfIds(java.util.List):549:563 -> a
     600:600:void updateGroupsNumberOfIds(java.util.List):558:558 -> a
     601:614:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):573:586 -> a
-    615:615:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    615:615:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
+    615:615:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
     615:615:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):586 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    616:616:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    616:616:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    616:616:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     616:616:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):586 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    617:617:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    617:617:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):586 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    618:620:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):586:588 -> a
+    617:619:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):586:588 -> a
+    620:620:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
+    620:620:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    620:620:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588 -> a
     621:621:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     621:621:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    622:622:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    622:622:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
-    622:622:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    623:623:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    623:623:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    624:629:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588:593 -> a
-    630:634:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):602:606 -> a
-    635:635:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
-    635:635:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):608 -> a
-    636:637:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):609:610 -> a
-    638:638:void com.android.tools.r8.dex.InheritanceClassInDexDistributor.markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> a
-    638:638:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):611 -> a
-    639:645:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):613:619 -> a
-    646:646:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):618:618 -> a
-    647:648:java.util.List com.android.tools.r8.dex.InheritanceClassInDexDistributor.getSortedCopy(java.util.Collection):693:694 -> a
-    647:648:java.util.List access$400(java.util.Collection):45 -> a
-    649:649:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713:713 -> a
-    650:650:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    650:650:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    651:651:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    651:651:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
-    651:651:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    652:652:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    652:652:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    653:659:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):714:720 -> a
+    622:627:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588:593 -> a
+    628:632:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):602:606 -> a
+    633:633:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
+    633:633:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):608 -> a
+    634:635:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):609:610 -> a
+    636:636:void com.android.tools.r8.dex.InheritanceClassInDexDistributor.markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> a
+    636:636:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):611 -> a
+    637:643:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):613:619 -> a
+    644:644:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):618:618 -> a
+    645:646:java.util.List com.android.tools.r8.dex.InheritanceClassInDexDistributor.getSortedCopy(java.util.Collection):693:694 -> a
+    645:646:java.util.List access$400(java.util.Collection):45 -> a
+    647:647:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713:713 -> a
+    648:648:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
+    648:648:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    648:648:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713 -> a
+    649:649:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    649:649:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713 -> a
+    650:656:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):714:720 -> a
     1:1:com.android.tools.r8.graph.GraphLens access$100(com.android.tools.r8.dex.InheritanceClassInDexDistributor):45:45 -> b
     2:2:boolean lambda$assignGroup$2(java.util.List,com.android.tools.r8.dex.VirtualFile):402:402 -> b
     3:3:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.isDexFull(com.android.tools.r8.dex.VirtualFile):731:731 -> b
@@ -21303,58 +21191,52 @@
     79:79:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):639:639 -> b
     80:80:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):671:671 -> b
     80:80:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
-    81:81:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> b
+    81:81:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> b
+    81:81:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> b
     81:81:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):671 -> b
     81:81:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
-    82:82:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> b
-    82:82:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> b
+    82:82:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> b
     82:82:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):671 -> b
     82:82:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
-    83:83:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> b
-    83:83:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):671 -> b
-    83:83:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
-    84:88:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):671:675 -> b
-    84:88:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
+    83:87:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):671:675 -> b
+    83:87:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
+    88:88:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> b
+    88:88:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> b
+    88:88:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):675 -> b
+    88:88:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
     89:89:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> b
     89:89:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):675 -> b
     89:89:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
-    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> b
-    90:90:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> b
-    90:90:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):675 -> b
+    90:90:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):675:675 -> b
     90:90:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
-    91:91:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> b
-    91:91:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):675 -> b
-    91:91:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
-    92:92:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):675:675 -> b
-    92:92:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
-    93:93:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):643:643 -> b
-    94:94:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> b
-    94:94:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):644 -> b
-    95:103:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):645:653 -> b
-    104:104:void com.android.tools.r8.dex.InheritanceClassInDexDistributor.markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> b
-    104:104:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):654 -> b
-    105:105:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
-    106:106:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":796,"2":797,"3":798}}
+    91:91:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):643:643 -> b
+    92:92:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> b
+    92:92:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):644 -> b
+    93:101:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):645:653 -> b
+    102:102:void com.android.tools.r8.dex.InheritanceClassInDexDistributor.markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> b
+    102:102:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):654 -> b
+    103:103:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
+    104:104:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":794,"2":795,"3":796}}
+    794:794:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
+    795:795:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
     796:796:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
-    797:797:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
-    798:798:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
-    754:754:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
-    755:755:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> b
+    752:752:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
+    753:753:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> b
+    753:753:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649 -> b
+    754:754:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649:649 -> b
+    755:755:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
     755:755:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649 -> b
-    756:756:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649:649 -> b
-    757:757:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    757:757:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649 -> b
-    758:758:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
-    758:758:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    758:758:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649 -> b
-    759:769:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649:659 -> b
-    770:794:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):641:665 -> b
-    795:795:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):664:664 -> b
+    756:756:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
+    756:756:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
+    756:756:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649 -> b
+    757:767:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649:659 -> b
+    768:792:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):641:665 -> b
+    793:793:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):664:664 -> b
     1:1:com.android.tools.r8.graph.InitClassLens access$200(com.android.tools.r8.dex.InheritanceClassInDexDistributor):45:45 -> c
     1:1:com.android.tools.r8.naming.NamingLens access$300(com.android.tools.r8.dex.InheritanceClassInDexDistributor):45:45 -> d
     1:1:com.android.tools.r8.dex.VirtualFile access$600(com.android.tools.r8.dex.InheritanceClassInDexDistributor):45:45 -> e
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$CategorizedInheritanceGroupWithMainDexDependency -> com.android.tools.r8.internal.dp:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$CategorizedInheritanceGroupWithMainDexDependency -> com.android.tools.r8.internal.Ho:
     com.android.tools.r8.dex.InheritanceClassInDexDistributor this$0 -> d
     java.util.Set dependentsOfMainDexIndependents -> c
     boolean $assertionsDisabled -> e
@@ -21365,52 +21247,32 @@
     2:30:void <init>(com.android.tools.r8.dex.InheritanceClassInDexDistributor,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):129:157 -> <init>
     31:31:void <init>(com.android.tools.r8.dex.InheritanceClassInDexDistributor,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):154:154 -> <init>
     1:12:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):168:179 -> a
-    13:13:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
+    13:13:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
     13:13:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):179 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    14:14:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    14:14:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     14:14:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):179 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    15:15:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    15:15:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):179 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:22:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):178:184 -> a
+    15:21:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):178:184 -> a
+    22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
+    22:22:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    22:22:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):184 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     23:23:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):184 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    24:24:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
-    24:24:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):184 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    25:25:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    25:25:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):184 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    26:37:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):183:194 -> a
-    38:51:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):205:218 -> a
-    52:52:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    52:52:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):218 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    53:53:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
-    53:53:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):218 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    54:54:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    54:54:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):218 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    55:59:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):218:222 -> a
-    60:60:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    60:60:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):222 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    61:61:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
-    61:61:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):222 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    62:62:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    62:62:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):222 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    63:73:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):222:232 -> a
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup -> com.android.tools.r8.internal.ep:
+    24:35:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):183:194 -> a
+    36:49:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):205:218 -> a
+    50:50:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
+    50:50:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    50:50:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):218 -> a
+    51:51:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    51:51:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):218 -> a
+    52:56:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):218:222 -> a
+    57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
+    57:57:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    57:57:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):222 -> a
+    58:58:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    58:58:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):222 -> a
+    59:69:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):222:232 -> a
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup -> com.android.tools.r8.internal.Io:
     com.android.tools.r8.dex.InheritanceClassInDexDistributor this$0 -> f
     boolean dependsOnMainDexClasses -> e
     int numberOfMethodIds -> d
@@ -21430,26 +21292,22 @@
     12:25:int compareTo(java.lang.Object):56 -> compareTo
     26:29:int com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup.compareTo(com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):109:112 -> compareTo
     26:29:int compareTo(java.lang.Object):56 -> compareTo
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo -> com.android.tools.r8.internal.fp:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo -> com.android.tools.r8.internal.Jo:
     java.util.Map directSubClasses -> a
     java.util.Set classes -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():243:243 -> <clinit>
     1:11:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):248:258 -> <init>
-    1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    1:1:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):272 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
-    2:2:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):272 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    3:3:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):272 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:7:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):274:277 -> a
-    8:9:java.util.Collection getDirectSubClasses(com.android.tools.r8.graph.DexProgramClass):262:263 -> a
+    1:2:java.util.Collection getDirectSubClasses(com.android.tools.r8.graph.DexProgramClass):262:263 -> a
+    3:3:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):272:272 -> a
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
+    4:4:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    4:4:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):272 -> a
+    5:5:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    5:5:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):272 -> a
+    6:9:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):274:277 -> a
     1:1:java.util.Collection lambda$addDirectSubClass$0(com.android.tools.r8.graph.DexProgramClass):276:276 -> b
-com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.ew:
+com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.xv:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.DexString firstJumboString -> b
     java.util.Map instructionTargets -> d
@@ -21517,10 +21375,10 @@
     380:411:com.android.tools.r8.graph.DexCode rewrite():123 -> a
     412:424:com.android.tools.r8.graph.DexCode rewrite():125:137 -> a
     com.android.tools.r8.code.Instruction lambda$replaceTarget$1(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction) -> b
-com.android.tools.r8.dex.JumboStringRewriter$1 -> com.android.tools.r8.internal.cw:
+com.android.tools.r8.dex.JumboStringRewriter$1 -> com.android.tools.r8.internal.vv:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():279:279 -> <clinit>
-com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.dw:
+com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.wv:
     com.android.tools.r8.code.Instruction start -> a
     com.android.tools.r8.code.Instruction end -> b
     boolean endsAfterLastInstruction -> c
@@ -21530,7 +21388,7 @@
     1:5:void replaceTarget(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction):73:77 -> a
     6:6:int getStartOffset():82:82 -> a
     1:4:int getStartToEndDelta():86:89 -> b
-com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.cE:
+com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.jD:
     com.android.tools.r8.dex.Marker$Tool tool -> b
     boolean $assertionsDisabled -> f
     java.lang.String D8_PREFIX -> c
@@ -21624,12 +21482,12 @@
     1:1:boolean isL8():132:132 -> n
     1:1:boolean isRelocator():136:136 -> o
     1:5:java.lang.String toString():274:278 -> toString
-com.android.tools.r8.dex.Marker$Backend$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.bE:
+com.android.tools.r8.dex.Marker$Backend$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.iD:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String name(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.cE$a:
+com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.jD$a:
     com.android.tools.r8.dex.Marker$Tool D8 -> b
     com.android.tools.r8.dex.Marker$Tool Relocator -> e
     com.android.tools.r8.dex.Marker$Tool L8 -> d
@@ -21637,7 +21495,7 @@
     1:4:void <clinit>():37:40 -> <clinit>
     1:1:void <init>(java.lang.String,int):36:36 -> <init>
     1:1:com.android.tools.r8.dex.Marker$Tool[] valuesR8andD8():43:43 -> a
-com.android.tools.r8.dex.MixedSectionCollection -> com.android.tools.r8.internal.MF:
+com.android.tools.r8.dex.MixedSectionCollection -> com.android.tools.r8.internal.JE:
     1:1:void <init>():27:27 -> <init>
     boolean add(com.android.tools.r8.graph.DexAnnotation) -> a
     boolean add(com.android.tools.r8.graph.DexAnnotationSet) -> a
@@ -21649,7 +21507,7 @@
     boolean add(com.android.tools.r8.graph.DexDebugInfoForWriting) -> a
     boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory) -> a
     1:1:void visit(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> b
-com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.CT:
+com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.eS:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> e
@@ -21690,31 +21548,31 @@
     1:1:com.android.tools.r8.graph.GraphLens access$100(com.android.tools.r8.dex.ResourceAdapter):32:32 -> b
     1:1:com.android.tools.r8.naming.NamingLens access$200(com.android.tools.r8.dex.ResourceAdapter):32:32 -> c
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.dex.ResourceAdapter):32:32 -> d
-com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.wT:
+com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.YR:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):420:420 -> <init>
     1:1:boolean isRenamingCandidate(int,int):425:425 -> b
-com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.xT:
+com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.ZR:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):452:452 -> <init>
     boolean isRenamingCandidate(int,int) -> b
-com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.yT:
+com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.aS:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):354:354 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean shouldRecordPrefix(char):369:369 -> a
     2:2:boolean handlePrefix(int,int):374:374 -> a
     char getClassNameSeparator() -> b
     1:2:boolean isRenamingCandidate(int,int):380:381 -> b
-com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.zT:
+com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.bS:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):391:391 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean shouldRecordPrefix(char):406:406 -> a
     2:5:boolean handlePrefix(int,int):411:414 -> a
     6:6:boolean handlePrefix(int,int):412:412 -> a
     char getClassNameSeparator() -> b
-com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.AT:
+com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.cS:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):431:431 -> <init>
     char getClassNameSeparator() -> b
     1:1:boolean isRenamingCandidate(int,int):446:446 -> b
-com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.BT:
+com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.dS:
     java.lang.StringBuilder result -> b
     java.lang.String contents -> a
     int outputFrom -> d
@@ -21742,7 +21600,7 @@
     15:16:boolean renameJavaPackageInRange(int,int):315:316 -> c
     1:7:boolean renameJavaTypeInRange(int,int):273:279 -> d
     8:12:boolean renameJavaTypeInRange(int,int):278:282 -> d
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> d
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> d
     13:13:boolean renameJavaTypeInRange(int,int):282 -> d
     14:20:boolean renameJavaTypeInRange(int,int):282:288 -> d
     21:21:void com.android.tools.r8.dex.ResourceAdapter$StringAdapter.outputRangeFromInput(int,int):334:334 -> d
@@ -21788,19 +21646,16 @@
     68:72:boolean run():183 -> d
     73:74:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.popInt():492:493 -> d
     73:74:void com.android.tools.r8.dex.ResourceAdapter$StringAdapter.handleJavaType():258 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     73:74:boolean run():183 -> d
     75:76:void com.android.tools.r8.dex.ResourceAdapter$StringAdapter.handleJavaType():259:260 -> d
     75:76:boolean run():183 -> d
     77:77:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.popInt():492:492 -> d
     77:77:void com.android.tools.r8.dex.ResourceAdapter$StringAdapter.handleJavaType():258 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     77:77:boolean run():183 -> d
     78:80:void com.android.tools.r8.dex.ResourceAdapter$StringAdapter.handleJavaType():264:266 -> d
     78:80:boolean run():183 -> d
     81:83:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.popInt():492:492 -> d
     81:83:void com.android.tools.r8.dex.ResourceAdapter$StringAdapter.handleJavaType():266 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     81:83:boolean run():183 -> d
     84:84:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof():343:343 -> d
     84:84:boolean run():184 -> d
@@ -21808,7 +21663,7 @@
     89:89:void com.android.tools.r8.dex.ResourceAdapter$StringAdapter.outputRangeFromInput(int,int):334:334 -> d
     89:89:boolean run():188 -> d
     90:93:boolean run():192:195 -> d
-com.android.tools.r8.dex.VDexParser -> com.android.tools.r8.dex.m:
+com.android.tools.r8.dex.VDexParser -> com.android.tools.r8.dex.l:
     java.util.List dexFiles -> b
     com.android.tools.r8.dex.VDexReader vDexReader -> a
     1:1:void <init>(com.android.tools.r8.dex.VDexReader):26:26 -> <init>
@@ -21817,7 +21672,6 @@
     1:10:void parseDexFiles():37:46 -> b
     11:12:int com.android.tools.r8.dex.BinaryReader.getUint(int):72:73 -> b
     11:12:void parseDexFiles():46 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:14:void parseDexFiles():47:48 -> b
     15:16:byte[] com.android.tools.r8.dex.BinaryReader.getByteArray(int):38:39 -> b
     15:16:void parseDexFiles():48 -> b
@@ -21828,7 +21682,7 @@
     24:24:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
     24:24:void parseDexFiles():53 -> b
     25:25:void parseDexFiles():53:53 -> b
-com.android.tools.r8.dex.VDexReader -> com.android.tools.r8.dex.n:
+com.android.tools.r8.dex.VDexReader -> com.android.tools.r8.dex.m:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():22:22 -> <clinit>
     1:4:void <init>(com.android.tools.r8.origin.Origin,java.io.InputStream):27:30 -> <init>
@@ -21863,7 +21717,7 @@
     15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> f
     15:15:void setByteOrder():87 -> f
     16:16:void setByteOrder():87:87 -> f
-com.android.tools.r8.dex.VirtualFile -> com.android.tools.r8.internal.k30:
+com.android.tools.r8.dex.VirtualFile -> com.android.tools.r8.internal.w10:
     com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection indexedItems -> b
     com.android.tools.r8.graph.ObjectToOffsetMapping objectMapping -> f
     boolean $assertionsDisabled -> g
@@ -21934,15 +21788,14 @@
     1:2:com.android.tools.r8.graph.ObjectToOffsetMapping getObjectMapping():215:216 -> j
     1:1:java.lang.String getPrimaryClassDescriptor():150:150 -> k
     1:1:boolean isEmpty():302:302 -> l
-com.android.tools.r8.dex.VirtualFile$1 -> com.android.tools.r8.internal.a30:
-com.android.tools.r8.dex.VirtualFile$Distributor -> com.android.tools.r8.internal.b30:
+com.android.tools.r8.dex.VirtualFile$Distributor -> com.android.tools.r8.internal.n10:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List virtualFiles -> c
     com.android.tools.r8.dex.ApplicationWriter writer -> b
     1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter):314:314 -> <init>
     2:6:void <init>(com.android.tools.r8.dex.ApplicationWriter):312:316 -> <init>
     java.util.List run() -> a
-com.android.tools.r8.dex.VirtualFile$DistributorBase -> com.android.tools.r8.internal.c30:
+com.android.tools.r8.dex.VirtualFile$DistributorBase -> com.android.tools.r8.internal.o10:
     com.android.tools.r8.dex.VirtualFile mainDexFile -> f
     java.util.Set classes -> d
     com.android.tools.r8.utils.InternalOptions options -> g
@@ -21967,7 +21820,7 @@
     499:521:int lambda$sortClassesByPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):442:464 -> a
     522:554:void addFeatureSplitFiles(java.util.Map,com.android.tools.r8.dex.VirtualFile$FillStrategy):501:533 -> a
     1:17:java.util.Map removeFeatureSplitClassesGetMapping():471:487 -> b
-com.android.tools.r8.dex.VirtualFile$FilePerInputClassDistributor -> com.android.tools.r8.internal.d30:
+com.android.tools.r8.dex.VirtualFile$FilePerInputClassDistributor -> com.android.tools.r8.internal.p10:
     boolean $assertionsDisabled -> e
     boolean combineSyntheticClassesWithPrimaryClass -> d
     1:1:void <clinit>():328:328 -> <clinit>
@@ -21980,7 +21833,7 @@
     10:10:java.util.List run():346 -> a
     11:11:java.util.List run():362:362 -> a
     12:40:java.util.List run():347:375 -> a
-com.android.tools.r8.dex.VirtualFile$FillFilesDistributor -> com.android.tools.r8.internal.e30:
+com.android.tools.r8.dex.VirtualFile$FillFilesDistributor -> com.android.tools.r8.internal.q10:
     com.android.tools.r8.dex.VirtualFile$FillStrategy fillStrategy -> i
     java.util.concurrent.ExecutorService executorService -> j
     boolean $assertionsDisabled -> k
@@ -21988,7 +21841,7 @@
     1:3:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):544:546 -> <init>
     1:58:java.util.List run():551:608 -> a
     1:1:int lambda$run$0(com.android.tools.r8.dex.VirtualFile):607:607 -> b
-com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction -> com.android.tools.r8.internal.f30:
+com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction -> com.android.tools.r8.internal.r10:
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils rewriter -> e
     boolean $assertionsDisabled -> n
     com.android.tools.r8.naming.NamingLens namingLens -> d
@@ -22025,7 +21878,7 @@
     3:3:boolean addField(com.android.tools.r8.graph.DexField):789:789 -> b
     4:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):794:794 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):809:809 -> b
-    6:6:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):209:209 -> b
+    6:6:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):222:222 -> b
     6:6:boolean addType(com.android.tools.r8.graph.DexType):809 -> b
     7:7:boolean addType(com.android.tools.r8.graph.DexType):810:810 -> b
     8:13:void abort():881:886 -> b
@@ -22034,13 +21887,13 @@
     1:1:int getNumberOfFields():858:858 -> e
     1:1:int getNumberOfMethods():850:850 -> f
     1:2:boolean isEmpty():890:891 -> g
-com.android.tools.r8.dex.VirtualFile$MonoDexDistributor -> com.android.tools.r8.internal.g30:
+com.android.tools.r8.dex.VirtualFile$MonoDexDistributor -> com.android.tools.r8.internal.s10:
     1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):614:614 -> <init>
     1:9:java.util.List run():620:628 -> a
     10:10:void com.android.tools.r8.dex.VirtualFile$DistributorBase.addFeatureSplitFiles(java.util.Map):495:495 -> a
     10:10:java.util.List run():630 -> a
     11:11:java.util.List run():633:633 -> a
-com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator -> com.android.tools.r8.internal.h30:
+com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator -> com.android.tools.r8.internal.t10:
     java.util.List classes -> a
     java.util.Map originalNames -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
@@ -22064,10 +21917,7 @@
     39:41:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
     39:41:java.util.Map call():1110 -> a
     42:42:java.util.Map call():0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1267,"2":1268,"3":1269,"4":1270,"5":1271}}
-    1267:1267:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):207:207 -> a
-    1267:1267:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
-    1267:1267:java.util.Map call():1110 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1268,"2":1269,"3":1270,"4":1271,"5":1272}}
     1268:1268:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):207:207 -> a
     1268:1268:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
     1268:1268:java.util.Map call():1110 -> a
@@ -22080,52 +21930,60 @@
     1271:1271:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):207:207 -> a
     1271:1271:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
     1271:1271:java.util.Map call():1110 -> a
+    1272:1272:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):207:207 -> a
+    1272:1272:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
+    1272:1272:java.util.Map call():1110 -> a
     1157:1196:java.util.Map call():1115:1154 -> a
     1197:1242:java.util.Map call():1118:1163 -> a
     1243:1247:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1178:1182 -> a
     1243:1247:java.util.Map call():1163 -> a
-    1248:1248:boolean com.android.tools.r8.dex.VirtualFile.isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):282:282 -> a
-    1248:1248:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):60 -> a
+    1248:1248:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):60:60 -> a
     1248:1248:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1182 -> a
     1248:1248:java.util.Map call():1163 -> a
-    1249:1251:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1203:1205 -> a
-    1249:1251:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1183 -> a
-    1249:1251:java.util.Map call():1163 -> a
-    1252:1252:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1185:1185 -> a
-    1252:1252:java.util.Map call():1163 -> a
-    1253:1253:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
-    1253:1253:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1186 -> a
+    1249:1249:boolean com.android.tools.r8.dex.VirtualFile.isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):282:282 -> a
+    1249:1249:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):60 -> a
+    1249:1249:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1182 -> a
+    1249:1249:java.util.Map call():1163 -> a
+    1250:1252:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1203:1205 -> a
+    1250:1252:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1183 -> a
+    1250:1252:java.util.Map call():1163 -> a
+    1253:1253:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1185:1185 -> a
     1253:1253:java.util.Map call():1163 -> a
-    1254:1254:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1188:1188 -> a
+    1254:1254:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
+    1254:1254:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1186 -> a
     1254:1254:java.util.Map call():1163 -> a
-    1255:1257:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1203:1205 -> a
-    1255:1257:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1189 -> a
-    1255:1257:java.util.Map call():1163 -> a
-    1258:1259:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1190:1191 -> a
-    1258:1259:java.util.Map call():1163 -> a
-    1260:1260:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
-    1260:1260:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1192 -> a
-    1260:1260:java.util.Map call():1163 -> a
-    1261:1261:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1193:1193 -> a
+    1255:1255:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1188:1188 -> a
+    1255:1255:java.util.Map call():1163 -> a
+    1256:1258:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1203:1205 -> a
+    1256:1258:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1189 -> a
+    1256:1258:java.util.Map call():1163 -> a
+    1259:1260:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1190:1191 -> a
+    1259:1260:java.util.Map call():1163 -> a
+    1261:1261:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
+    1261:1261:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1192 -> a
     1261:1261:java.util.Map call():1163 -> a
-    1262:1262:java.util.Map call():0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1272,"2":1273,"3":1274}}
-    1272:1272:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1193:1193 -> a
-    1272:1272:java.util.Map call():1163 -> a
+    1262:1262:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1193:1193 -> a
+    1262:1262:java.util.Map call():1163 -> a
+    1263:1263:java.util.Map call():0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1273,"2":1274,"3":1275}}
     1273:1273:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1193:1193 -> a
     1273:1273:java.util.Map call():1163 -> a
     1274:1274:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1193:1193 -> a
     1274:1274:java.util.Map call():1163 -> a
-    1263:1266:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1194:1197 -> a
-    1263:1266:java.util.Map call():1163 -> a
-    1275:1279:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1169:1173 -> a
-    1280:1280:boolean com.android.tools.r8.dex.VirtualFile.isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):282:282 -> a
-    1280:1280:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):60 -> a
-    1280:1280:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1173 -> a
-    1281:1281:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
+    1275:1275:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1193:1193 -> a
+    1275:1275:java.util.Map call():1163 -> a
+    1264:1267:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1194:1197 -> a
+    1264:1267:java.util.Map call():1163 -> a
+    1276:1280:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1169:1173 -> a
+    1281:1281:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):60:60 -> a
     1281:1281:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1173 -> a
+    1282:1282:boolean com.android.tools.r8.dex.VirtualFile.isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):282:282 -> a
+    1282:1282:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):60 -> a
+    1282:1282:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1173 -> a
+    1283:1283:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
+    1283:1283:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1173 -> a
     1:1:java.lang.Object call():1014:1014 -> call
-com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.internal.i30:
+com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.internal.u10:
     java.util.List files -> a
     com.android.tools.r8.FeatureSplit featuresplit -> i
     com.android.tools.r8.graph.AppView appView -> b
@@ -22149,7 +22007,7 @@
     1:1:com.android.tools.r8.dex.VirtualFile next():951:951 -> c
     1:2:void reset():942:943 -> d
     1:1:void restart():990:990 -> e
-com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection -> com.android.tools.r8.internal.j30:
+com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection -> com.android.tools.r8.internal.v10:
     java.util.Set methods -> g
     java.util.Set fields -> h
     java.util.Set strings -> i
@@ -22175,15 +22033,14 @@
     8:8:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):724:724 -> a
     9:11:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):729:731 -> a
     12:12:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):736:736 -> a
-    13:13:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
+    13:13:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
     13:13:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):736 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):736:736 -> a
     1:1:java.util.Set access$300(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):637:637 -> b
     2:2:boolean addField(com.android.tools.r8.graph.DexField):666:666 -> b
     3:3:boolean addMethod(com.android.tools.r8.graph.DexMethod):671:671 -> b
     4:4:boolean addType(com.android.tools.r8.graph.DexType):686:686 -> b
-    5:5:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):209:209 -> b
+    5:5:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):222:222 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):686 -> b
     6:6:boolean addType(com.android.tools.r8.graph.DexType):687:687 -> b
     7:7:int getNumberOfFields():705:705 -> b
@@ -22251,7 +22108,7 @@
     66:69:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):347:350 -> run
     66:69:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
     70:70:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):300:300 -> run
-com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar -> com.android.tools.r8.internal.dh:
+com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar -> com.android.tools.r8.internal.Lg:
     java.lang.String jar -> a
     java.lang.String outputName -> b
     1:3:void <init>(java.lang.String,java.lang.String):49:51 -> <init>
@@ -22278,10 +22135,10 @@
     2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):105:105 -> <init>
     3:18:void <init>(com.android.tools.r8.DiagnosticsHandler):91:106 -> <init>
     1:1:com.android.tools.r8.DiagnosticsHandler access$000(com.android.tools.r8.dexsplitter.DexSplitter$Options):89:89 -> a
-    2:2:void addFeatureJar(com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar):162:162 -> a
-    2:2:void access$300(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar):89 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableList getBaseJars():186:186 -> a
+    2:2:void access$300(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar):89:89 -> a
+    3:3:void addFeatureJar(com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar):162:162 -> a
+    3:3:void access$300(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar):89 -> a
+    4:4:com.android.tools.r8.com.google.common.collect.ImmutableList getBaseJars():186:186 -> a
     1:1:void addBaseJar(java.lang.String):158:158 -> addBaseJar
     1:1:void addFeatureJar(java.lang.String):166:166 -> addFeatureJar
     2:2:void addFeatureJar(java.lang.String,java.lang.String):170:170 -> addFeatureJar
@@ -22318,14 +22175,13 @@
     87:87:java.lang.String part():84:84 -> part
     88:88:java.lang.String part():84:84 -> part
     89:89:java.lang.String part():84:84 -> part
-com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl -> com.android.tools.r8.diagnostic.internal.b:
+com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl -> com.android.tools.r8.diagnostic.internal.a:
     com.android.tools.r8.references.ClassReference classReference -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,com.android.tools.r8.origin.Origin,com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl$1):11:11 -> <init>
     2:3:void <init>(com.android.tools.r8.references.ClassReference,com.android.tools.r8.origin.Origin):17:18 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl$Builder builder():22:22 -> a
     1:1:com.android.tools.r8.references.ClassReference getClassReference():27:27 -> getClassReference
-com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl$1 -> com.android.tools.r8.diagnostic.internal.a:
-com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl$Builder -> com.android.tools.r8.diagnostic.internal.b$a:
+com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl$Builder -> com.android.tools.r8.diagnostic.internal.a$a:
     com.android.tools.r8.references.ClassReference classReference -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():30:30 -> <clinit>
@@ -22341,11 +22197,11 @@
     3:3:boolean validate():55:55 -> c
     3:3:com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl build():48 -> c
     4:4:com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl build():49:49 -> c
-com.android.tools.r8.diagnostic.internal.DefinitionContextBase -> com.android.tools.r8.diagnostic.internal.d:
+com.android.tools.r8.diagnostic.internal.DefinitionContextBase -> com.android.tools.r8.diagnostic.internal.c:
     com.android.tools.r8.origin.Origin origin -> a
     1:2:void <init>(com.android.tools.r8.origin.Origin):14:15 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():20:20 -> getOrigin
-com.android.tools.r8.diagnostic.internal.DefinitionContextBase$Builder -> com.android.tools.r8.diagnostic.internal.c:
+com.android.tools.r8.diagnostic.internal.DefinitionContextBase$Builder -> com.android.tools.r8.diagnostic.internal.b:
     com.android.tools.r8.origin.Origin origin -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -22353,7 +22209,7 @@
     com.android.tools.r8.diagnostic.DefinitionContext build() -> a
     1:2:com.android.tools.r8.diagnostic.internal.DefinitionContextBase$Builder setOrigin(com.android.tools.r8.origin.Origin):28:29 -> a
     com.android.tools.r8.diagnostic.internal.DefinitionContextBase$Builder self() -> b
-com.android.tools.r8.diagnostic.internal.DefinitionContextUtils -> com.android.tools.r8.diagnostic.internal.e:
+com.android.tools.r8.diagnostic.internal.DefinitionContextUtils -> com.android.tools.r8.diagnostic.internal.d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:7:void accept(com.android.tools.r8.diagnostic.DefinitionContext,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):26:32 -> a
@@ -22366,14 +22222,13 @@
     36:36:java.lang.String lambda$toSourceString$0(com.android.tools.r8.diagnostic.DefinitionClassContext):75:75 -> a
     37:37:java.lang.String lambda$toSourceString$1(com.android.tools.r8.diagnostic.DefinitionFieldContext):76:76 -> a
     38:38:java.lang.String lambda$toSourceString$2(com.android.tools.r8.diagnostic.DefinitionMethodContext):77:77 -> a
-com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl -> com.android.tools.r8.diagnostic.internal.g:
+com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl -> com.android.tools.r8.diagnostic.internal.e:
     com.android.tools.r8.references.FieldReference fieldReference -> b
     1:1:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.origin.Origin,com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl$1):11:11 -> <init>
     2:3:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.origin.Origin):17:18 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl$Builder builder():22:22 -> a
     1:1:com.android.tools.r8.references.FieldReference getFieldReference():27:27 -> getFieldReference
-com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl$1 -> com.android.tools.r8.diagnostic.internal.f:
-com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl$Builder -> com.android.tools.r8.diagnostic.internal.g$a:
+com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl$Builder -> com.android.tools.r8.diagnostic.internal.e$a:
     com.android.tools.r8.references.FieldReference fieldReference -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():30:30 -> <clinit>
@@ -22389,14 +22244,13 @@
     3:3:boolean validate():55:55 -> c
     3:3:com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl build():48 -> c
     4:4:com.android.tools.r8.diagnostic.internal.DefinitionFieldContextImpl build():49:49 -> c
-com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl -> com.android.tools.r8.diagnostic.internal.i:
+com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl -> com.android.tools.r8.diagnostic.internal.f:
     com.android.tools.r8.references.MethodReference methodReference -> b
     1:1:void <init>(com.android.tools.r8.references.MethodReference,com.android.tools.r8.origin.Origin,com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl$1):11:11 -> <init>
     2:3:void <init>(com.android.tools.r8.references.MethodReference,com.android.tools.r8.origin.Origin):17:18 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl$Builder builder():22:22 -> a
     1:1:com.android.tools.r8.references.MethodReference getMethodReference():27:27 -> getMethodReference
-com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl$1 -> com.android.tools.r8.diagnostic.internal.h:
-com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl$Builder -> com.android.tools.r8.diagnostic.internal.i$a:
+com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl$Builder -> com.android.tools.r8.diagnostic.internal.f$a:
     com.android.tools.r8.references.MethodReference methodReference -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():30:30 -> <clinit>
@@ -22412,33 +22266,32 @@
     3:3:boolean validate():55:55 -> c
     3:3:com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl build():48 -> c
     4:4:com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl build():49:49 -> c
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.wF:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.xE:
     com.android.tools.r8.references.ClassReference classReference -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.util.Collection,com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1):13:13 -> <init>
     2:3:void <init>(com.android.tools.r8.references.ClassReference,java.util.Collection):19:20 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder builder():24:24 -> a
     1:1:com.android.tools.r8.references.ClassReference getClassReference():29:29 -> getClassReference
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1 -> com.android.tools.r8.internal.uF:
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.internal.vF:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.internal.wE:
     com.android.tools.r8.references.ClassReference classReference -> b
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1):32:32 -> <init>
     2:2:void <init>():36:36 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
     1:1:com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder setClass(com.android.tools.r8.references.ClassReference):39:39 -> a
     1:1:com.android.tools.r8.diagnostic.MissingDefinitionInfo build():44:44 -> b
-com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase -> com.android.tools.r8.internal.BF:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase -> com.android.tools.r8.internal.BE:
     java.util.Collection referencedFromContexts -> a
     1:2:void <init>(java.util.Collection):16:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():22:24 -> getDiagnosticMessage
     1:1:java.util.Collection getReferencedFromContexts():29:29 -> getReferencedFromContexts
-com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder -> com.android.tools.r8.internal.AF:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder -> com.android.tools.r8.internal.AE:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder referencedFromContextsBuilder -> a
     1:1:void <init>():37:37 -> <init>
     2:2:void <init>():35:35 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
     1:2:com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder addReferencedFromContext(com.android.tools.r8.diagnostic.DefinitionContext):40:41 -> a
     3:4:com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder addReferencedFromContexts(java.lang.Iterable):45:46 -> a
-com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils -> com.android.tools.r8.internal.CF:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils -> com.android.tools.r8.internal.CE:
     boolean $assertionsDisabled -> b
     java.util.Comparator COMPARATOR -> a
     1:3:void <clinit>():26:28 -> <clinit>
@@ -22477,22 +22330,22 @@
     65:67:void lambda$writeDiagnosticMessage$3(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingMethodInfo):102:104 -> a
     68:68:void lambda$writeDiagnosticMessage$3(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingMethodInfo):103:103 -> a
     69:69:void lambda$writeReferencedFromSuffix$4(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionClassContext):119:119 -> a
-    70:71:void com.android.tools.r8.utils.Box.setMin(java.lang.Object,java.util.Comparator):37:38 -> a
-    70:71:void lambda$writeReferencedFromSuffix$4(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionClassContext):118 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    72:72:void lambda$writeReferencedFromSuffix$5(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionFieldContext):122:122 -> a
-    73:74:void com.android.tools.r8.utils.Box.setMin(java.lang.Object,java.util.Comparator):37:38 -> a
-    73:74:void lambda$writeReferencedFromSuffix$5(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionFieldContext):121 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    75:76:void lambda$writeReferencedFromSuffix$6(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionMethodContext):125:126 -> a
-    77:78:void com.android.tools.r8.utils.Box.setMin(java.lang.Object,java.util.Comparator):37:38 -> a
-    77:78:void lambda$writeReferencedFromSuffix$6(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionMethodContext):124 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    79:88:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo,java.lang.String):143:152 -> a
+    70:70:void lambda$writeReferencedFromSuffix$4(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionClassContext):118:118 -> a
+    71:72:void com.android.tools.r8.utils.Box.setMin(java.lang.Object,java.util.Comparator):37:38 -> a
+    71:72:void lambda$writeReferencedFromSuffix$4(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionClassContext):118 -> a
+    73:73:void lambda$writeReferencedFromSuffix$5(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionFieldContext):122:122 -> a
+    74:74:void lambda$writeReferencedFromSuffix$5(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionFieldContext):121:121 -> a
+    75:76:void com.android.tools.r8.utils.Box.setMin(java.lang.Object,java.util.Comparator):37:38 -> a
+    75:76:void lambda$writeReferencedFromSuffix$5(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionFieldContext):121 -> a
+    77:78:void lambda$writeReferencedFromSuffix$6(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionMethodContext):125:126 -> a
+    79:79:void lambda$writeReferencedFromSuffix$6(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionMethodContext):124:124 -> a
+    80:81:void com.android.tools.r8.utils.Box.setMin(java.lang.Object,java.util.Comparator):37:38 -> a
+    80:81:void lambda$writeReferencedFromSuffix$6(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionMethodContext):124 -> a
+    82:91:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo,java.lang.String):143:152 -> a
     1:23:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):110:132 -> b
     24:28:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):131:135 -> b
     29:32:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):134:137 -> b
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.internal.FF:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.internal.EE:
     java.util.Collection missingDefinitions -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():17:17 -> <clinit>
@@ -22509,36 +22362,33 @@
     1:3:java.util.Collection getMissingDefinitions():32 -> getMissingDefinitions
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():51:51 -> getPosition
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$1 -> com.android.tools.r8.internal.DF:
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.internal.EF:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.internal.DE:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder missingDefinitionsBuilder -> a
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$1):75:75 -> <init>
     2:2:void <init>():80:80 -> <init>
     3:3:void <init>():78:78 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder addMissingDefinitionInfo(com.android.tools.r8.diagnostic.MissingDefinitionInfo):83:83 -> a
     2:2:com.android.tools.r8.diagnostic.MissingDefinitionsDiagnostic build():88:88 -> a
-com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl -> com.android.tools.r8.internal.IF:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl -> com.android.tools.r8.internal.GE:
     com.android.tools.r8.references.FieldReference fieldReference -> b
     1:1:void <init>(com.android.tools.r8.references.FieldReference,java.util.Collection,com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$1):13:13 -> <init>
     2:3:void <init>(com.android.tools.r8.references.FieldReference,java.util.Collection):19:20 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder builder():24:24 -> a
     1:1:com.android.tools.r8.references.FieldReference getFieldReference():29:29 -> getFieldReference
-com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$1 -> com.android.tools.r8.internal.GF:
-com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder -> com.android.tools.r8.internal.HF:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder -> com.android.tools.r8.internal.FE:
     com.android.tools.r8.references.FieldReference fieldReference -> b
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$1):32:32 -> <init>
     2:2:void <init>():36:36 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
     1:1:com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder setField(com.android.tools.r8.references.FieldReference):39:39 -> a
     1:1:com.android.tools.r8.diagnostic.MissingDefinitionInfo build():44:44 -> b
-com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl -> com.android.tools.r8.internal.LF:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl -> com.android.tools.r8.internal.IE:
     com.android.tools.r8.references.MethodReference methodReference -> b
     1:1:void <init>(com.android.tools.r8.references.MethodReference,java.util.Collection,com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$1):13:13 -> <init>
     2:3:void <init>(com.android.tools.r8.references.MethodReference,java.util.Collection):19:20 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder builder():24:24 -> a
     1:1:com.android.tools.r8.references.MethodReference getMethodReference():29:29 -> getMethodReference
-com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$1 -> com.android.tools.r8.internal.JF:
-com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder -> com.android.tools.r8.internal.KF:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder -> com.android.tools.r8.internal.HE:
     com.android.tools.r8.references.MethodReference methodReference -> b
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$1):32:32 -> <init>
     2:2:void <init>():36:36 -> <init>
@@ -22564,8 +22414,7 @@
     13:19:java.lang.String getDiagnosticMessage():53:59 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():34:34 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():39:39 -> getPosition
-com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$1 -> com.android.tools.r8.errors.a:
-com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder -> com.android.tools.r8.errors.b:
+com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder -> com.android.tools.r8.errors.a:
     java.util.List methods -> a
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
@@ -22583,8 +22432,7 @@
     1:11:java.lang.String getDiagnosticMessage():66:76 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():55:55 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():61:61 -> getPosition
-com.android.tools.r8.errors.CheckDiscardDiagnostic$1 -> com.android.tools.r8.errors.c:
-com.android.tools.r8.errors.CheckDiscardDiagnostic$Builder -> com.android.tools.r8.errors.d:
+com.android.tools.r8.errors.CheckDiscardDiagnostic$Builder -> com.android.tools.r8.errors.b:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder messagesBuilder -> a
     1:2:void <init>():23:24 -> <init>
     1:4:com.android.tools.r8.errors.CheckDiscardDiagnostic$Builder addFailedItems(java.util.List,com.android.tools.r8.shaking.GraphReporter,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer):30:33 -> a
@@ -22615,7 +22463,7 @@
     50:50:java.lang.String getDiagnosticMessage():42:42 -> getDiagnosticMessage
     43:47:java.lang.String getDiagnosticMessage():42:46 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():37:37 -> getPosition
-com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.Nc:
+com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.qc:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     1:1:void <init>(java.lang.String):22:22 -> <init>
@@ -22637,14 +22485,14 @@
     40:40:java.lang.String getDiagnosticMessage():33:33 -> getDiagnosticMessage
     41:41:java.lang.String getDiagnosticMessage():33:33 -> getDiagnosticMessage
     34:38:java.lang.String getDiagnosticMessage():33:37 -> getDiagnosticMessage
-com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.bf:
+com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.Fe:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
-com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.Of:
+com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.wf:
     java.util.Set markers -> c
     java.util.Set desugaredLibraryIdentifiers -> b
     1:3:void <init>(java.util.Set,java.util.Set):20:22 -> <init>
@@ -22677,7 +22525,7 @@
     1:1:java.util.Collection getOrigins():43:43 -> getOrigins
     1:1:com.android.tools.r8.position.Position getPosition():61:61 -> getPosition
     1:1:com.android.tools.r8.references.ClassReference getType():30:30 -> getType
-com.android.tools.r8.errors.ExperimentalClassFileVersionDiagnostic -> com.android.tools.r8.internal.kj:
+com.android.tools.r8.errors.ExperimentalClassFileVersionDiagnostic -> com.android.tools.r8.internal.Si:
     com.android.tools.r8.origin.Origin origin -> c
     java.lang.String message -> b
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.lang.String):16:18 -> <init>
@@ -22712,14 +22560,14 @@
     1:1:com.android.tools.r8.references.ClassReference getMissingType():58:58 -> getMissingType
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():53:53 -> getPosition
-com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.hu:
+com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.Bt:
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(java.lang.String):21:21 -> <init>
     3:3:void <init>(java.lang.String,java.lang.Throwable):25:25 -> <init>
     4:4:void <init>(java.lang.Throwable):29:29 -> <init>
-com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.yu:
+com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.St:
     1:1:void <init>(java.lang.String):9:9 -> <init>
-com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.zu:
+com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.Tt:
     1:1:void <init>(java.lang.String):8:8 -> <init>
 com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic -> com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic:
     com.android.tools.r8.references.ClassReference invalidSuperType -> e
@@ -22738,7 +22586,7 @@
     60:70:java.lang.String getDiagnosticMessage():59:69 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():52:52 -> getPosition
-com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.Eu:
+com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.Yt:
     1:1:void <init>():9:9 -> <init>
     1:1:java.lang.String getDiagnosticMessage():13:13 -> getDiagnosticMessage
 com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic -> com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic:
@@ -22751,24 +22599,24 @@
     1:1:java.lang.String getDiagnosticMessage():36:36 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():26:26 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():31:31 -> getPosition
-com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.rN:
+com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.iM:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
-com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.mX:
+com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.IV:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
-com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.y10:
+com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.OZ:
     1:1:void <init>():11:11 -> <init>
     2:2:void <init>(java.lang.String):15:15 -> <init>
-com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.R10:
+com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.h00:
     1:1:void <init>():19:19 -> <init>
     2:2:void <init>(java.lang.String):23:23 -> <init>
     3:3:void <init>(java.lang.Throwable):27:27 -> <init>
@@ -22778,22 +22626,21 @@
     1:1:java.lang.String getDiagnosticMessage():36:36 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():26:26 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():31:31 -> getPosition
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration -> com.android.tools.r8.internal.wh:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration -> com.android.tools.r8.internal.dh:
     1:1:void <init>():12:12 -> <init>
     boolean matches(com.android.tools.r8.graph.DexType) -> a
     boolean validate(com.android.tools.r8.utils.InternalOptions) -> a
     1:3:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):15:17 -> a
     4:4:com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.empty():23:23 -> a
     4:4:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):19 -> a
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$1 -> com.android.tools.r8.internal.uh:
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness -> com.android.tools.r8.internal.vh:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness -> com.android.tools.r8.internal.ch:
     1:1:void <init>(com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$1):36:36 -> <init>
     2:2:void <init>():38:38 -> <init>
-com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration -> com.android.tools.r8.internal.Mh:
+com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration -> com.android.tools.r8.internal.wh:
     1:1:void <init>():10:10 -> <init>
     boolean matches(com.android.tools.r8.graph.DexType) -> a
     boolean validate(com.android.tools.r8.utils.InternalOptions) -> a
-com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration -> com.android.tools.r8.internal.PH:
+com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration -> com.android.tools.r8.internal.MG:
     java.util.List dontWarnPatterns -> a
     java.util.Map matchedDontWarnPatterns -> b
     boolean $assertionsDisabled -> c
@@ -22865,7 +22712,7 @@
     1:1:com.android.tools.r8.references.FieldReference getReference():21:21 -> getReference
     1:1:int hashCode():32:32 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.fm:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.Il:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo UNKNOWN -> b
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind kind -> a
     boolean $assertionsDisabled -> c
@@ -22906,10 +22753,10 @@
     101:101:java.lang.String toString():98:98 -> toString
     102:102:java.lang.String toString():98:98 -> toString
     99:99:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$1 -> com.android.tools.r8.internal.em:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$1 -> com.android.tools.r8.internal.Hl:
     int[] $SwitchMap$com$android$tools$r8$experimental$graphinfo$GraphEdgeInfo$EdgeKind -> a
     1:1:void <clinit>():50:50 -> <clinit>
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.fm$a:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.Il$a:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind[] $VALUES -> t
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReflectiveUseFrom -> m
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReferencedFrom -> l
@@ -22972,7 +22819,7 @@
     1:1:com.android.tools.r8.references.MethodReference getReference():21:21 -> getReference
     1:1:int hashCode():32:32 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.experimental.startup.StartupConfiguration -> com.android.tools.r8.internal.WW:
+com.android.tools.r8.experimental.startup.StartupConfiguration -> com.android.tools.r8.internal.sV:
     java.util.List startupClasses -> a
     1:2:void <init>(java.util.List):23:24 -> <init>
     1:23:com.android.tools.r8.experimental.startup.StartupConfiguration createStartupConfiguration(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):29:51 -> a
@@ -22987,7 +22834,7 @@
     84:84:com.android.tools.r8.experimental.startup.StartupConfiguration createStartupConfiguration(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):38:38 -> a
     102:102:java.util.List getStartupClasses():67:67 -> a
     1:1:boolean hasStartupClasses():63:63 -> b
-com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.cb:
+com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.Ia:
     java.util.Map classToFeatureSplitMap -> b
     java.util.Map representativeStringsForFeatureSplit -> c
     com.android.tools.r8.FeatureSplit baseStartup -> a
@@ -22998,9 +22845,9 @@
     1:1:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":220,"2":221,"3":222}}
     220:220:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):211:211 -> a
-    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     221:221:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):211 -> a
-    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     222:222:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):211 -> a
     213:219:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):212:218 -> a
     223:223:com.android.tools.r8.features.ClassToFeatureSplitMap createEmptyClassToFeatureSplitMap():45:45 -> a
@@ -23008,26 +22855,35 @@
     271:276:com.android.tools.r8.features.ClassToFeatureSplitMap createInitialClassToFeatureSplitMap(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,com.android.tools.r8.utils.Reporter):108:113 -> a
     277:291:int compareFeatureSplits(com.android.tools.r8.FeatureSplit,com.android.tools.r8.FeatureSplit):118:132 -> a
     292:293:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.synthesis.SyntheticItems):145:146 -> a
-    294:294:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    294:294:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    294:294:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
     294:294:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.synthesis.SyntheticItems):147 -> a
-    295:295:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    295:295:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
+    295:295:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
     295:295:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.synthesis.SyntheticItems):147 -> a
-    296:297:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.synthesis.SyntheticItems):148:149 -> a
-    298:298:java.util.Set lambda$getFeatureSplitClasses$0(com.android.tools.r8.FeatureSplit):149:149 -> a
-    299:307:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticItems):160:168 -> a
-    308:320:com.android.tools.r8.features.ClassToFeatureSplitMap rewrittenWithLens(com.android.tools.r8.graph.GraphLens):208:220 -> a
-    321:328:com.android.tools.r8.features.ClassToFeatureSplitMap withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):225:232 -> a
-    329:330:void lambda$withoutPrunedItems$2(com.android.tools.r8.graph.PrunedItems,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):228:229 -> a
+    296:296:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    296:296:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.synthesis.SyntheticItems):147 -> a
+    297:298:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.synthesis.SyntheticItems):148:149 -> a
+    299:299:java.util.Set lambda$getFeatureSplitClasses$0(com.android.tools.r8.FeatureSplit):149:149 -> a
+    300:308:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticItems):160:168 -> a
+    309:309:boolean isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184:184 -> a
+    310:310:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
+    310:310:boolean isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184 -> a
+    311:312:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):189:190 -> a
+    311:312:boolean isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184 -> a
+    313:313:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    313:313:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):190 -> a
+    313:313:boolean isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184 -> a
+    314:326:com.android.tools.r8.features.ClassToFeatureSplitMap rewrittenWithLens(com.android.tools.r8.graph.GraphLens):208:220 -> a
+    327:334:com.android.tools.r8.features.ClassToFeatureSplitMap withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):225:232 -> a
+    335:336:void lambda$withoutPrunedItems$2(com.android.tools.r8.graph.PrunedItems,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):228:229 -> a
     1:1:com.android.tools.r8.FeatureSplit getBaseStartup():140:140 -> b
     1:1:boolean isEmpty():175:175 -> c
-com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.uj:
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.cj:
     java.util.List featureSplits -> a
     1:2:void <init>(java.util.List):20:21 -> <init>
     1:16:java.util.Collection getDataResourceProvidersAndConsumers():44:59 -> a
     1:1:java.util.List getFeatureSplits():68:68 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.tj:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.bj:
     com.android.tools.r8.DataResourceConsumer consumer -> b
     java.util.Set providers -> a
     1:3:void <init>(java.util.Set,com.android.tools.r8.DataResourceConsumer):29:31 -> <init>
@@ -23061,30 +22917,30 @@
     27:29:boolean isAccessedInMethodSatisfying(java.util.function.Predicate):240:242 -> a
     30:32:boolean isAccessedOutside(com.android.tools.r8.graph.DexEncodedMethod):271:273 -> a
     33:35:boolean recordAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):297:299 -> a
-    36:36:com.android.tools.r8.graph.AbstractAccessContexts join(com.android.tools.r8.graph.AbstractAccessContexts):321:321 -> a
-    37:37:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
-    37:37:com.android.tools.r8.graph.AbstractAccessContexts join(com.android.tools.r8.graph.AbstractAccessContexts):324 -> a
-    38:49:com.android.tools.r8.graph.AbstractAccessContexts join(com.android.tools.r8.graph.AbstractAccessContexts):327:338 -> a
-    50:50:void lambda$join$6(java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):330:330 -> a
-    51:51:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
-    51:51:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):309 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    52:52:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):309:309 -> a
-    53:55:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):308:310 -> a
-    56:56:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):370:370 -> a
-    56:56:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):311 -> a
-    57:57:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    57:57:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):370 -> a
-    57:57:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):311 -> a
-    58:59:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):371:372 -> a
-    58:59:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):311 -> a
-    60:60:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):312:312 -> a
-    61:61:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":375,"2":376,"3":377}}
-    375:375:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):312:312 -> a
-    376:376:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):312:312 -> a
-    377:377:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):312:312 -> a
-    373:374:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):312:313 -> a
+    36:36:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):309:309 -> a
+    37:37:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
+    37:37:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):309 -> a
+    38:38:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):309:309 -> a
+    39:41:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):308:310 -> a
+    42:42:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):374:374 -> a
+    42:42:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):311 -> a
+    43:43:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
+    43:43:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):374 -> a
+    43:43:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):311 -> a
+    44:45:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):375:376 -> a
+    44:45:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):311 -> a
+    46:46:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):312:312 -> a
+    47:47:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":361,"2":362,"3":363}}
+    361:361:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):312:312 -> a
+    362:362:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):312:312 -> a
+    363:363:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):312:312 -> a
+    359:360:void lambda$rewrittenWithLens$5(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):312:313 -> a
+    364:364:com.android.tools.r8.graph.AbstractAccessContexts join(com.android.tools.r8.graph.AbstractAccessContexts):321:321 -> a
+    365:365:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
+    365:365:com.android.tools.r8.graph.AbstractAccessContexts join(com.android.tools.r8.graph.AbstractAccessContexts):324 -> a
+    366:377:com.android.tools.r8.graph.AbstractAccessContexts join(com.android.tools.r8.graph.AbstractAccessContexts):327:338 -> a
+    378:378:void lambda$join$6(java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):330:330 -> a
     1:4:int getNumberOfAccessContexts():199:202 -> b
     5:5:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$flattenAccessContexts$1(com.android.tools.r8.graph.DexField):220:220 -> b
     6:8:boolean isAccessedOnlyInMethodSatisfying(java.util.function.Predicate):256:258 -> b
@@ -23126,29 +22982,18 @@
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):23:23 -> a
     2:2:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):22:22 -> a
-    3:3:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):61:61 -> a
-    4:4:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):60:60 -> a
-    5:11:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):69:75 -> a
-    12:24:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):71:83 -> a
-    25:31:boolean isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):102:108 -> a
-    25:31:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):83 -> a
-    32:42:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):84:94 -> a
-    43:43:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
-    43:43:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):31 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    44:50:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):31:37 -> a
-    51:51:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):36:36 -> a
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    52:52:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184 -> a
-    52:52:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):36 -> a
-    53:54:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):189:190 -> a
-    53:54:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184 -> a
-    53:54:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):36 -> a
-    55:55:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
-    55:55:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):190 -> a
-    55:55:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184 -> a
-    55:55:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):36 -> a
-    56:58:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):38:40 -> a
+    3:3:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):31:31 -> a
+    4:4:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
+    4:4:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):31 -> a
+    5:11:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):31:37 -> a
+    12:16:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):36:40 -> a
+    17:17:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):61:61 -> a
+    18:18:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):60:60 -> a
+    19:25:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):69:75 -> a
+    26:38:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):71:83 -> a
+    39:45:boolean isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):102:108 -> a
+    39:45:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):83 -> a
+    46:56:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):84:94 -> a
 com.android.tools.r8.graph.AccessFlags -> com.android.tools.r8.graph.c:
     java.util.List NAMES -> d
     boolean $assertionsDisabled -> e
@@ -23252,7 +23097,6 @@
     24:27:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):201:204 -> a
     28:28:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):550:550 -> a
     28:28:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):204 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:29:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):205:205 -> a
     30:30:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):237:237 -> a
     31:31:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
@@ -23264,7 +23108,6 @@
     3:6:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):182:185 -> b
     7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):550:550 -> b
     7:7:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):185 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):186:186 -> b
     1:1:boolean checkIfObsolete():101:101 -> c
     2:2:boolean isObsolete():89:89 -> c
@@ -23284,17 +23127,16 @@
     1:1:void unsetObsolete():97:97 -> m
     2:2:void com.android.tools.r8.utils.BooleanBox.unset():48:48 -> m
     2:2:void unsetObsolete():97 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():217:217 -> n
     1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():227:227 -> o
-com.android.tools.r8.graph.AppInfoWithClassHierarchy -> com.android.tools.r8.graph.h:
+com.android.tools.r8.graph.AppInfoWithClassHierarchy -> com.android.tools.r8.graph.g:
     com.android.tools.r8.graph.AppInfoWithClassHierarchy$CreateDesugaringViewOnAppInfo WITNESS -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.features.ClassToFeatureSplitMap classToFeatureSplitMap -> g
     com.android.tools.r8.shaking.MissingClasses missingClasses -> h
     1:3:void <clinit>():51:53 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses):82:84 -> <init>
-    4:8:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$CreateDesugaringViewOnAppInfo,com.android.tools.r8.graph.AppInfo):89:93 -> <init>
+    1:94:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$CreateDesugaringViewOnAppInfo,com.android.tools.r8.graph.AppInfo):0:93 -> <init>
+    95:97:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses):82:84 -> <init>
     1:1:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):51:51 -> a
     2:2:com.android.tools.r8.graph.AppInfo rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):51:51 -> a
     3:7:com.android.tools.r8.graph.AppInfoWithClassHierarchy createInitialAppInfoWithClassHierarchy(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo):63:67 -> a
@@ -23330,51 +23172,49 @@
     138:141:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):465:468 -> a
     142:146:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):489:493 -> a
     147:159:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):491:503 -> a
-    160:166:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):522:528 -> a
-    167:167:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):118:118 -> a
-    167:167:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):529 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    168:169:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):533:534 -> a
-    170:170:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):568:568 -> a
-    171:172:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):561:562 -> a
-    171:172:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):568 -> a
-    173:175:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1026:1028 -> a
-    173:175:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):563 -> a
-    173:175:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):568 -> a
-    176:176:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
-    176:176:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1028 -> a
-    176:176:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):563 -> a
-    176:176:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):568 -> a
-    177:178:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):563:564 -> a
-    177:178:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):568 -> a
-    179:180:com.android.tools.r8.graph.DexClassAndMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):620:621 -> a
-    181:182:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):673:674 -> a
-    183:186:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):705:708 -> a
-    187:192:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):720:725 -> a
-    193:193:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):734:734 -> a
-    194:206:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):750:762 -> a
-    207:217:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexType):766:776 -> a
-    218:218:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexClass):786:786 -> a
-    218:218:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexType):778 -> a
-    219:219:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):782:782 -> a
-    220:224:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):791:795 -> a
-    225:225:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):852:852 -> a
-    225:225:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):800 -> a
-    226:228:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):900:900 -> a
-    226:228:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):853 -> a
-    226:228:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):800 -> a
-    229:229:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):854:854 -> a
-    229:229:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):800 -> a
-    230:230:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):816:816 -> a
-    231:244:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):602:615 -> a
-    231:244:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):816 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    245:245:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):818:818 -> a
-    246:246:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):592:592 -> a
-    246:246:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):821 -> a
-    247:248:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):828:829 -> a
-    249:250:void com.android.tools.r8.graph.MethodResolutionResult$IllegalAccessOrNoSuchMethodResult.<init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):984:985 -> a
-    249:250:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):829 -> a
+    160:167:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):522:529 -> a
+    168:168:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):118:118 -> a
+    168:168:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):529 -> a
+    169:170:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):533:534 -> a
+    171:171:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):568:568 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):561:562 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):568 -> a
+    174:176:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1026:1028 -> a
+    174:176:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):563 -> a
+    174:176:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):568 -> a
+    177:177:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
+    177:177:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1028 -> a
+    177:177:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):563 -> a
+    177:177:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):568 -> a
+    178:179:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):563:564 -> a
+    178:179:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):568 -> a
+    180:181:com.android.tools.r8.graph.DexClassAndMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):620:621 -> a
+    182:183:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):673:674 -> a
+    184:187:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):705:708 -> a
+    188:193:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):720:725 -> a
+    194:194:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):734:734 -> a
+    195:207:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):750:762 -> a
+    208:218:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexType):766:776 -> a
+    219:219:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexClass):786:786 -> a
+    219:219:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexType):778 -> a
+    220:220:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):782:782 -> a
+    221:225:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):791:795 -> a
+    226:226:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):852:852 -> a
+    226:226:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):800 -> a
+    227:229:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):900:900 -> a
+    227:229:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):853 -> a
+    227:229:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):800 -> a
+    230:230:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):854:854 -> a
+    230:230:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):800 -> a
+    231:231:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):816:816 -> a
+    232:245:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):602:615 -> a
+    232:245:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):816 -> a
+    246:246:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):818:818 -> a
+    247:247:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):592:592 -> a
+    247:247:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):821 -> a
+    248:249:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):828:829 -> a
+    250:250:void com.android.tools.r8.graph.MethodResolutionResult$IllegalAccessOrNoSuchMethodResult.<init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):984:984 -> a
+    250:250:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):829 -> a
     251:257:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):831:837 -> a
     258:259:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):863:864 -> a
     258:259:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):886 -> a
@@ -23402,33 +23242,32 @@
     285:287:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):900:900 -> a
     285:287:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):930 -> a
     288:302:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):960:974 -> a
-    303:304:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):983:984 -> a
-    305:305:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):592:592 -> a
-    305:305:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):986 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    306:311:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):988:993 -> a
-    312:312:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):592:592 -> a
-    312:312:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):995 -> a
-    313:314:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):996:997 -> a
-    315:315:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):852:852 -> a
-    315:315:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1001 -> a
-    316:318:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):900:900 -> a
-    316:318:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):853 -> a
-    316:318:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1001 -> a
-    319:319:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):854:854 -> a
-    319:319:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1001 -> a
-    320:322:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1026:1028 -> a
-    320:322:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1016 -> a
-    323:323:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
-    323:323:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1028 -> a
-    323:323:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1016 -> a
-    324:326:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):1032:1034 -> a
-    327:344:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set):1042:1059 -> a
-    345:345:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
-    345:345:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set):1062 -> a
-    346:348:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):1067:1069 -> a
-    349:354:com.android.tools.r8.graph.DexClassAndField resolveFieldOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):1085:1090 -> a
-    349:354:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):1072 -> a
+    303:306:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):983:986 -> a
+    307:307:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):592:592 -> a
+    307:307:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):986 -> a
+    308:313:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):988:993 -> a
+    314:314:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):592:592 -> a
+    314:314:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):995 -> a
+    315:316:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):996:997 -> a
+    317:317:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):852:852 -> a
+    317:317:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1001 -> a
+    318:320:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):900:900 -> a
+    318:320:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):853 -> a
+    318:320:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1001 -> a
+    321:321:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):854:854 -> a
+    321:321:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1001 -> a
+    322:324:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1026:1028 -> a
+    322:324:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1016 -> a
+    325:325:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
+    325:325:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1028 -> a
+    325:325:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1016 -> a
+    326:328:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):1032:1034 -> a
+    329:346:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set):1042:1059 -> a
+    347:347:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
+    347:347:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set):1062 -> a
+    348:350:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):1067:1069 -> a
+    351:356:com.android.tools.r8.graph.DexClassAndField resolveFieldOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):1085:1090 -> a
+    351:356:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):1072 -> a
     1:4:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):118:121 -> b
     5:5:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():144:144 -> b
     5:5:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):122 -> b
@@ -23498,11 +23337,10 @@
     1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():159:159 -> n
     1:1:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():144:144 -> p
     1:1:com.android.tools.r8.shaking.MissingClasses getMissingClasses():148:148 -> q
-com.android.tools.r8.graph.AppInfoWithClassHierarchy$1 -> com.android.tools.r8.graph.e:
-com.android.tools.r8.graph.AppInfoWithClassHierarchy$CreateDesugaringViewOnAppInfo -> com.android.tools.r8.graph.f:
+com.android.tools.r8.graph.AppInfoWithClassHierarchy$CreateDesugaringViewOnAppInfo -> com.android.tools.r8.graph.e:
     1:1:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$1):55:55 -> <init>
     2:2:void <init>():56:56 -> <init>
-com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder -> com.android.tools.r8.graph.g:
+com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder -> com.android.tools.r8.graph.f:
     java.util.LinkedHashMap maximallySpecificMethods -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():1093:1093 -> <clinit>
@@ -23523,7 +23361,7 @@
     62:65:com.android.tools.r8.graph.MethodResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):1180 -> a
     66:66:com.android.tools.r8.graph.MethodResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):1182:1182 -> a
     1:2:com.android.tools.r8.graph.MethodResolutionResult resolve(com.android.tools.r8.graph.DexClass):1144:1145 -> b
-com.android.tools.r8.graph.AppServices -> com.android.tools.r8.internal.o2:
+com.android.tools.r8.graph.AppServices -> com.android.tools.r8.internal.n2:
     java.util.Map services -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLens applied -> b
@@ -23589,8 +23427,7 @@
     1:3:java.util.Set computeAllServiceImplementations():65:67 -> b
     1:1:boolean isEmpty():56:56 -> c
     1:5:boolean verifyRewrittenWithLens():189:193 -> d
-com.android.tools.r8.graph.AppServices$1 -> com.android.tools.r8.internal.l2:
-com.android.tools.r8.graph.AppServices$Builder -> com.android.tools.r8.internal.o2$a:
+com.android.tools.r8.graph.AppServices$Builder -> com.android.tools.r8.internal.n2$a:
     java.util.Map services -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
@@ -23607,7 +23444,7 @@
     16:16:com.android.tools.r8.graph.AppServices build():240:240 -> a
     1:1:java.util.Map access$300(com.android.tools.r8.graph.AppServices$Builder):213:213 -> b
     1:1:com.android.tools.r8.utils.InternalOptions access$400(com.android.tools.r8.graph.AppServices$Builder):213:213 -> c
-com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor -> com.android.tools.r8.internal.n2:
+com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor -> com.android.tools.r8.internal.m2:
     com.android.tools.r8.graph.AppServices$Builder this$0 -> b
     com.android.tools.r8.FeatureSplit featureSplit -> a
     1:2:void <init>(com.android.tools.r8.graph.AppServices$Builder,com.android.tools.r8.FeatureSplit):256:257 -> <init>
@@ -23660,7 +23497,7 @@
     21:22:void visit(com.android.tools.r8.DataEntryResource):282 -> visit
     23:30:void visit(com.android.tools.r8.DataEntryResource):290:297 -> visit
     31:34:void visit(com.android.tools.r8.DataEntryResource):296:299 -> visit
-com.android.tools.r8.graph.AppView -> com.android.tools.r8.graph.i:
+com.android.tools.r8.graph.AppView -> com.android.tools.r8.graph.h:
     com.android.tools.r8.graph.GraphLens graphLens -> g
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> e
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> l
@@ -23699,185 +23536,184 @@
     1:1:void <clinit>():62:62 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):128:128 -> <init>
     2:76:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):74:148 -> <init>
-    1:1:boolean hasUnboxedEnums():618:618 -> A
-    1:1:boolean hasVerticallyMergedClasses():600:600 -> B
-    1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():585:585 -> C
-    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():469:469 -> D
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():212:212 -> E
-    1:1:boolean isAllCodeProcessed():265:265 -> F
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():358:358 -> G
-    1:4:void loadApplyMappingSeedMapper():829:832 -> H
-    5:5:void loadApplyMappingSeedMapper():831:831 -> H
-    1:1:com.android.tools.r8.utils.InternalOptions options():498:498 -> I
-    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():366:366 -> J
-    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet():514:514 -> K
-    1:1:void setAllCodeProcessed():269:269 -> L
-    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory():216:216 -> M
-    1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():622:622 -> N
-    2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():20:20 -> N
-    2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():622 -> N
-    1:4:boolean validateUnboxedEnumsHaveBeenPruned():632:635 -> O
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():608:608 -> P
-    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():647:647 -> Q
-    com.android.tools.r8.graph.AppView withLiveness() -> R
-    1:1:com.android.tools.r8.graph.AppView withoutClassHierarchy():654:654 -> S
-    2:2:boolean hasClassHierarchy():642:642 -> S
-    2:2:com.android.tools.r8.graph.AppView withoutClassHierarchy():654 -> S
-    3:3:com.android.tools.r8.graph.AppView withoutClassHierarchy():654:654 -> S
-    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):167:167 -> a
-    2:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):162:163 -> a
-    2:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):168 -> a
-    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):168:168 -> a
-    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):173:173 -> a
-    6:6:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):177:177 -> a
-    7:8:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):182:183 -> a
-    9:9:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):51:51 -> a
-    9:9:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):183 -> a
-    10:10:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):50:50 -> a
-    10:10:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):183 -> a
-    11:13:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):185:187 -> a
-    14:15:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):162:163 -> a
-    14:15:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):188 -> a
-    16:16:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):188:188 -> a
-    17:17:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):203:203 -> a
-    18:19:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):162:163 -> a
-    18:19:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):204 -> a
-    20:20:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):204:204 -> a
-    21:21:void setAppServices(com.android.tools.r8.graph.AppServices):283:283 -> a
-    22:22:void setClassesEscapingIntoLibrary(java.util.function.Predicate):296:296 -> a
-    23:23:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):300:300 -> a
-    24:24:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):304:304 -> a
-    25:25:com.android.tools.r8.graph.DexItemFactory dexItemFactory():328:328 -> a
-    26:27:void withArgumentPropagator(com.android.tools.r8.utils.ThrowingConsumer):352:353 -> a
-    28:28:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):384:384 -> a
-    29:29:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1572:1572 -> a
-    29:29:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):384 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    30:30:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):385:385 -> a
-    31:32:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):399:400 -> a
-    33:34:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):429:430 -> a
-    35:42:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):449:456 -> a
-    43:43:boolean com.android.tools.r8.graph.GraphLens.isAppliedLens():0:0 -> a
-    43:43:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):456 -> a
-    44:44:boolean com.android.tools.r8.graph.GraphLens.isClearCodeRewritingLens():0:0 -> a
-    44:44:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):456 -> a
-    45:45:void setCodeLens(com.android.tools.r8.graph.GraphLens):440:440 -> a
-    45:45:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):457 -> a
-    46:46:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):477:477 -> a
-    47:47:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):482:482 -> a
-    48:48:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
-    48:48:boolean checkForTesting(java.util.function.Supplier):845 -> a
-    49:49:boolean checkForTesting(java.util.function.Supplier):845:845 -> a
-    50:51:void setRootSet(com.android.tools.r8.shaking.RootSetUtils$RootSet):518:519 -> a
-    52:53:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):523:524 -> a
-    54:54:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():536:536 -> a
-    54:54:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):540 -> a
-    55:55:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):540:540 -> a
-    56:56:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():536:536 -> a
-    56:56:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):544 -> a
-    57:57:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):544:544 -> a
-    58:58:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> a
-    58:58:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):544 -> a
-    59:59:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():536:536 -> a
-    59:59:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):548 -> a
-    60:60:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):548:548 -> a
-    61:61:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
-    61:61:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):548 -> a
-    62:63:void setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):561:562 -> a
-    64:64:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):590:590 -> a
-    65:65:boolean hasHorizontallyMergedClasses():577:577 -> a
-    65:65:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):590 -> a
-    66:66:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):590:590 -> a
-    67:67:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():585:585 -> a
-    67:67:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591 -> a
-    68:69:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591:592 -> a
-    70:70:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
-    70:70:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):593 -> a
-    71:73:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):593:595 -> a
-    74:74:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():585:585 -> a
-    74:74:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):595 -> a
-    75:75:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):595:595 -> a
-    76:77:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):612:613 -> a
-    78:78:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
-    78:78:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):614 -> a
-    79:79:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):614:614 -> a
-    80:81:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):626:627 -> a
-    82:82:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
-    82:82:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):628 -> a
-    83:83:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):628:628 -> a
-    84:84:boolean hasLiveness():659:659 -> a
-    84:84:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):796 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    85:86:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):798:799 -> a
-    87:87:com.android.tools.r8.graph.AppServices appServices():279:279 -> a
-    87:87:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):801 -> a
-    88:88:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):801:801 -> a
-    89:89:boolean hasInitClassLens():473:473 -> a
-    89:89:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):802 -> a
-    90:90:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):803:803 -> a
-    91:91:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):477:477 -> a
-    91:91:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):803 -> a
-    92:92:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):805:805 -> a
-    93:93:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():556:556 -> a
-    93:93:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):807 -> a
-    94:94:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):807:807 -> a
-    95:95:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):806:806 -> a
-    96:96:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():532:532 -> a
-    96:96:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):809 -> a
-    97:97:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):810:810 -> a
-    98:100:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):672:674 -> a
-    101:101:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):678:678 -> a
-    102:102:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    102:102:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):678 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    103:107:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):681:685 -> a
-    108:117:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):694:703 -> a
-    118:118:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):727:727 -> a
-    118:118:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):705 -> a
-    119:119:com.android.tools.r8.graph.AppServices appServices():279:279 -> a
-    119:119:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):707 -> a
-    120:122:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):708:710 -> a
-    123:123:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():556:556 -> a
-    123:123:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):712 -> a
-    124:124:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):712:712 -> a
-    125:125:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):711:711 -> a
-    126:126:boolean hasRootSet():510:510 -> a
-    126:126:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):714 -> a
-    127:130:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):715:718 -> a
-    131:133:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):743:745 -> a
-    134:153:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):757:776 -> a
-    154:154:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
-    154:154:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):782 -> a
-    155:164:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):784:793 -> a
-    165:165:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):778:778 -> a
-    166:166:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
-    166:166:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):778 -> a
-    167:167:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
-    167:167:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):778 -> a
-    168:169:void setAlreadyLibraryDesugared(java.util.Set):816:817 -> a
-    1:1:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):193:193 -> b
-    2:2:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):197:197 -> b
-    3:4:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):162:163 -> b
-    3:4:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):198 -> b
-    5:5:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):198:198 -> b
-    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():208:208 -> b
-    7:8:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):392:393 -> b
-    9:10:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):421:422 -> b
-    11:11:void setCfByteCodePassThrough(java.util.Set):486:486 -> b
-    12:13:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):491:492 -> b
-    14:14:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):732:732 -> b
-    15:19:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):821:825 -> b
-    1:3:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):249:251 -> c
-    4:4:void unsetAppInfoForDesugaring():245:245 -> c
-    4:4:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):252 -> c
-    5:8:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):254:257 -> c
-    9:9:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):309:309 -> c
-    10:11:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):377:378 -> c
-    12:13:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):414:415 -> c
-    14:14:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():566:566 -> c
-    15:15:boolean hasHorizontallyMergedClasses():577:577 -> c
-    15:15:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():567 -> c
-    16:19:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():568:571 -> c
+    1:1:boolean hasProguardCompatibilityActions():552:552 -> A
+    1:1:boolean hasUnboxedEnums():618:618 -> B
+    1:1:boolean hasVerticallyMergedClasses():600:600 -> C
+    1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():585:585 -> D
+    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():469:469 -> E
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():212:212 -> F
+    1:1:boolean isAllCodeProcessed():265:265 -> G
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():358:358 -> H
+    1:4:void loadApplyMappingSeedMapper():829:832 -> I
+    5:5:void loadApplyMappingSeedMapper():831:831 -> I
+    1:1:com.android.tools.r8.utils.InternalOptions options():498:498 -> J
+    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():366:366 -> K
+    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet():514:514 -> L
+    1:1:void setAllCodeProcessed():269:269 -> M
+    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory():216:216 -> N
+    1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():622:622 -> O
+    2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():20:20 -> O
+    2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():622 -> O
+    1:4:boolean validateUnboxedEnumsHaveBeenPruned():632:635 -> P
+    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():608:608 -> Q
+    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():647:647 -> R
+    com.android.tools.r8.graph.AppView withLiveness() -> S
+    1:1:com.android.tools.r8.graph.AppView withoutClassHierarchy():654:654 -> T
+    2:2:boolean hasClassHierarchy():642:642 -> T
+    2:2:com.android.tools.r8.graph.AppView withoutClassHierarchy():654 -> T
+    3:3:com.android.tools.r8.graph.AppView withoutClassHierarchy():654:654 -> T
+    1:431:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):0:430 -> a
+    432:432:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):167:167 -> a
+    433:434:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):162:163 -> a
+    433:434:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):168 -> a
+    435:435:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):168:168 -> a
+    436:436:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):173:173 -> a
+    437:437:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):177:177 -> a
+    438:439:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):182:183 -> a
+    440:440:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):51:51 -> a
+    440:440:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):183 -> a
+    441:441:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):50:50 -> a
+    441:441:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):183 -> a
+    442:444:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):185:187 -> a
+    445:446:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):162:163 -> a
+    445:446:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):188 -> a
+    447:447:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):188:188 -> a
+    448:448:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):203:203 -> a
+    449:450:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):162:163 -> a
+    449:450:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):204 -> a
+    451:451:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):204:204 -> a
+    452:452:void setAppServices(com.android.tools.r8.graph.AppServices):283:283 -> a
+    453:453:void setClassesEscapingIntoLibrary(java.util.function.Predicate):296:296 -> a
+    454:454:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):300:300 -> a
+    455:455:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):304:304 -> a
+    456:456:com.android.tools.r8.graph.DexItemFactory dexItemFactory():328:328 -> a
+    457:458:void withArgumentPropagator(com.android.tools.r8.utils.ThrowingConsumer):352:353 -> a
+    459:459:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):384:384 -> a
+    460:460:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1594:1594 -> a
+    460:460:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):384 -> a
+    461:461:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):385:385 -> a
+    462:463:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):399:400 -> a
+    464:471:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):449:456 -> a
+    472:472:boolean com.android.tools.r8.graph.GraphLens.isAppliedLens():0:0 -> a
+    472:472:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):456 -> a
+    473:473:boolean com.android.tools.r8.graph.GraphLens.isClearCodeRewritingLens():0:0 -> a
+    473:473:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):456 -> a
+    474:474:void setCodeLens(com.android.tools.r8.graph.GraphLens):440:440 -> a
+    474:474:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):457 -> a
+    475:475:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):477:477 -> a
+    476:476:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):482:482 -> a
+    477:477:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
+    477:477:boolean checkForTesting(java.util.function.Supplier):845 -> a
+    478:478:boolean checkForTesting(java.util.function.Supplier):845:845 -> a
+    479:480:void setRootSet(com.android.tools.r8.shaking.RootSetUtils$RootSet):518:519 -> a
+    481:482:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):523:524 -> a
+    483:483:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():536:536 -> a
+    483:483:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):540 -> a
+    484:484:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):540:540 -> a
+    485:485:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():536:536 -> a
+    485:485:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):544 -> a
+    486:486:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):544:544 -> a
+    487:487:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> a
+    487:487:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):544 -> a
+    488:488:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():536:536 -> a
+    488:488:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):548 -> a
+    489:489:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):548:548 -> a
+    490:490:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
+    490:490:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):548 -> a
+    491:492:void setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):561:562 -> a
+    493:493:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):590:590 -> a
+    494:494:boolean hasHorizontallyMergedClasses():577:577 -> a
+    494:494:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):590 -> a
+    495:495:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):590:590 -> a
+    496:496:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():585:585 -> a
+    496:496:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591 -> a
+    497:498:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591:592 -> a
+    499:499:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
+    499:499:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):593 -> a
+    500:502:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):593:595 -> a
+    503:503:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():585:585 -> a
+    503:503:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):595 -> a
+    504:504:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):595:595 -> a
+    505:506:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):612:613 -> a
+    507:507:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
+    507:507:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):614 -> a
+    508:508:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):614:614 -> a
+    509:510:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):626:627 -> a
+    511:511:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
+    511:511:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):628 -> a
+    512:512:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):628:628 -> a
+    513:515:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):672:674 -> a
+    516:516:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):678:678 -> a
+    517:517:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    517:517:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):678 -> a
+    518:522:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):681:685 -> a
+    523:532:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):694:703 -> a
+    533:533:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):727:727 -> a
+    533:533:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):705 -> a
+    534:534:com.android.tools.r8.graph.AppServices appServices():279:279 -> a
+    534:534:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):707 -> a
+    535:537:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):708:710 -> a
+    538:538:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():556:556 -> a
+    538:538:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):712 -> a
+    539:539:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):712:712 -> a
+    540:540:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):711:711 -> a
+    541:541:boolean hasRootSet():510:510 -> a
+    541:541:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):714 -> a
+    542:545:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):715:718 -> a
+    546:548:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):743:745 -> a
+    549:568:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):757:776 -> a
+    569:569:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
+    569:569:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):782 -> a
+    570:579:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):784:793 -> a
+    580:580:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):778:778 -> a
+    581:581:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
+    581:581:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):778 -> a
+    582:582:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
+    582:582:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):778 -> a
+    583:583:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):796:796 -> a
+    584:584:boolean hasLiveness():659:659 -> a
+    584:584:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):796 -> a
+    585:586:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):798:799 -> a
+    587:587:com.android.tools.r8.graph.AppServices appServices():279:279 -> a
+    587:587:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):801 -> a
+    588:588:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):801:801 -> a
+    589:589:boolean hasInitClassLens():473:473 -> a
+    589:589:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):802 -> a
+    590:590:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):803:803 -> a
+    591:591:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):477:477 -> a
+    591:591:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):803 -> a
+    592:592:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):805:805 -> a
+    593:593:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():556:556 -> a
+    593:593:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):807 -> a
+    594:594:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):807:807 -> a
+    595:595:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):806:806 -> a
+    596:596:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():532:532 -> a
+    596:596:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):809 -> a
+    597:597:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):810:810 -> a
+    598:599:void setAlreadyLibraryDesugared(java.util.Set):816:817 -> a
+    1:493:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):0:492 -> b
+    494:494:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):193:193 -> b
+    495:495:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):197:197 -> b
+    496:497:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):162:163 -> b
+    496:497:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):198 -> b
+    498:498:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):198:198 -> b
+    499:499:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():208:208 -> b
+    500:501:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):392:393 -> b
+    502:503:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):421:422 -> b
+    504:504:void setCfByteCodePassThrough(java.util.Set):486:486 -> b
+    505:505:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):732:732 -> b
+    506:510:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):821:825 -> b
+    1:379:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):0:378 -> c
+    380:382:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):249:251 -> c
+    383:383:void unsetAppInfoForDesugaring():245:245 -> c
+    383:383:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):252 -> c
+    384:387:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):254:257 -> c
+    388:388:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):309:309 -> c
+    389:390:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):414:415 -> c
+    391:391:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():566:566 -> c
+    392:392:boolean hasHorizontallyMergedClasses():577:577 -> c
+    392:392:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():567 -> c
+    393:396:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():568:571 -> c
     1:1:boolean isModeled(com.android.tools.r8.graph.DexType):158:158 -> d
     2:3:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):407:408 -> d
     4:4:com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute():849:849 -> d
@@ -23892,9 +23728,8 @@
     2:2:boolean canUseInitClass():465 -> i
     1:1:void clearApplyMappingSeedMapper():841:841 -> j
     1:1:com.android.tools.r8.graph.GraphLens clearCodeRewritings():273:273 -> k
-    2:3:com.android.tools.r8.graph.GraphLens com.android.tools.r8.graph.GraphLens.withCodeRewritingsApplied(com.android.tools.r8.graph.DexItemFactory):557:558 -> k
+    2:3:com.android.tools.r8.graph.GraphLens com.android.tools.r8.graph.GraphLens.withCodeRewritingsApplied(com.android.tools.r8.graph.DexItemFactory):574:575 -> k
     2:3:com.android.tools.r8.graph.GraphLens clearCodeRewritings():273 -> k
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.graph.GraphLens clearCodeRewritings():274:274 -> k
     1:1:com.android.tools.r8.graph.GraphLens codeLens():436:436 -> l
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel computedMinApiLevel():853:853 -> m
@@ -23912,26 +23747,26 @@
     1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():347:347 -> v
     1:1:com.android.tools.r8.graph.GraphLens graphLens():444:444 -> w
     1:1:boolean hasCfByteCodePassThroughMethods():689:689 -> x
-    1:1:boolean hasMainDexRootSet():528:528 -> y
-    1:1:boolean hasProguardCompatibilityActions():552:552 -> z
-com.android.tools.r8.graph.ApplicationReaderMap -> com.android.tools.r8.internal.t2:
+    1:1:boolean hasClassHierarchy():642:642 -> y
+    1:1:boolean hasMainDexRootSet():528:528 -> z
+com.android.tools.r8.graph.ApplicationReaderMap -> com.android.tools.r8.internal.s2:
     1:1:void <init>():9:9 -> <init>
     java.lang.String getDescriptor(java.lang.String) -> a
     com.android.tools.r8.graph.DexType getInvertedType(com.android.tools.r8.graph.DexType) -> a
     1:4:com.android.tools.r8.graph.ApplicationReaderMap getInstance(com.android.tools.r8.utils.InternalOptions):20:23 -> a
     com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.graph.ApplicationReaderMap$EmptyMap -> com.android.tools.r8.internal.r2:
+com.android.tools.r8.graph.ApplicationReaderMap$EmptyMap -> com.android.tools.r8.internal.q2:
     1:1:void <init>():26:26 -> <init>
     java.lang.String getDescriptor(java.lang.String) -> a
     com.android.tools.r8.graph.DexType getInvertedType(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.graph.ApplicationReaderMap$RecordMap -> com.android.tools.r8.internal.s2:
+com.android.tools.r8.graph.ApplicationReaderMap$RecordMap -> com.android.tools.r8.internal.r2:
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):48:49 -> <init>
     1:2:java.lang.String getDescriptor(java.lang.String):54:55 -> a
     3:3:com.android.tools.r8.graph.DexType getInvertedType(com.android.tools.r8.graph.DexType):66:66 -> a
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexType):61:61 -> b
-com.android.tools.r8.graph.AppliedGraphLens -> com.android.tools.r8.graph.j:
+com.android.tools.r8.graph.AppliedGraphLens -> com.android.tools.r8.graph.i:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap renamedTypeNames -> f
     boolean $assertionsDisabled -> j
     java.util.Map extraOriginalMethodSignatures -> i
@@ -23946,18 +23781,17 @@
     14:14:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):108:108 -> a
     15:15:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> a
     15:15:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):108 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):108:108 -> a
     17:17:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):119:119 -> a
+    18:18:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):127:127 -> a
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
     1:2:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):113:114 -> b
-    3:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):124:124 -> b
-    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):130:130 -> b
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):136:136 -> d
-    2:2:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):141:141 -> d
-    boolean isContextFreeForMethods() -> f
-    1:4:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):157:160 -> f
-com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.u3:
+    3:3:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):133:133 -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):140:140 -> c
+    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):145:145 -> d
+    1:4:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):161:164 -> e
+    boolean isContextFreeForMethods() -> g
+com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.s3:
     com.android.tools.r8.kotlin.Kotlin kotlin -> i
     com.android.tools.r8.contexts.CompilationContext compilationContext -> k
     com.android.tools.r8.graph.AppInfo appInfo -> h
@@ -23993,7 +23827,7 @@
     360:360:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):204:204 -> a
     void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
     1:2:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):178:179 -> b
-    3:3:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):326:326 -> b
+    3:3:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):319:319 -> b
     3:3:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):179 -> b
     4:13:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):180:189 -> b
     1:9:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):72:80 -> c
@@ -24037,7 +23871,7 @@
     610:615:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):110:115 -> c
     658:658:void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):147:147 -> c
     1:4:void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):120:123 -> d
-com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.internal.N5:
+com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.internal.K5:
     java.util.function.Function immediateSubtypesProvider -> g
     1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):18:19 -> <init>
     1:1:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):28:28 -> a
@@ -24048,18 +23882,18 @@
     5:20:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):62:77 -> a
     com.android.tools.r8.graph.ClassHierarchyTraversal self() -> b
     1:1:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):38:38 -> b
-com.android.tools.r8.graph.CachedHashValueDexItem -> com.android.tools.r8.graph.k:
+com.android.tools.r8.graph.CachedHashValueDexItem -> com.android.tools.r8.graph.j:
     int hash -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:5:void <init>():9:13 -> <init>
     1:1:boolean equals(java.lang.Object):51:51 -> equals
-    boolean computeEquals(java.lang.Object) -> g
     int computeHashCode() -> g0
+    boolean computeEquals(java.lang.Object) -> h
     1:9:int hashCode():21:29 -> hashCode
     10:14:boolean verifyHashCodeConsistent(int):34:38 -> hashCode
     10:14:int hashCode():29 -> hashCode
-com.android.tools.r8.graph.CfCode -> com.android.tools.r8.graph.l:
+com.android.tools.r8.graph.CfCode -> com.android.tools.r8.graph.k:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexType originalHolder -> d
     int maxStack -> f
@@ -24107,9 +23941,9 @@
     64:64:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":510,"2":511,"3":512}}
     510:510:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):395:395 -> a
-    511:511:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    511:511:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     511:511:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):395 -> a
-    512:512:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    512:512:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     512:512:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):395 -> a
     460:467:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):396:403 -> a
     468:488:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):397:417 -> a
@@ -24119,10 +23953,10 @@
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":513,"2":514,"3":515}}
     513:513:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):435:435 -> a
     513:513:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):410 -> a
-    514:514:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    514:514:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     514:514:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):435 -> a
     514:514:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):410 -> a
-    515:515:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    515:515:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     515:515:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):435 -> a
     515:515:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):410 -> a
     491:497:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):436:436 -> a
@@ -24134,240 +23968,240 @@
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":516,"2":517,"3":518}}
     516:516:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):435:435 -> a
     516:516:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):421 -> a
-    517:517:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    517:517:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     517:517:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):435 -> a
     517:517:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):421 -> a
-    518:518:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    518:518:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     518:518:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):435 -> a
     518:518:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):421 -> a
     503:509:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):436:436 -> a
     503:509:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):421 -> a
     519:519:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):470:470 -> a
-    520:520:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):463:463 -> a
+    520:520:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):459:459 -> a
     520:520:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):470 -> a
-    521:524:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):469:472 -> a
-    525:527:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):523:525 -> a
-    525:527:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):471 -> a
-    528:528:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):524:524 -> a
-    528:528:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):471 -> a
-    529:531:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):558:558 -> a
-    529:531:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
-    529:531:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):471 -> a
-    542:544:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):569:571 -> a
-    542:544:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
-    542:544:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):471 -> a
-    545:545:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):570:570 -> a
-    545:545:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
-    545:545:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):471 -> a
-    546:549:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):485:488 -> a
-    550:552:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):523:525 -> a
-    550:552:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):489 -> a
-    553:553:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):524:524 -> a
-    553:553:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):489 -> a
-    554:556:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):558:558 -> a
-    554:556:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
-    554:556:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):489 -> a
-    567:569:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):569:571 -> a
-    567:569:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
-    567:569:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):489 -> a
-    570:570:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription) -> a
-    570:570:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
-    570:570:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):489 -> a
-    571:576:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):594:599 -> a
-    577:577:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    577:577:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):599 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    578:591:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):599:612 -> a
-    592:603:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):617:628 -> a
-    604:609:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):636:641 -> a
-    610:610:void lambda$registerCodeReferencesForDesugaring$5(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):641:641 -> a
-    611:651:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):648:688 -> a
-    652:652:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):687:687 -> a
-    653:653:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):659:659 -> a
-    654:654:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):736:736 -> a
-    655:665:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):744:754 -> a
-    666:666:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
-    666:666:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):754 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    667:667:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():275:275 -> a
-    667:667:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):755 -> a
-    668:676:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):756:764 -> a
-    677:683:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):763:769 -> a
-    684:684:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():283:283 -> a
-    684:684:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):772 -> a
-    685:685:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):772:772 -> a
-    686:695:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):778:787 -> a
-    696:699:int com.android.tools.r8.graph.DexCode.getLargestPrefix(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexString):306:309 -> a
-    696:699:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):787 -> a
-    700:715:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):787:802 -> a
-    716:717:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):96:97 -> a
-    716:717:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):802 -> a
-    718:718:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):799:799 -> a
-    719:722:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):807:810 -> a
-    723:723:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    723:723:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):810 -> a
-    724:731:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):811:818 -> a
-    732:732:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    732:732:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):818 -> a
-    733:737:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):820:824 -> a
-    738:738:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):821:821 -> a
-    739:739:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    739:739:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):826 -> a
-    740:746:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):827:833 -> a
-    747:747:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> a
-    747:747:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):833 -> a
-    748:758:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):846:856 -> a
-    759:759:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    759:759:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):856 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    760:777:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):857:874 -> a
-    778:778:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    778:778:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):874 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    779:779:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):872:872 -> a
-    780:784:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.multipleFramesForLabel(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):31:35 -> a
-    780:784:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):872 -> a
-    785:785:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):965:965 -> a
-    785:785:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):871 -> a
-    786:793:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):878:885 -> a
-    794:794:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    794:794:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):885 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    795:795:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):883:883 -> a
-    796:800:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.unexpectedStackMapFrame(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):22:26 -> a
-    796:800:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):883 -> a
-    801:801:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):965:965 -> a
-    801:801:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):882 -> a
-    802:802:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    802:802:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):892 -> a
-    803:803:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    803:803:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):894 -> a
-    804:809:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):895:900 -> a
-    810:810:boolean com.android.tools.r8.cf.code.CfInstruction.isThrow():0:0 -> a
-    810:810:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):970 -> a
-    810:810:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):900 -> a
-    811:820:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):970:979 -> a
-    811:820:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):900 -> a
-    821:821:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    821:821:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):979 -> a
-    821:821:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):900 -> a
-    822:822:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    521:521:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.GraphLens.lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):460:460 -> a
+    521:521:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):459 -> a
+    521:521:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):470 -> a
+    522:525:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):469:472 -> a
+    526:528:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):523:525 -> a
+    526:528:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):471 -> a
+    529:529:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):524:524 -> a
+    529:529:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):471 -> a
+    530:532:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):558:558 -> a
+    530:532:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
+    530:532:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):471 -> a
+    543:545:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):569:571 -> a
+    543:545:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
+    543:545:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):471 -> a
+    546:546:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):570:570 -> a
+    546:546:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
+    546:546:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):471 -> a
+    547:550:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):485:488 -> a
+    551:553:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):523:525 -> a
+    551:553:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):489 -> a
+    554:554:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):524:524 -> a
+    554:554:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):489 -> a
+    555:557:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):558:558 -> a
+    555:557:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
+    555:557:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):489 -> a
+    568:570:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):569:571 -> a
+    568:570:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
+    568:570:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):489 -> a
+    571:571:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):570:570 -> a
+    571:571:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):535 -> a
+    571:571:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):489 -> a
+    572:577:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):594:599 -> a
+    578:578:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    578:578:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):599 -> a
+    579:592:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):599:612 -> a
+    593:604:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):617:628 -> a
+    605:610:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):636:641 -> a
+    611:611:void lambda$registerCodeReferencesForDesugaring$5(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):641:641 -> a
+    612:652:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):648:688 -> a
+    653:653:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):687:687 -> a
+    654:654:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):659:659 -> a
+    655:655:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):736:736 -> a
+    656:666:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):744:754 -> a
+    667:667:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
+    667:667:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):754 -> a
+    668:668:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():275:275 -> a
+    668:668:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):755 -> a
+    669:677:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):756:764 -> a
+    678:684:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):763:769 -> a
+    685:685:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():283:283 -> a
+    685:685:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):772 -> a
+    686:686:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):772:772 -> a
+    687:696:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):778:787 -> a
+    697:700:int com.android.tools.r8.graph.DexCode.getLargestPrefix(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexString):306:309 -> a
+    697:700:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):787 -> a
+    701:716:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):787:802 -> a
+    717:718:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):96:97 -> a
+    717:718:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):802 -> a
+    719:719:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):799:799 -> a
+    720:723:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):807:810 -> a
+    724:724:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    724:724:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):810 -> a
+    725:732:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):811:818 -> a
+    733:733:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    733:733:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):818 -> a
+    734:738:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):820:824 -> a
+    739:739:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):821:821 -> a
+    740:740:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    740:740:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):826 -> a
+    741:747:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):827:833 -> a
+    748:748:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> a
+    748:748:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):833 -> a
+    749:759:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):846:856 -> a
+    760:760:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    760:760:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):856 -> a
+    761:778:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):857:874 -> a
+    779:779:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    779:779:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):874 -> a
+    780:780:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):872:872 -> a
+    781:785:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.multipleFramesForLabel(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):31:35 -> a
+    781:785:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):872 -> a
+    786:786:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):965:965 -> a
+    786:786:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):871 -> a
+    787:794:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):878:885 -> a
+    795:795:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    795:795:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):885 -> a
+    796:796:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):883:883 -> a
+    797:801:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.unexpectedStackMapFrame(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):22:26 -> a
+    797:801:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):883 -> a
+    802:802:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):965:965 -> a
+    802:802:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):882 -> a
+    803:803:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    803:803:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):892 -> a
+    804:804:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    804:804:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):894 -> a
+    805:810:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):895:900 -> a
+    811:811:boolean com.android.tools.r8.cf.code.CfInstruction.isThrow():0:0 -> a
+    811:811:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):970 -> a
+    811:811:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):900 -> a
+    812:821:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):970:979 -> a
+    812:821:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):900 -> a
+    822:822:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
     822:822:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):979 -> a
     822:822:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):900 -> a
-    823:823:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):984:984 -> a
+    823:823:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    823:823:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):979 -> a
     823:823:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):900 -> a
-    824:828:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):904:908 -> a
-    829:829:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    829:829:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):908 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    830:830:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):906:906 -> a
-    831:836:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.noFramesForMethodWithJumps(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):40:45 -> a
-    831:836:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):906 -> a
-    837:837:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):965:965 -> a
-    837:837:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):905 -> a
-    838:838:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):912:912 -> a
-    839:839:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2770,"2":2771,"3":2772}}
-    2770:2770:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):912:912 -> a
-    2771:2771:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    2771:2771:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):912 -> a
-    2772:2772:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    824:824:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):984:984 -> a
+    824:824:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):900 -> a
+    825:829:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):904:908 -> a
+    830:830:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    830:830:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):908 -> a
+    831:831:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):906:906 -> a
+    832:837:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.noFramesForMethodWithJumps(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):40:45 -> a
+    832:837:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):906 -> a
+    838:838:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):965:965 -> a
+    838:838:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):905 -> a
+    839:839:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):912:912 -> a
+    840:840:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2771,"2":2772,"3":2773}}
+    2771:2771:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):912:912 -> a
+    2772:2772:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     2772:2772:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):912 -> a
-    1752:1752:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):913:913 -> a
-    1753:1753:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2773,"2":2774,"3":2775}}
-    2773:2773:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):913:913 -> a
-    2774:2774:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    2774:2774:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):913 -> a
-    2775:2775:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    2773:2773:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    2773:2773:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):912 -> a
+    1753:1753:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):913:913 -> a
+    1754:1754:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2774,"2":2775,"3":2776}}
+    2774:2774:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):913:913 -> a
+    2775:2775:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     2775:2775:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):913 -> a
-    2667:2680:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):914:927 -> a
-    2681:2682:boolean shouldComputeInitialFrame():988:989 -> a
-    2681:2682:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):927 -> a
-    2683:2683:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    2683:2683:boolean shouldComputeInitialFrame():991 -> a
-    2683:2683:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):927 -> a
-    2684:2684:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    2776:2776:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    2776:2776:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):913 -> a
+    2668:2681:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):914:927 -> a
+    2682:2683:boolean shouldComputeInitialFrame():988:989 -> a
+    2682:2683:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):927 -> a
+    2684:2684:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
     2684:2684:boolean shouldComputeInitialFrame():991 -> a
     2684:2684:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):927 -> a
-    2685:2685:boolean shouldComputeInitialFrame():996:996 -> a
+    2685:2685:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    2685:2685:boolean shouldComputeInitialFrame():991 -> a
     2685:2685:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):927 -> a
-    2686:2686:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):927:927 -> a
-    2687:2687:boolean shouldComputeInitialFrame():996:996 -> a
-    2687:2687:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):927 -> a
-    2688:2688:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):928:928 -> a
-    2689:2690:boolean shouldComputeInitialFrame():988:989 -> a
-    2689:2690:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):929 -> a
-    2691:2691:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    2691:2691:boolean shouldComputeInitialFrame():991 -> a
-    2691:2691:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):929 -> a
-    2692:2692:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    2686:2686:boolean shouldComputeInitialFrame():996:996 -> a
+    2686:2686:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):927 -> a
+    2687:2687:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):927:927 -> a
+    2688:2688:boolean shouldComputeInitialFrame():996:996 -> a
+    2688:2688:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):927 -> a
+    2689:2689:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):928:928 -> a
+    2690:2691:boolean shouldComputeInitialFrame():988:989 -> a
+    2690:2691:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):929 -> a
+    2692:2692:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
     2692:2692:boolean shouldComputeInitialFrame():991 -> a
     2692:2692:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):929 -> a
-    2693:2693:boolean shouldComputeInitialFrame():996:996 -> a
+    2693:2693:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    2693:2693:boolean shouldComputeInitialFrame():991 -> a
     2693:2693:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):929 -> a
-    2694:2694:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):930:930 -> a
-    2695:2714:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1002:1021 -> a
-    2695:2714:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):931 -> a
-    2715:2715:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
-    2715:2715:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1021 -> a
-    2715:2715:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):931 -> a
-    2716:2716:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1022:1022 -> a
+    2694:2694:boolean shouldComputeInitialFrame():996:996 -> a
+    2694:2694:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):929 -> a
+    2695:2695:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):930:930 -> a
+    2696:2715:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1002:1021 -> a
+    2696:2715:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):931 -> a
+    2716:2716:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
+    2716:2716:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1021 -> a
     2716:2716:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):931 -> a
-    2717:2717:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
-    2717:2717:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1024 -> a
+    2717:2717:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1022:1022 -> a
     2717:2717:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):931 -> a
-    2718:2728:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1025:1035 -> a
-    2718:2728:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):931 -> a
-    2729:2729:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):931:931 -> a
-    2730:2740:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):930:940 -> a
-    2741:2741:boolean com.android.tools.r8.cf.code.CfInstruction.isStore():0:0 -> a
-    2741:2741:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):940 -> a
-    2742:2746:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):940:944 -> a
-    2747:2753:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):943:949 -> a
-    2754:2754:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    2754:2754:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):949 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2755:2755:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):952:952 -> a
-    2756:2767:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.toDiagnostics(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.cf.code.CfInstruction,java.lang.String,com.android.tools.r8.graph.AppView):55:66 -> a
-    2756:2767:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):947 -> a
-    2768:2768:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):965:965 -> a
-    2768:2768:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):946 -> a
-    2769:2769:boolean shouldComputeInitialFrame():996:996 -> a
-    2769:2769:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):929 -> a
-    2776:2776:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):1042:1042 -> a
-    2777:2777:boolean lambda$isAssignablePredicate$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1042:1042 -> a
-    2778:2778:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1047:1047 -> a
-    2779:2779:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
-    2779:2779:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078 -> a
-    2779:2779:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1048 -> a
-    2780:2780:boolean com.android.tools.r8.graph.DexType.isCharType():288:288 -> a
-    2780:2780:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078 -> a
+    2718:2718:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
+    2718:2718:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1024 -> a
+    2718:2718:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):931 -> a
+    2719:2729:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1025:1035 -> a
+    2719:2729:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):931 -> a
+    2730:2730:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):931:931 -> a
+    2731:2741:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):930:940 -> a
+    2742:2742:boolean com.android.tools.r8.cf.code.CfInstruction.isStore():0:0 -> a
+    2742:2742:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):940 -> a
+    2743:2747:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):940:944 -> a
+    2748:2754:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):943:949 -> a
+    2755:2755:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    2755:2755:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):949 -> a
+    2756:2756:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):952:952 -> a
+    2757:2768:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.toDiagnostics(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.cf.code.CfInstruction,java.lang.String,com.android.tools.r8.graph.AppView):55:66 -> a
+    2757:2768:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):947 -> a
+    2769:2769:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):965:965 -> a
+    2769:2769:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):946 -> a
+    2770:2770:boolean shouldComputeInitialFrame():996:996 -> a
+    2770:2770:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):929 -> a
+    2777:2777:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):1042:1042 -> a
+    2778:2778:boolean lambda$isAssignablePredicate$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1042:1042 -> a
+    2779:2779:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1047:1047 -> a
+    2780:2780:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078:1078 -> a
     2780:2780:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1048 -> a
-    2781:2781:boolean com.android.tools.r8.graph.DexType.isShortType():292:292 -> a
+    2781:2781:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
     2781:2781:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078 -> a
     2781:2781:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1048 -> a
-    2782:2783:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078:1079 -> a
-    2782:2783:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1048 -> a
-    2784:2784:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
-    2784:2784:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078 -> a
-    2784:2784:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1049 -> a
-    2785:2785:boolean com.android.tools.r8.graph.DexType.isCharType():288:288 -> a
-    2785:2785:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078 -> a
-    2785:2785:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1049 -> a
-    2786:2786:boolean com.android.tools.r8.graph.DexType.isShortType():292:292 -> a
-    2786:2786:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078 -> a
+    2782:2782:boolean com.android.tools.r8.graph.DexType.isCharType():288:288 -> a
+    2782:2782:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078 -> a
+    2782:2782:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1048 -> a
+    2783:2783:boolean com.android.tools.r8.graph.DexType.isShortType():292:292 -> a
+    2783:2783:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078 -> a
+    2783:2783:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1048 -> a
+    2784:2785:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078:1079 -> a
+    2784:2785:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1048 -> a
+    2786:2786:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078:1078 -> a
     2786:2786:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1049 -> a
-    2787:2788:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078:1079 -> a
-    2787:2788:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1049 -> a
-    2789:2806:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1053:1070 -> a
-    2807:2811:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1069:1073 -> a
+    2787:2787:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
+    2787:2787:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078 -> a
+    2787:2787:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1049 -> a
+    2788:2788:boolean com.android.tools.r8.graph.DexType.isCharType():288:288 -> a
+    2788:2788:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078 -> a
+    2788:2788:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1049 -> a
+    2789:2789:boolean com.android.tools.r8.graph.DexType.isShortType():292:292 -> a
+    2789:2789:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078 -> a
+    2789:2789:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1049 -> a
+    2790:2791:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1078:1079 -> a
+    2790:2791:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1049 -> a
+    2792:2809:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1053:1070 -> a
+    2810:2814:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1069:1073 -> a
     1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.graph.CfCode):328:328 -> b
     2:6:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):505:509 -> b
     com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> b0
     1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.graph.CfCode):329:329 -> c
-    1:1:boolean computeEquals(java.lang.Object):452:452 -> g
     1:1:int computeHashCode():447:447 -> g0
+    1:1:boolean computeEquals(java.lang.Object):452:452 -> h
     com.android.tools.r8.graph.CfWritableCode asCfWritableCode() -> h0
     1:2:int countNonStackOperations(int):276:277 -> i
     1:2:boolean estimatedSizeForInliningAtMost(int):266 -> i
@@ -24392,7 +24226,7 @@
     1:1:int getMaxStack():219:219 -> x0
     1:1:com.android.tools.r8.graph.DexType getOriginalHolder():215:215 -> y0
     1:2:com.android.tools.r8.graph.CfCode$StackMapStatus getStackMapStatus():227:228 -> z0
-com.android.tools.r8.graph.CfCode$LocalVariableInfo -> com.android.tools.r8.graph.l$a:
+com.android.tools.r8.graph.CfCode$LocalVariableInfo -> com.android.tools.r8.graph.k$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.cf.code.CfLabel start -> c
@@ -24407,11 +24241,9 @@
     7:8:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):128:129 -> a
     9:9:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):43:43 -> a
     9:9:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):129 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:11:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):129:130 -> a
     12:12:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):43:43 -> a
     12:12:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):130 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:14:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):130:131 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel access$100(com.android.tools.r8.graph.CfCode$LocalVariableInfo):82:82 -> b
     2:2:int getIndex():107:107 -> b
@@ -24425,7 +24257,7 @@
     139:139:java.lang.String toString():136:136 -> toString
     140:140:java.lang.String toString():136:136 -> toString
     137:137:java.lang.String toString():136:136 -> toString
-com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.Q6:
+com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.L6:
     com.android.tools.r8.position.MethodPosition methodPosition -> c
     com.android.tools.r8.origin.Origin origin -> b
     java.lang.String diagnosticMessage -> d
@@ -24433,11 +24265,11 @@
     1:1:java.lang.String getDiagnosticMessage():26:26 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():16:16 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():21:21 -> getPosition
-com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.S6:
+com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.N6:
     int $r8$clinit -> b
     1:1:void <init>(java.lang.String):13:13 -> <init>
     1:1:com.android.tools.r8.graph.CfCodeStackMapValidatingException error(java.lang.String):17:17 -> a
-com.android.tools.r8.graph.CfCompareHelper -> com.android.tools.r8.graph.q:
+com.android.tools.r8.graph.CfCompareHelper -> com.android.tools.r8.graph.p:
     com.android.tools.r8.graph.CfCode code2 -> b
     com.android.tools.r8.graph.CfCode code1 -> a
     com.android.tools.r8.utils.structural.StructuralAcceptor lazyLabelAcceptor -> c
@@ -24456,7 +24288,7 @@
     9:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.graph.CfCode):18 -> a
     10:27:com.android.tools.r8.utils.structural.StructuralAcceptor labelAcceptor():84:101 -> a
     1:1:com.android.tools.r8.graph.CfCode access$200(com.android.tools.r8.graph.CfCompareHelper):18:18 -> b
-com.android.tools.r8.graph.CfCompareHelper$1 -> com.android.tools.r8.graph.m:
+com.android.tools.r8.graph.CfCompareHelper$1 -> com.android.tools.r8.graph.l:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labels1 -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labels2 -> b
     1:3:void <init>(com.android.tools.r8.graph.CfCompareHelper):86:88 -> <init>
@@ -24466,7 +24298,7 @@
     3:3:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):86:86 -> a
     4:4:void acceptHashing(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.HashingVisitor):97:97 -> a
     4:4:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):86 -> a
-com.android.tools.r8.graph.CfCompareHelper$2 -> com.android.tools.r8.graph.n:
+com.android.tools.r8.graph.CfCompareHelper$2 -> com.android.tools.r8.graph.m:
     com.android.tools.r8.graph.CfCompareHelper val$helper -> a
     1:1:void <init>(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.graph.CfCompareHelper):106:106 -> <init>
     1:1:int acceptCompareTo(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor):106:106 -> a
@@ -24478,7 +24310,7 @@
     8:8:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):106:106 -> a
     9:9:void acceptHashing(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.HashingVisitor):115:115 -> a
     9:9:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):106 -> a
-com.android.tools.r8.graph.CfCompareHelper$3 -> com.android.tools.r8.graph.o:
+com.android.tools.r8.graph.CfCompareHelper$3 -> com.android.tools.r8.graph.n:
     com.android.tools.r8.graph.CfCompareHelper val$helper -> a
     1:1:void <init>(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.graph.CfCompareHelper):122:122 -> <init>
     1:1:int acceptCompareTo(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor):122:122 -> a
@@ -24487,7 +24319,7 @@
     3:3:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):122:122 -> a
     4:4:void acceptHashing(com.android.tools.r8.cf.code.CfTryCatch,com.android.tools.r8.utils.structural.HashingVisitor):130:130 -> a
     4:4:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):122 -> a
-com.android.tools.r8.graph.CfCompareHelper$4 -> com.android.tools.r8.graph.p:
+com.android.tools.r8.graph.CfCompareHelper$4 -> com.android.tools.r8.graph.o:
     com.android.tools.r8.graph.CfCompareHelper val$helper -> a
     1:1:void <init>(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.graph.CfCompareHelper):137:137 -> <init>
     1:1:int acceptCompareTo(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor):137:137 -> a
@@ -24496,12 +24328,12 @@
     3:3:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):137:137 -> a
     4:4:void acceptHashing(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.utils.structural.HashingVisitor):146:146 -> a
     4:4:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):137 -> a
-com.android.tools.r8.graph.CfWritableCode -> com.android.tools.r8.internal.a9:
+com.android.tools.r8.graph.CfWritableCode -> com.android.tools.r8.internal.Q8:
     com.android.tools.r8.graph.CfCode asCfCode() -> F
     void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> a
     void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor) -> a
     com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> b0
-com.android.tools.r8.graph.ClassAccessFlags -> com.android.tools.r8.graph.r:
+com.android.tools.r8.graph.ClassAccessFlags -> com.android.tools.r8.graph.q:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(int,int):58:58 -> <init>
@@ -24546,24 +24378,24 @@
     2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):73 -> j
     1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):67:69 -> k
     com.android.tools.r8.graph.AccessFlags self() -> y
-com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.Q9:
+com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.F9:
     com.android.tools.r8.graph.MethodCollection getMethodCollection() -> P
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> T
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> l
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.S9:
+com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.H9:
     java.util.Deque worklist -> d
-    com.android.tools.r8.graph.AppView appView -> a
     java.util.Set visited -> c
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope scope -> b
     boolean excludeInterfaces -> e
     boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.DexDefinitionSupplier definitionSupplier -> a
     1:1:void <clinit>():15:15 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):52:52 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):47:54 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):52:52 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):47:54 -> <init>
     void addDependentsToWorklist(com.android.tools.r8.graph.DexClass) -> a
     1:22:void visit(java.lang.Iterable,java.util.function.Consumer):65:86 -> a
     23:36:void visit(java.lang.Iterable,java.util.function.Consumer):69:82 -> a
-com.android.tools.r8.graph.ClassKind -> com.android.tools.r8.graph.t:
+com.android.tools.r8.graph.ClassKind -> com.android.tools.r8.graph.s:
     com.android.tools.r8.graph.ClassKind CLASSPATH -> d
     com.android.tools.r8.graph.ClassKind LIBRARY -> e
     java.util.function.Predicate check -> b
@@ -24576,11 +24408,11 @@
     1:1:com.android.tools.r8.graph.DexProgramClass lambda$static$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker):39:39 -> b
     1:1:com.android.tools.r8.graph.DexClasspathClass lambda$static$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker):83:83 -> c
     1:1:com.android.tools.r8.graph.DexLibraryClass lambda$static$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker):125:125 -> d
-com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.graph.s:
+com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.graph.r:
     com.android.tools.r8.graph.DexClass create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker) -> a
-com.android.tools.r8.graph.ClasspathDefinition -> com.android.tools.r8.internal.vb:
+com.android.tools.r8.graph.ClasspathDefinition -> com.android.tools.r8.internal.bb:
     1:1:com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext):21:21 -> a
-com.android.tools.r8.graph.ClasspathField -> com.android.tools.r8.graph.u:
+com.android.tools.r8.graph.ClasspathField -> com.android.tools.r8.graph.t:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexEncodedField):11:11 -> <init>
@@ -24591,7 +24423,7 @@
     3:3:com.android.tools.r8.graph.DexClass getHolder():7 -> r
     4:5:com.android.tools.r8.graph.DexClasspathClass getHolder():32:33 -> r
     4:5:com.android.tools.r8.graph.DexClass getHolder():7 -> r
-com.android.tools.r8.graph.ClasspathMethod -> com.android.tools.r8.graph.v:
+com.android.tools.r8.graph.ClasspathMethod -> com.android.tools.r8.graph.u:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexEncodedMethod):13:13 -> <init>
@@ -24601,17 +24433,17 @@
     4:5:com.android.tools.r8.graph.DexClasspathClass getHolder():44:45 -> F
     com.android.tools.r8.graph.ClasspathMethod asClasspathMethod() -> a0
     1:1:com.android.tools.r8.graph.DexClass getHolder():9:9 -> r
-com.android.tools.r8.graph.ClasspathOrLibraryClass -> com.android.tools.r8.internal.wb:
-com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.xb:
+com.android.tools.r8.graph.ClasspathOrLibraryClass -> com.android.tools.r8.internal.cb:
+com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.db:
     com.android.tools.r8.graph.Definition context -> b
     com.android.tools.r8.graph.ProgramDerivedContext programDerivedContext -> c
     1:3:void <init>(com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.ProgramDerivedContext):17:19 -> <init>
     1:1:com.android.tools.r8.graph.ClasspathOrLibraryContext create(com.android.tools.r8.graph.ClasspathDefinition,com.android.tools.r8.graph.ProgramDerivedContext):24:24 -> a
     2:2:com.android.tools.r8.graph.ClasspathOrLibraryContext create(com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.ProgramDerivedContext):29:29 -> a
     1:1:com.android.tools.r8.graph.Definition getContext():34:34 -> getContext
-com.android.tools.r8.graph.ClasspathOrLibraryDefinition -> com.android.tools.r8.internal.yb:
+com.android.tools.r8.graph.ClasspathOrLibraryDefinition -> com.android.tools.r8.internal.eb:
     com.android.tools.r8.graph.ClasspathOrLibraryDefinition asClasspathOrLibraryDefinition() -> e
-com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.w:
+com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.v:
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.graph.CfCode asCfCode():122:122 -> F
     1:1:com.android.tools.r8.graph.DexCode asDexCode():134:134 -> J
@@ -24644,7 +24476,7 @@
     boolean isSharedCodeObject() -> r0
     com.android.tools.r8.graph.ThrowExceptionCode asThrowExceptionCode() -> s
     boolean verifyNoInputReaders() -> s0
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.Le:
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.qe:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexString signature -> d
     com.android.tools.r8.graph.DexType type -> c
@@ -24664,7 +24496,7 @@
     1:3:int hashCode():113:115 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():49:49 -> n
     1:1:java.lang.String toString():122:122 -> toString
-com.android.tools.r8.graph.DefaultInstanceInitializerCode -> com.android.tools.r8.graph.y:
+com.android.tools.r8.graph.DefaultInstanceInitializerCode -> com.android.tools.r8.graph.x:
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
     com.android.tools.r8.graph.DefaultInstanceInitializerCode INSTANCE -> d
@@ -24706,7 +24538,6 @@
     60:60:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):138:138 -> a
     61:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
     61:61:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):138 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     62:62:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):139:139 -> a
     63:63:void com.android.tools.r8.graph.DefaultInstanceInitializerCode$DefaultInstanceInitializerSourceCode.<init>(com.android.tools.r8.graph.DexMethod):388:388 -> a
     63:63:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):139 -> a
@@ -24714,53 +24545,51 @@
     65:65:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):155:155 -> a
     66:66:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
     66:66:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):155 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     67:71:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):156:160 -> a
     72:72:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):174:174 -> a
-    73:73:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():21:21 -> a
-    73:73:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    73:73:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> a
     73:73:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):174 -> a
-    74:74:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> a
+    74:74:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():21:21 -> a
+    74:74:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228 -> a
     74:74:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):174 -> a
-    75:75:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
+    75:75:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> a
     75:75:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):174 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    76:76:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
-    76:76:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
-    76:76:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):174 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    77:77:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    77:77:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
-    77:77:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    76:76:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):174:174 -> a
+    77:77:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
     77:77:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):174 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    78:78:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):224:224 -> a
-    78:78:int getRegisterSize(com.android.tools.r8.graph.ProgramMethod):250 -> a
-    79:79:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):309:309 -> a
-    79:79:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):300 -> a
-    80:80:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> a
-    80:80:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):309 -> a
-    80:80:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):300 -> a
+    78:78:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
+    78:78:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    78:78:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):174 -> a
+    79:79:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    79:79:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
+    79:79:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    79:79:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):174 -> a
+    80:80:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):224:224 -> a
+    80:80:int getRegisterSize(com.android.tools.r8.graph.ProgramMethod):250 -> a
     81:81:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):309:309 -> a
     81:81:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):300 -> a
-    82:82:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):309:309 -> a
-    82:82:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):305 -> a
-    83:83:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> a
-    83:83:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):309 -> a
-    83:83:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):305 -> a
+    82:82:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> a
+    82:82:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):309 -> a
+    82:82:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):300 -> a
+    83:83:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):309:309 -> a
+    83:83:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):300 -> a
     84:84:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):309:309 -> a
     84:84:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):305 -> a
-    85:88:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):346:349 -> a
-    89:97:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):347:355 -> a
-    98:98:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):365:365 -> a
-    99:99:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():21:21 -> a
-    99:99:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228 -> a
-    99:99:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):365 -> a
-    100:100:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> a
-    100:100:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):365 -> a
-    101:103:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):365:367 -> a
-    104:104:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):382:382 -> a
+    85:85:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> a
+    85:85:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):309 -> a
+    85:85:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):305 -> a
+    86:86:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):309:309 -> a
+    86:86:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):305 -> a
+    87:90:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):346:349 -> a
+    91:99:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):347:355 -> a
+    100:100:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):365:365 -> a
+    101:101:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():21:21 -> a
+    101:101:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228 -> a
+    101:101:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):365 -> a
+    102:102:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> a
+    102:102:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):365 -> a
+    103:105:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):365:367 -> a
+    106:106:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):382:382 -> a
     1:1:boolean lambda$hasDefaultInstanceInitializerCode$1(com.android.tools.r8.cf.code.CfInstruction):111:111 -> b
     2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> b
     2:2:boolean lambda$hasDefaultInstanceInitializerCode$1(com.android.tools.r8.cf.code.CfInstruction):111 -> b
@@ -24768,8 +24597,8 @@
     com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> b0
     void setCallSiteContexts(com.android.tools.r8.graph.ProgramMethod) -> c
     1:3:int getMaxLocals(com.android.tools.r8.graph.ProgramMethod):232:234 -> d
-    boolean computeEquals(java.lang.Object) -> g
     1:1:int computeHashCode():184:184 -> g0
+    boolean computeEquals(java.lang.Object) -> h
     com.android.tools.r8.graph.CfWritableCode asCfWritableCode() -> h0
     com.android.tools.r8.graph.DexWritableCode asDexWritableCode() -> i0
     int estimatedDexCodeSizeUpperBoundInBytes() -> k0
@@ -24781,28 +24610,30 @@
     1:1:com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers():214:214 -> v
     com.android.tools.r8.graph.DexString getHighestSortingString() -> x
     int getOutgoingRegisterSize() -> z
-com.android.tools.r8.graph.DefaultInstanceInitializerCode$DefaultInstanceInitializerSourceCode -> com.android.tools.r8.graph.x:
+com.android.tools.r8.graph.DefaultInstanceInitializerCode$DefaultInstanceInitializerSourceCode -> com.android.tools.r8.graph.w:
     1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):393:398 -> <init>
     7:7:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):392:392 -> <init>
     1:1:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):405:405 -> d
     2:2:com.android.tools.r8.ir.code.InvokeDirect$Builder com.android.tools.r8.ir.code.InvokeDirect.builder():50:50 -> d
     2:2:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):405 -> d
     3:3:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):408:408 -> d
-    4:4:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.IRBuilder.dexItemFactory():495:495 -> d
+    4:4:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.IRBuilder.dexItemFactory():491:491 -> d
     4:4:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):408 -> d
     5:5:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):407:407 -> d
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():21:21 -> d
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DefaultInstanceInitializerCode.getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228 -> d
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DefaultInstanceInitializerCode.getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> d
     6:6:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):407 -> d
-    7:7:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DefaultInstanceInitializerCode.getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> d
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():21:21 -> d
+    7:7:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DefaultInstanceInitializerCode.getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228 -> d
     7:7:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):407 -> d
-    8:11:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):406:409 -> d
-    12:12:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> d
-    12:12:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):409 -> d
-    13:14:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):409:410 -> d
-    15:15:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):404:404 -> d
+    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DefaultInstanceInitializerCode.getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> d
+    8:8:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):407 -> d
+    9:12:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):406:409 -> d
+    13:13:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> d
+    13:13:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):409 -> d
+    14:15:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):409:410 -> d
+    16:16:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):404:404 -> d
     1:1:java.util.List getInstructionBuilders():402:402 -> f
-com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.hf:
+com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.Le:
     com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> H
     com.android.tools.r8.graph.ProgramField asProgramField() -> K
     com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> N
@@ -24828,7 +24659,7 @@
     com.android.tools.r8.graph.ProgramMember asProgramMember() -> o
     1:1:boolean isMember():56:56 -> w
     com.android.tools.r8.graph.DexType getContextType() -> y
-com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.graph.z:
+com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.graph.y:
     com.android.tools.r8.graph.DexEncodedAnnotation annotation -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexAnnotation[] EMPTY_ARRAY -> d
@@ -24864,7 +24695,7 @@
     85:87:com.android.tools.r8.graph.DexAnnotation createSystemValueAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexValue):298:300 -> a
     88:92:com.android.tools.r8.graph.DexValue getSystemValueAnnotationValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):305:309 -> a
     93:114:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSynthesizedClassAnnotationInfo(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):410:431 -> a
-    115:116:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.fromDescriptor(java.lang.String):104:105 -> a
+    115:116:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.fromDescriptor(java.lang.String):117:118 -> a
     115:116:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSynthesizedClassAnnotationInfo(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):430 -> a
     117:124:com.android.tools.r8.graph.DexAnnotation rewrite(java.util.function.Function):436:443 -> a
     1:1:com.android.tools.r8.graph.DexEncodedAnnotation lambda$specify$0(com.android.tools.r8.graph.DexAnnotation):60:60 -> b
@@ -24882,7 +24713,7 @@
     1:1:boolean isSignatureAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):319:319 -> i
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():75:75 -> n
     1:1:java.lang.String toString():101:101 -> toString
-com.android.tools.r8.graph.DexAnnotation$AnnotatedKind -> com.android.tools.r8.internal.bg:
+com.android.tools.r8.graph.DexAnnotation$AnnotatedKind -> com.android.tools.r8.internal.Jf:
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind FIELD -> b
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind METHOD -> c
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind TYPE -> d
@@ -24894,7 +24725,7 @@
     3:3:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$from$0(com.android.tools.r8.graph.DexType):44:44 -> a
     4:4:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$from$1(com.android.tools.r8.graph.DexField):44:44 -> a
     5:5:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$from$2(com.android.tools.r8.graph.DexMethod):44:44 -> a
-com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.graph.A:
+com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.graph.z:
     java.util.List fieldAnnotations -> e
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     java.util.List parameterAnnotations -> d
@@ -24918,7 +24749,7 @@
     1:11:boolean equals(java.lang.Object):73:83 -> equals
     1:1:com.android.tools.r8.graph.DexAnnotationSet getClazzAnnotations():45:45 -> g0
     1:4:int hashCode():88:91 -> hashCode
-com.android.tools.r8.graph.DexAnnotationElement -> com.android.tools.r8.graph.B:
+com.android.tools.r8.graph.DexAnnotationElement -> com.android.tools.r8.graph.A:
     com.android.tools.r8.graph.DexValue value -> c
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexAnnotationElement[] EMPTY_ARRAY -> d
@@ -24935,7 +24766,7 @@
     1:1:int hashCode():43:43 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():34:34 -> n
     1:1:java.lang.String toString():60:60 -> toString
-com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.graph.C:
+com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.graph.B:
     com.android.tools.r8.graph.DexAnnotation[] annotations -> d
     int sorted -> e
     boolean $assertionsDisabled -> h
@@ -24953,22 +24784,25 @@
     4:4:boolean com.android.tools.r8.utils.ArrayUtils.isEmpty(java.lang.Object[]):51:51 -> a
     4:4:com.android.tools.r8.graph.DexAnnotationSet create(com.android.tools.r8.graph.DexAnnotation[]):52 -> a
     5:5:com.android.tools.r8.graph.DexAnnotationSet create(com.android.tools.r8.graph.DexAnnotation[]):52:52 -> a
-    6:7:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):127:128 -> a
-    8:9:void sort(com.android.tools.r8.naming.NamingLens):136:137 -> a
-    10:10:int sortedHashCode():175:175 -> a
-    10:10:void sort(com.android.tools.r8.naming.NamingLens):137 -> a
-    11:20:void sort(com.android.tools.r8.naming.NamingLens):137:146 -> a
-    21:21:int lambda$sort$1(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):142:142 -> a
-    22:23:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):150:151 -> a
-    24:24:com.android.tools.r8.graph.DexAnnotation lambda$removeIf$2(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):204:204 -> a
-    25:25:com.android.tools.r8.graph.DexAnnotationSet removeIf(java.util.function.Predicate):204:204 -> a
-    26:30:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):208:212 -> a
-    31:54:com.android.tools.r8.graph.DexAnnotationSet methodParametersWithFakeThisArguments(com.android.tools.r8.graph.DexItemFactory):217:240 -> a
-    55:65:com.android.tools.r8.graph.DexAnnotationSet methodParametersWithFakeThisArguments(com.android.tools.r8.graph.DexItemFactory):239:249 -> a
+    6:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:121 -> a
+    8:8:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
+    8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
+    9:10:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):127:128 -> a
+    11:12:void sort(com.android.tools.r8.naming.NamingLens):136:137 -> a
+    13:13:int sortedHashCode():175:175 -> a
+    13:13:void sort(com.android.tools.r8.naming.NamingLens):137 -> a
+    14:23:void sort(com.android.tools.r8.naming.NamingLens):137:146 -> a
+    24:24:int lambda$sort$1(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):142:142 -> a
+    25:26:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):150:151 -> a
+    27:27:com.android.tools.r8.graph.DexAnnotation lambda$removeIf$2(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):204:204 -> a
+    28:28:com.android.tools.r8.graph.DexAnnotationSet removeIf(java.util.function.Predicate):204:204 -> a
+    29:33:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):208:212 -> a
+    34:57:com.android.tools.r8.graph.DexAnnotationSet methodParametersWithFakeThisArguments(com.android.tools.r8.graph.DexItemFactory):217:240 -> a
+    58:68:com.android.tools.r8.graph.DexAnnotationSet methodParametersWithFakeThisArguments(com.android.tools.r8.graph.DexItemFactory):239:249 -> a
     1:8:com.android.tools.r8.graph.DexAnnotationSet getWithout(com.android.tools.r8.graph.DexType):160:167 -> b
     1:2:void forEach(java.util.function.Consumer):92:93 -> forEach
-    1:3:boolean computeEquals(java.lang.Object):112:114 -> g
     1:1:int computeHashCode():107:107 -> g0
+    1:3:boolean computeEquals(java.lang.Object):112:114 -> h
     1:1:com.android.tools.r8.graph.DexAnnotationSet empty():88:88 -> h0
     1:1:com.android.tools.r8.graph.DexAnnotation get(int):56:56 -> i0
     1:1:com.android.tools.r8.graph.DexAnnotation getFirst():60 -> i0
@@ -24977,7 +24811,7 @@
     1:1:int size():102:102 -> size
     1:1:java.util.stream.Stream stream():98:98 -> stream
     1:1:java.lang.String toString():254:254 -> toString
-com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.graph.E:
+com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.graph.D:
     com.android.tools.r8.naming.ClassNameMapper proguardMap -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
     com.android.tools.r8.utils.Timing timing -> c
@@ -25006,13 +24840,13 @@
     1:1:com.android.tools.r8.naming.ClassNameMapper getProguardMap():143:143 -> g
     java.util.List programClasses() -> h
     com.android.tools.r8.graph.DirectMappedDexApplication toDirect() -> i
-com.android.tools.r8.graph.DexApplication$1 -> com.android.tools.r8.graph.D:
+com.android.tools.r8.graph.DexApplication$1 -> com.android.tools.r8.graph.C:
     com.android.tools.r8.graph.DexApplication val$self -> b
     com.android.tools.r8.synthesis.SyntheticDefinitionsProvider val$syntheticDefinitionsProvider -> a
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticDefinitionsProvider,com.android.tools.r8.graph.DexApplication):67:67 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():75:75 -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):70:70 -> c
-com.android.tools.r8.graph.DexApplication$Builder -> com.android.tools.r8.graph.E$a:
+com.android.tools.r8.graph.DexApplication$Builder -> com.android.tools.r8.graph.D$a:
     java.util.List dataResourceProviders -> b
     java.util.List programClasses -> a
     com.android.tools.r8.utils.Timing timing -> e
@@ -25038,12 +24872,12 @@
     com.android.tools.r8.graph.DexApplication build() -> b
     1:1:java.util.List getProgramClasses():242:242 -> c
     com.android.tools.r8.graph.DexApplication$Builder self() -> d
-com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.graph.F:
+com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.graph.E:
     java.util.List classes -> a
     1:2:void <init>(java.util.List):90:91 -> <init>
     1:1:java.util.List getClasses():104:104 -> a
     1:3:boolean reorderClasses():96:98 -> b
-com.android.tools.r8.graph.DexApplicationReadFlags -> com.android.tools.r8.internal.cg:
+com.android.tools.r8.graph.DexApplicationReadFlags -> com.android.tools.r8.internal.Kf:
     boolean hasReadProgramClassFromDex -> a
     boolean hasReadProgramClassFromCf -> b
     boolean hasReadRecordReferenceFromProgramClass -> c
@@ -25051,7 +24885,7 @@
     1:1:boolean hasReadProgramClassFromCf():24:24 -> a
     1:1:boolean hasReadProgramClassFromDex():28:28 -> b
     1:1:boolean hasReadRecordReferenceFromProgramClass():32:32 -> c
-com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.qg:
+com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.Yf:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     1:3:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):27:29 -> <init>
@@ -25090,9 +24924,9 @@
     void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> d
-com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.pg:
+com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.Xf:
     java.io.PrintStream get(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.I:
+com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.G:
     com.android.tools.r8.graph.DexString methodName -> e
     com.android.tools.r8.graph.DexMethod method -> j
     int instructionOffset -> k
@@ -25116,14 +24950,13 @@
     1:1:com.android.tools.r8.graph.DexMethodHandle lambda$specify$4(com.android.tools.r8.graph.DexCallSite):54:54 -> e
     1:1:java.lang.String toSmaliString():187:187 -> e0
     1:1:java.util.Collection lambda$specify$5(com.android.tools.r8.graph.DexCallSite):55:55 -> f
-    boolean computeEquals(java.lang.Object) -> g
     1:1:int computeHashCode():137:137 -> g0
+    boolean computeEquals(java.lang.Object) -> h
     1:14:com.android.tools.r8.graph.DexEncodedArray getEncodedArray():297:310 -> h0
     1:1:java.lang.String getHash():191:191 -> i0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():120:120 -> n
     1:11:java.lang.String toString():150:160 -> toString
-com.android.tools.r8.graph.DexCallSite$1 -> com.android.tools.r8.graph.G:
-com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.graph.H:
+com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.graph.F:
     java.io.ByteArrayOutputStream bytes -> a
     com.android.tools.r8.graph.DexCallSite this$0 -> c
     java.io.ObjectOutputStream out -> b
@@ -25221,7 +25054,7 @@
     107:108:void write(com.android.tools.r8.graph.DexMethodHandle):212 -> a
     107:108:java.lang.String build():283 -> a
     109:116:java.lang.String build():284:291 -> a
-com.android.tools.r8.graph.DexClass -> com.android.tools.r8.graph.J:
+com.android.tools.r8.graph.DexClass -> com.android.tools.r8.graph.H:
     com.android.tools.r8.graph.GenericSignature$ClassSignature classSignature -> r
     com.android.tools.r8.graph.ClassAccessFlags accessFlags -> f
     java.util.List nestMembers -> q
@@ -25261,36 +25094,36 @@
     463:463:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):122:122 -> <init>
     460:460:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):122:122 -> <init>
     1:2:com.android.tools.r8.graph.DexEncodedField[] clearInstanceFields():479:480 -> A0
-    1:1:void clearNestHost():1095:1095 -> B0
-    1:1:void clearNestMembers():1099:1099 -> C0
+    1:1:void clearNestHost():1104:1104 -> B0
+    1:1:void clearNestMembers():1108:1108 -> C0
     1:2:com.android.tools.r8.graph.DexEncodedField[] clearStaticFields():387:388 -> D0
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():994:995 -> E0
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():1003:1004 -> E0
     1:1:java.lang.Iterable directMethods():229:229 -> F0
     1:1:java.lang.Iterable fields():189:189 -> G0
     1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():165:165 -> H0
     1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():739:740 -> I0
     1:1:com.android.tools.r8.references.ClassReference getClassReference():746:746 -> J0
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():1063:1063 -> K0
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1012:1012 -> L0
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():1042:1043 -> M0
-    1:1:java.util.List getInnerClasses():1000:1000 -> N0
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():1072:1072 -> K0
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1021:1021 -> L0
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():1051:1052 -> M0
+    1:1:java.util.List getInnerClasses():1009:1009 -> N0
     1:1:com.android.tools.r8.graph.DexTypeList getInterfaces():169:169 -> O0
     1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():208:208 -> P
-    1:5:com.android.tools.r8.graph.DexType getNestHost():1120:1124 -> P0
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():1135:1135 -> Q0
-    1:1:java.util.List getNestMembersClassAttributes():1143:1143 -> R0
-    1:1:java.lang.String getSimpleName():1158:1158 -> S0
+    1:5:com.android.tools.r8.graph.DexType getNestHost():1129:1133 -> P0
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():1144:1144 -> Q0
+    1:1:java.util.List getNestMembersClassAttributes():1152:1152 -> R0
+    1:1:java.lang.String getSimpleName():1167:1167 -> S0
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> T
     1:1:com.android.tools.r8.graph.DexString getSourceFile():177:177 -> T0
     1:1:com.android.tools.r8.graph.DexType getSuperType():770:770 -> U0
-    1:1:java.lang.String getTypeName():1162:1162 -> V0
+    1:1:java.lang.String getTypeName():1171:1171 -> V0
     1:1:boolean hasClassInitializer():774:774 -> W0
-    1:1:boolean hasEnclosingMethodAttribute():1008:1008 -> X0
-    1:1:boolean hasInstanceFields():1170:1170 -> Y0
-    1:1:boolean hasNestMemberAttributes():1139:1139 -> Z0
+    1:1:boolean hasEnclosingMethodAttribute():1017:1017 -> X0
+    1:1:boolean hasInstanceFields():1179:1179 -> Y0
+    1:1:boolean hasNestMemberAttributes():1148:1148 -> Z0
     void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer) -> a
     boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set) -> a
-    java.util.Iterator lambda$allImmediateSupertypes$8(java.util.Iterator) -> a
+    java.util.Iterator lambda$allImmediateSupertypes$9(java.util.Iterator) -> a
     1:1:void forEachClassFieldMatching(java.util.function.Predicate,java.util.function.Consumer):149:149 -> a
     2:2:void forEachFieldMatching(java.util.function.Predicate,java.util.function.Consumer):322:322 -> a
     2:2:void forEachClassFieldMatching(java.util.function.Predicate,java.util.function.Consumer):149 -> a
@@ -25337,83 +25170,74 @@
     58:58:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):841:841 -> a
     58:58:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):848 -> a
     59:59:boolean lambda$classInitializationMayHaveSideEffectsInContext$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):849:849 -> a
-    60:63:void forEachImmediateInterface(java.util.function.BiConsumer):877:880 -> a
+    60:63:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):885:888 -> a
     64:64:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
-    64:64:void forEachImmediateInterface(java.util.function.BiConsumer):880 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    65:66:void forEachImmediateInterface(java.util.function.BiConsumer):880:881 -> a
+    64:64:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):888 -> a
+    65:66:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):888:889 -> a
     67:68:void forEachImmediateInterface(java.util.function.Consumer):859:860 -> a
-    67:68:void forEachImmediateInterface(java.util.function.BiConsumer):881 -> a
-    69:71:void forEachImmediateInterface(java.util.function.BiConsumer):887:889 -> a
+    67:68:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):889 -> a
+    69:71:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):895:897 -> a
     72:72:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
-    72:72:void forEachImmediateInterface(java.util.function.BiConsumer):889 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    73:79:void forEachImmediateInterface(java.util.function.BiConsumer):889:895 -> a
-    80:80:void lambda$forEachImmediateInterface$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):883:883 -> a
-    81:84:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):909:912 -> a
-    85:85:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
-    85:85:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):912 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    86:87:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):912:913 -> a
-    88:89:void forEachImmediateInterface(java.util.function.Consumer):859:860 -> a
-    88:89:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):913 -> a
-    90:92:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):918:920 -> a
-    93:93:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
-    93:93:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):920 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    94:102:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):920:928 -> a
-    103:104:boolean com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.hasTypeVariableArguments():651:652 -> a
-    103:104:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):928 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    105:111:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):929:935 -> a
-    112:114:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):950:952 -> a
+    72:72:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):897 -> a
+    73:79:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):897:903 -> a
+    80:83:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):918:921 -> a
+    84:84:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
+    84:84:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):921 -> a
+    85:86:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):921:922 -> a
+    87:88:void forEachImmediateInterface(java.util.function.Consumer):859:860 -> a
+    87:88:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):922 -> a
+    89:91:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):927:929 -> a
+    92:92:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
+    92:92:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):929 -> a
+    93:101:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):929:937 -> a
+    102:103:boolean com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.hasTypeVariableArguments():651:652 -> a
+    102:103:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):937 -> a
+    104:110:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):938:944 -> a
+    111:111:void lambda$forEachImmediateInterfaceWithAppliedTypeArguments$7(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):923:923 -> a
+    112:114:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):959:961 -> a
     115:115:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():605:605 -> a
-    115:115:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):955 -> a
-    116:137:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):955:976 -> a
-    138:139:void lambda$applyTypeArguments$7(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):958:959 -> a
+    115:115:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):964 -> a
+    116:137:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):964:985 -> a
+    138:139:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):967:968 -> a
     140:140:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
-    140:140:void lambda$applyTypeArguments$7(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):959 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    141:143:void lambda$applyTypeArguments$7(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):959:961 -> a
+    140:140:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):968 -> a
+    141:143:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):968:970 -> a
     144:144:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
-    144:144:void lambda$applyTypeArguments$7(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):961 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    145:145:void lambda$applyTypeArguments$7(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):961:961 -> a
-    146:146:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():182:182 -> a
-    146:146:void lambda$applyTypeArguments$7(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):963 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    147:147:void lambda$applyTypeArguments$7(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):964:964 -> a
-    148:148:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():747:747 -> a
-    148:148:void lambda$applyTypeArguments$7(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):964 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    149:158:void lambda$applyTypeArguments$7(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):964:973 -> a
-    159:159:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):990:990 -> a
-    160:160:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):560:560 -> a
-    160:160:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):990 -> a
-    161:161:void setInnerClasses(java.util.List):1004:1004 -> a
-    162:162:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):1016:1016 -> a
-    163:163:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):1067:1067 -> a
-    164:165:void setNestHost(com.android.tools.r8.graph.DexType):1103:1104 -> a
-    166:166:void setNestHostAttribute(com.android.tools.r8.graph.NestHostClassAttribute):1108:1108 -> a
-    167:167:void lambda$forEachNestMember$10(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):1131:1131 -> a
-    168:168:boolean isValid(com.android.tools.r8.utils.InternalOptions):1195:1195 -> a
-    169:171:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):278:280 -> a
-    169:171:boolean isValid(com.android.tools.r8.utils.InternalOptions):1195 -> a
-    172:172:boolean isValid(com.android.tools.r8.utils.InternalOptions):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":180,"2":181,"3":182}}
-    180:180:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):280:280 -> a
-    180:180:boolean isValid(com.android.tools.r8.utils.InternalOptions):1195 -> a
-    181:181:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):280:280 -> a
-    181:181:boolean isValid(com.android.tools.r8.utils.InternalOptions):1195 -> a
+    144:144:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):970 -> a
+    145:147:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):970:972 -> a
+    148:148:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():182:182 -> a
+    148:148:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):972 -> a
+    149:149:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):973:973 -> a
+    150:150:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():747:747 -> a
+    150:150:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):973 -> a
+    151:160:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):973:982 -> a
+    161:161:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):999:999 -> a
+    162:162:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):560:560 -> a
+    162:162:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):999 -> a
+    163:163:void setInnerClasses(java.util.List):1013:1013 -> a
+    164:164:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):1025:1025 -> a
+    165:165:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):1076:1076 -> a
+    166:167:void setNestHost(com.android.tools.r8.graph.DexType):1112:1113 -> a
+    168:168:void setNestHostAttribute(com.android.tools.r8.graph.NestHostClassAttribute):1117:1117 -> a
+    169:169:void lambda$forEachNestMember$11(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):1140:1140 -> a
+    170:170:boolean isValid(com.android.tools.r8.utils.InternalOptions):1204:1204 -> a
+    171:173:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):278:280 -> a
+    171:173:boolean isValid(com.android.tools.r8.utils.InternalOptions):1204 -> a
+    174:174:boolean isValid(com.android.tools.r8.utils.InternalOptions):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":182,"2":183,"3":184}}
     182:182:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):280:280 -> a
-    182:182:boolean isValid(com.android.tools.r8.utils.InternalOptions):1195 -> a
-    173:173:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):282:282 -> a
-    173:173:boolean isValid(com.android.tools.r8.utils.InternalOptions):1195 -> a
-    174:175:boolean isValid(com.android.tools.r8.utils.InternalOptions):1196:1197 -> a
-    176:177:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):495:496 -> a
-    176:177:boolean isValid(com.android.tools.r8.utils.InternalOptions):1197 -> a
-    178:179:boolean isValid(com.android.tools.r8.utils.InternalOptions):1198:1199 -> a
-    1:1:boolean hasStaticFields():1166:1166 -> a1
+    182:182:boolean isValid(com.android.tools.r8.utils.InternalOptions):1204 -> a
+    183:183:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):280:280 -> a
+    183:183:boolean isValid(com.android.tools.r8.utils.InternalOptions):1204 -> a
+    184:184:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):280:280 -> a
+    184:184:boolean isValid(com.android.tools.r8.utils.InternalOptions):1204 -> a
+    175:175:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):282:282 -> a
+    175:175:boolean isValid(com.android.tools.r8.utils.InternalOptions):1204 -> a
+    176:177:boolean isValid(com.android.tools.r8.utils.InternalOptions):1205:1206 -> a
+    178:179:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):495:496 -> a
+    178:179:boolean isValid(com.android.tools.r8.utils.InternalOptions):1206 -> a
+    180:181:boolean isValid(com.android.tools.r8.utils.InternalOptions):1207:1208 -> a
+    1:1:boolean hasStaticFields():1175:1175 -> a1
     com.android.tools.r8.graph.DexClass getContextClass() -> b
     1:1:void forEachClassMethodMatching(java.util.function.Predicate,java.util.function.Consumer):159:159 -> b
     2:2:com.android.tools.r8.graph.DexClassAndMethod lambda$classMethods$3(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> b
@@ -25437,11 +25261,13 @@
     26:27:void forEachImmediateSupertype(java.util.function.Consumer):865:866 -> b
     28:29:void forEachImmediateInterface(java.util.function.Consumer):859:860 -> b
     28:29:void forEachImmediateSupertype(java.util.function.Consumer):868 -> b
-    30:33:void forEachImmediateSupertype(java.util.function.BiConsumer):900:903 -> b
-    34:34:void lambda$forEachImmediateInterfaceWithAppliedTypeArguments$6(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):914:914 -> b
-    35:37:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):941:943 -> b
-    38:41:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):942:945 -> b
-    42:42:void setNestMemberAttributes(java.util.List):1147:1147 -> b
+    30:33:void forEachImmediateSupertype(java.util.function.BiConsumer):872:875 -> b
+    34:35:void forEachImmediateInterface(java.util.function.Consumer):859:860 -> b
+    34:35:void forEachImmediateSupertype(java.util.function.BiConsumer):875 -> b
+    36:36:void lambda$forEachImmediateInterfaceWithSignature$6(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):891:891 -> b
+    37:39:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):950:952 -> b
+    40:43:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):951:954 -> b
+    44:44:void setNestMemberAttributes(java.util.List):1156:1156 -> b
     1:5:java.util.List instanceFields():425:429 -> b1
     1:1:com.android.tools.r8.graph.DexClassAndField lambda$classFields$2(com.android.tools.r8.graph.DexEncodedField):185:185 -> c
     2:4:java.lang.Iterable fields(java.util.function.Predicate):193:195 -> c
@@ -25463,6 +25289,8 @@
     33:34:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):379:380 -> c
     33:34:boolean isResolvable(com.android.tools.r8.graph.AppView):815 -> c
     35:38:boolean isResolvable(com.android.tools.r8.graph.AppView):821:824 -> c
+    39:39:void lambda$forEachImmediateSupertype$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):875:875 -> c
+    40:43:void forEachImmediateSupertypeWithSignature(java.util.function.BiConsumer):909:912 -> c
     1:1:boolean isAbstract():648:648 -> c1
     1:1:void setDirectMethods(java.util.Collection):249:249 -> d
     2:2:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):253:253 -> d
@@ -25470,10 +25298,9 @@
     3:3:void forEachMethod(java.util.function.Consumer):290:290 -> d
     4:4:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):98:98 -> d
     4:4:void forEachMethod(java.util.function.Consumer):290 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:java.lang.Iterable instanceFields(java.util.function.Predicate):433:433 -> d
     6:6:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):560:560 -> d
-    7:7:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$9(com.android.tools.r8.graph.DexEncodedField):996:996 -> d
+    7:7:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$10(com.android.tools.r8.graph.DexEncodedField):1005:1005 -> d
     1:1:boolean isAnnotation():652:652 -> d1
     1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):245:245 -> e
     2:2:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):485:485 -> e
@@ -25491,8 +25318,8 @@
     990:990:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):489:489 -> e
     980:980:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):489:489 -> e
     991:991:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):555:555 -> e
-    992:993:void forEachNestMember(java.util.function.Consumer):1130:1131 -> e
-    1:4:boolean isAnonymousClass():1084:1087 -> e1
+    992:993:void forEachNestMember(java.util.function.Consumer):1139:1140 -> e
+    1:4:boolean isAnonymousClass():1093:1096 -> e1
     1:1:void forEachStaticField(java.util.function.Consumer):335:335 -> f
     2:2:java.lang.Iterable staticFields(java.util.function.Predicate):361:361 -> f
     2:2:void forEachStaticFieldMatching(java.util.function.Predicate,java.util.function.Consumer):340 -> f
@@ -25514,18 +25341,18 @@
     1:1:java.lang.Iterable methods(java.util.function.Predicate):220:220 -> h
     com.android.tools.r8.graph.DexClass asDexClass() -> h0
     1:1:boolean isFinal():656:656 -> h1
-    1:2:void removeEnclosingMethodAttribute(java.util.function.Predicate):1024:1025 -> i
-    1:1:boolean isInANest():1091:1091 -> i1
+    1:2:void removeEnclosingMethodAttribute(java.util.function.Predicate):1033:1034 -> i
+    1:1:boolean isInANest():1100:1100 -> i1
     1:1:boolean isInterface():665:665 -> isInterface
-    1:1:void removeInnerClasses(java.util.function.Predicate):1038:1038 -> j
+    1:1:void removeInnerClasses(java.util.function.Predicate):1047:1047 -> j
     boolean isLibraryClass() -> j1
-    1:1:void removeNestMemberAttributes(java.util.function.Predicate):1151:1151 -> k
-    1:3:boolean isLocalClass():1071:1073 -> k1
+    1:1:void removeNestMemberAttributes(java.util.function.Predicate):1160:1160 -> k
+    1:3:boolean isLocalClass():1080:1082 -> k1
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> l
     1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):261:261 -> l
-    1:3:boolean isMemberClass():1077:1079 -> l1
-    1:1:boolean isNestHost():1112:1112 -> m1
-    1:1:boolean isNestMember():1116:1116 -> n1
+    1:3:boolean isMemberClass():1086:1088 -> l1
+    1:1:boolean isNestHost():1121:1121 -> m1
+    1:1:boolean isNestMember():1125:1125 -> n1
     boolean isDexClass() -> o0
     boolean isNotProgramClass() -> o1
     1:1:boolean isPublic():725:725 -> p1
@@ -25535,15 +25362,14 @@
     2:2:java.lang.Iterable members():199 -> r1
     boolean isStaticMember() -> s0
     1:1:java.lang.Iterable methods():216:216 -> s1
-    1:3:java.lang.Iterable allImmediateSupertypes():982:984 -> t0
-    4:7:java.lang.Iterable allImmediateSupertypes():983:986 -> t0
+    1:3:java.lang.Iterable allImmediateSupertypes():991:993 -> t0
+    4:7:java.lang.Iterable allImmediateSupertypes():992:995 -> t0
     1:5:java.util.List staticFields():353:357 -> t1
     1:1:java.util.List allMethodsSorted():294:294 -> u0
-    1:1:boolean validInterfaceSignatures():872:872 -> u1
+    1:1:boolean validInterfaceSignatures():879:879 -> u1
     2:2:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> u1
-    2:2:boolean validInterfaceSignatures():872 -> u1
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:4:boolean validInterfaceSignatures():872:873 -> u1
+    2:2:boolean validInterfaceSignatures():879 -> u1
+    3:4:boolean validInterfaceSignatures():879:880 -> u1
     1:1:java.lang.Iterable classFields():185:185 -> v0
     1:4:boolean verifyNoDuplicateFields():502:505 -> v1
     5:5:boolean verifyNoDuplicateFields():0:0 -> v1
@@ -25554,12 +25380,12 @@
     510:510:boolean verifyNoDuplicateFields():505:505 -> v1
     1:1:java.lang.Iterable classMethods():212:212 -> w0
     1:1:java.lang.Iterable virtualMethods():257:257 -> w1
-    1:1:void clearClassSignature():1034:1034 -> x0
-    1:1:void clearEnclosingMethodAttribute():1020:1020 -> y0
-    1:1:void clearInnerClasses():1030:1030 -> z0
-com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.internal.rg:
+    1:1:void clearClassSignature():1043:1043 -> x0
+    1:1:void clearEnclosingMethodAttribute():1029:1029 -> y0
+    1:1:void clearInnerClasses():1039:1039 -> z0
+com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.internal.Zf:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.K:
+com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.I:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():10:10 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):13:16 -> <init>
@@ -25577,7 +25403,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():45:45 -> getType
     1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():32:32 -> v
     1:1:com.android.tools.r8.references.FieldReference getFieldReference():36:36 -> x
-com.android.tools.r8.graph.DexClassAndMember -> com.android.tools.r8.graph.L:
+com.android.tools.r8.graph.DexClassAndMember -> com.android.tools.r8.graph.J:
     com.android.tools.r8.graph.DexClass holder -> b
     com.android.tools.r8.graph.DexEncodedMember definition -> c
     boolean $assertionsDisabled -> d
@@ -25597,7 +25423,7 @@
     1:1:java.lang.String toString():76:76 -> toString
     1:1:java.lang.String toSourceString():71:71 -> u
     1:1:com.android.tools.r8.graph.DexType getContextType():36:36 -> y
-com.android.tools.r8.graph.DexClassAndMethod -> com.android.tools.r8.graph.M:
+com.android.tools.r8.graph.DexClassAndMethod -> com.android.tools.r8.graph.K:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):15:18 -> <init>
@@ -25617,7 +25443,6 @@
     11:11:com.android.tools.r8.graph.DexType getArgumentType(int):63:63 -> a
     12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):200:200 -> a
     12:12:com.android.tools.r8.graph.DexType getArgumentType(int):63 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:void accept(java.util.function.Consumer,java.util.function.Consumer):118:118 -> a
     1:1:com.android.tools.r8.graph.DexType getParameter(int):67:67 -> b
     com.android.tools.r8.graph.DexClassAndMethod asMethod() -> c
@@ -25631,7 +25456,7 @@
     2:2:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> z
     2:2:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():173 -> z
     2:2:com.android.tools.r8.graph.DexMethodSignature getMethodSignature():54 -> z
-com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.N:
+com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.L:
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():24:24 -> <clinit>
     1:19:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):46:64 -> <init>
@@ -25649,7 +25474,7 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():149:149 -> n
     boolean isNotProgramClass() -> o1
     1:1:java.lang.String toString():87:87 -> toString
-com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.O:
+com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.M:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> l
     com.android.tools.r8.code.Instruction[] instructions -> i
@@ -25695,12 +25520,10 @@
     93:97:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):364:368 -> a
     98:98:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
     98:98:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):368 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     99:100:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):370:371 -> a
     101:105:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):384:388 -> a
     106:106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
     106:106:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):388 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     107:110:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):390:393 -> a
     111:111:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):398:398 -> a
     112:112:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):403:403 -> a
@@ -25724,20 +25547,19 @@
     214:214:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):587:587 -> a
     215:217:void updateHighestSortingString(com.android.tools.r8.graph.DexString):637:639 -> a
     215:217:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):587 -> a
-    218:221:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):590:593 -> a
-    222:223:void com.android.tools.r8.graph.DexCode$TryHandler.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):801:802 -> a
-    222:223:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):594 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    224:224:int getRegisterSize(com.android.tools.r8.graph.ProgramMethod):623:623 -> a
-    225:226:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):645:646 -> a
-    227:234:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):669:676 -> a
-    235:235:boolean com.android.tools.r8.code.Instruction.isConstClass():0:0 -> a
-    235:235:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):677 -> a
-    236:236:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):678:678 -> a
-    237:237:boolean com.android.tools.r8.code.Instruction.isInstanceOf():0:0 -> a
-    237:237:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):679 -> a
-    238:240:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):680:682 -> a
-    241:242:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):694:695 -> a
+    218:222:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):590:594 -> a
+    223:224:void com.android.tools.r8.graph.DexCode$TryHandler.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):801:802 -> a
+    223:224:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):594 -> a
+    225:225:int getRegisterSize(com.android.tools.r8.graph.ProgramMethod):623:623 -> a
+    226:227:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):645:646 -> a
+    228:235:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):669:676 -> a
+    236:236:boolean com.android.tools.r8.code.Instruction.isConstClass():0:0 -> a
+    236:236:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):677 -> a
+    237:237:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):678:678 -> a
+    238:238:boolean com.android.tools.r8.code.Instruction.isInstanceOf():0:0 -> a
+    238:238:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):679 -> a
+    239:241:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):680:682 -> a
+    242:243:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):694:695 -> a
     1:1:int lambda$specify$1(com.android.tools.r8.graph.DexCode):70:70 -> b
     2:2:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):628:628 -> b
     1:1:int lambda$specify$2(com.android.tools.r8.graph.DexCode):71:71 -> c
@@ -25746,8 +25568,8 @@
     1:1:com.android.tools.r8.graph.DexCode$TryHandler[] lambda$specify$4(com.android.tools.r8.graph.DexCode):73:73 -> e
     1:1:com.android.tools.r8.graph.DexDebugInfo lambda$specify$5(com.android.tools.r8.graph.DexCode):74:74 -> f
     1:1:com.android.tools.r8.code.Instruction[] lambda$specify$6(com.android.tools.r8.graph.DexCode):75:75 -> g
-    2:2:boolean computeEquals(java.lang.Object):349:349 -> g
     1:7:int computeHashCode():338:344 -> g0
+    1:1:boolean computeEquals(java.lang.Object):349:349 -> h
     com.android.tools.r8.graph.DexWritableCode asDexWritableCode() -> i0
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():213:213 -> k0
     1:1:int estimatedSizeForInlining():208:208 -> l0
@@ -25763,7 +25585,7 @@
     1:1:com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers():608:608 -> v
     1:1:com.android.tools.r8.graph.DexString getHighestSortingString():613:613 -> x
     1:1:int getOutgoingRegisterSize():633:633 -> z
-com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.O$a:
+com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.M$a:
     boolean $assertionsDisabled -> f
     int instructionCount -> d
     int handlerIndex -> e
@@ -25786,7 +25608,7 @@
     754:754:java.lang.String toString():748:748 -> toString
     755:755:java.lang.String toString():748:748 -> toString
     749:752:java.lang.String toString():748:751 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.graph.O$b:
+com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.graph.M$b:
     com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] pairs -> b
     int catchAllAddr -> c
     boolean $assertionsDisabled -> d
@@ -25808,7 +25630,7 @@
     832:832:java.lang.String toString():814:814 -> toString
     833:833:java.lang.String toString():815:815 -> toString
     817:830:java.lang.String toString():816:829 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.graph.O$b$a:
+com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.graph.M$b$a:
     com.android.tools.r8.graph.DexType type -> b
     int addr -> c
     boolean $assertionsDisabled -> d
@@ -25819,7 +25641,7 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):838:838 -> a
     3:3:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):861:861 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):865 -> a
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     4:4:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):861 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):865 -> a
     5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):866:866 -> a
@@ -25838,9 +25660,9 @@
     12:12:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":873,"2":874,"3":875}}
     873:873:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):861:861 -> a
-    874:874:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    874:874:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     874:874:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):861 -> a
-    875:875:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    875:875:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     875:875:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):861 -> a
     876:876:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):872:872 -> a
     1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):838:838 -> b
@@ -25849,7 +25671,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():857:857 -> getType
     1:1:int hashCode():877:877 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():853:853 -> n
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.ug:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.cg:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString sourceFile -> d
     boolean $assertionsDisabled -> j
@@ -25864,7 +25686,7 @@
     1:11:void <init>(boolean,int,int,com.android.tools.r8.graph.DexString,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):34:44 -> <init>
     1:38:java.lang.String toString(boolean):53:90 -> a
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.graph.S:
+com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.graph.O:
     com.android.tools.r8.graph.DexDebugPositionState positionState -> h
     java.util.Map locals -> c
     boolean $assertionsDisabled -> i
@@ -25919,13 +25741,12 @@
     81:84:void startArgument(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):152 -> a
     85:86:void com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry.set(com.android.tools.r8.graph.DebugLocalInfo):32:33 -> a
     85:86:void startArgument(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):152 -> a
-com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> com.android.tools.r8.graph.P:
-com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.graph.Q:
+com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.graph.N:
     com.android.tools.r8.graph.DebugLocalInfo current -> a
     com.android.tools.r8.graph.DebugLocalInfo last -> b
     1:1:void <init>():27:27 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexDebugEntryBuilder$1):27:27 -> <init>
-com.android.tools.r8.graph.DexDebugEvent -> com.android.tools.r8.graph.U:
+com.android.tools.r8.graph.DexDebugEvent -> com.android.tools.r8.graph.Q:
     com.android.tools.r8.graph.DexDebugEvent[] EMPTY_ARRAY -> b
     boolean $assertionsDisabled -> c
     1:8:void <clinit>():20:27 -> <clinit>
@@ -25945,7 +25766,7 @@
     int getCompareToId() -> h0
     boolean isWritableEvent() -> i0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():63:63 -> n
-com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> com.android.tools.r8.graph.T:
+com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> com.android.tools.r8.graph.P:
     int delta -> d
     1:2:void <init>(int):271:272 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
@@ -25962,7 +25783,7 @@
     297:297:java.lang.String toString():294:294 -> toString
     298:298:java.lang.String toString():294:294 -> toString
     295:295:java.lang.String toString():294:294 -> toString
-com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> com.android.tools.r8.graph.U$a:
+com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> com.android.tools.r8.graph.Q$a:
     boolean $assertionsDisabled -> e
     int delta -> d
     1:1:void <clinit>():115:115 -> <clinit>
@@ -25982,7 +25803,7 @@
     147:147:java.lang.String toString():144:144 -> toString
     148:148:java.lang.String toString():144:144 -> toString
     145:145:java.lang.String toString():144:144 -> toString
-com.android.tools.r8.graph.DexDebugEvent$Default -> com.android.tools.r8.graph.U$b:
+com.android.tools.r8.graph.DexDebugEvent$Default -> com.android.tools.r8.graph.Q$b:
     boolean $assertionsDisabled -> e
     int value -> d
     1:1:void <clinit>():738:738 -> <clinit>
@@ -25999,7 +25820,7 @@
     1:2:int getLineDelta():781:782 -> j0
     1:2:int getPCDelta():776:777 -> k0
     1:1:java.lang.String toString():787:787 -> toString
-com.android.tools.r8.graph.DexDebugEvent$EndLocal -> com.android.tools.r8.graph.V:
+com.android.tools.r8.graph.DexDebugEvent$EndLocal -> com.android.tools.r8.graph.S:
     int registerNum -> d
     1:2:void <init>(int):420:421 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
@@ -26017,7 +25838,7 @@
     446:446:java.lang.String toString():443:443 -> toString
     447:447:java.lang.String toString():443:443 -> toString
     444:444:java.lang.String toString():443:443 -> toString
-com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> com.android.tools.r8.graph.W:
+com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> com.android.tools.r8.graph.T:
     int registerNum -> d
     1:2:void <init>(int):472:473 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
@@ -26035,7 +25856,7 @@
     498:498:java.lang.String toString():495:495 -> toString
     499:499:java.lang.String toString():495:495 -> toString
     496:496:java.lang.String toString():495:495 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> com.android.tools.r8.graph.X:
+com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> com.android.tools.r8.graph.U:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():219:219 -> <clinit>
     1:1:void <init>():221:221 -> <init>
@@ -26048,7 +25869,7 @@
     int getCompareToId() -> h0
     boolean isWritableEvent() -> i0
     1:1:java.lang.String toString():242:242 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetFile -> com.android.tools.r8.graph.U$c:
+com.android.tools.r8.graph.DexDebugEvent$SetFile -> com.android.tools.r8.graph.Q$c:
     com.android.tools.r8.graph.DexString fileName -> d
     1:2:void <init>(com.android.tools.r8.graph.DexString):531:532 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
@@ -26070,7 +25891,7 @@
     556:556:java.lang.String toString():553:553 -> toString
     557:557:java.lang.String toString():553:553 -> toString
     554:554:java.lang.String toString():553:553 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> com.android.tools.r8.graph.Y:
+com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> com.android.tools.r8.graph.V:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod callee -> d
     com.android.tools.r8.ir.code.Position caller -> e
@@ -26089,7 +25910,7 @@
     int getCompareToId() -> h0
     1:1:int hashCode():605:605 -> hashCode
     1:1:java.lang.String toString():600:600 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetOutlineCallerFrame -> com.android.tools.r8.graph.Z:
+com.android.tools.r8.graph.DexDebugEvent$SetOutlineCallerFrame -> com.android.tools.r8.graph.W:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod outlineCallee -> d
     com.android.tools.r8.utils.Int2StructuralItemArrayMap outlinePositions -> e
@@ -26108,7 +25929,7 @@
     1:1:com.android.tools.r8.graph.DexMethod getOutlineCallee():690:690 -> j0
     1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap getOutlinePositions():694:694 -> k0
     1:1:java.lang.String toString():704:704 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetOutlineFrame -> com.android.tools.r8.graph.a0:
+com.android.tools.r8.graph.DexDebugEvent$SetOutlineFrame -> com.android.tools.r8.graph.X:
     1:1:void <init>():639:639 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):639:639 -> a
@@ -26117,7 +25938,7 @@
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
     int getCompareToId() -> h0
     1:1:java.lang.String toString():643:643 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> com.android.tools.r8.graph.b0:
+com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> com.android.tools.r8.graph.Y:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():169:169 -> <clinit>
     1:1:void <init>():171:171 -> <init>
@@ -26130,7 +25951,7 @@
     int getCompareToId() -> h0
     boolean isWritableEvent() -> i0
     1:1:java.lang.String toString():192:192 -> toString
-com.android.tools.r8.graph.DexDebugEvent$StartLocal -> com.android.tools.r8.graph.U$d:
+com.android.tools.r8.graph.DexDebugEvent$StartLocal -> com.android.tools.r8.graph.Q$d:
     com.android.tools.r8.graph.DexString name -> e
     com.android.tools.r8.graph.DexString signature -> g
     int registerNum -> d
@@ -26141,14 +25962,14 @@
     2:2:int lambda$spec$0(com.android.tools.r8.graph.DexDebugEvent$StartLocal):327:327 -> a
     3:6:void spec(com.android.tools.r8.utils.structural.StructuralSpecification):327:330 -> a
     7:12:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):356:361 -> a
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     13:13:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):361 -> a
     14:16:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):361:363 -> a
     17:17:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):369:369 -> a
     18:18:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
     18:18:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):370 -> a
     19:20:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):372:373 -> a
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     21:21:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):373 -> a
     22:22:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):374:374 -> a
     23:23:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
@@ -26180,7 +26001,7 @@
     391:391:java.lang.String toString():388:388 -> toString
     392:392:java.lang.String toString():388:388 -> toString
     389:389:java.lang.String toString():388:388 -> toString
-com.android.tools.r8.graph.DexDebugEventBuilder -> com.android.tools.r8.graph.c0:
+com.android.tools.r8.graph.DexDebugEventBuilder -> com.android.tools.r8.graph.Z:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     boolean $assertionsDisabled -> m
     int startLine -> l
@@ -26255,7 +26076,7 @@
     192:192:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):312 -> a
     193:194:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):312:313 -> a
     1:4:boolean localsChanged():177:180 -> b
-com.android.tools.r8.graph.DexDebugEventVisitor -> com.android.tools.r8.graph.d0:
+com.android.tools.r8.graph.DexDebugEventVisitor -> com.android.tools.r8.graph.a0:
     void visit(com.android.tools.r8.graph.DexDebugEvent$AdvanceLine) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$AdvancePC) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$Default) -> a
@@ -26268,7 +26089,7 @@
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetOutlineFrame) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal) -> a
-com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.graph.f0:
+com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.graph.b0:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -26280,10 +26101,9 @@
     7:10:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo convertToEventBased(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexItemFactory):285:288 -> a
     11:11:boolean isEventBasedInfo():43:43 -> a
     11:11:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo convertToEventBased(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexItemFactory):288 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:33:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo convertToEventBased(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexItemFactory):289:310 -> a
     34:41:com.android.tools.r8.graph.DexDebugInfoForWriting convertToWritable(com.android.tools.r8.graph.DexDebugInfo):317:324 -> a
-    1:1:boolean computeEquals(java.lang.Object):83:83 -> g
+    1:1:boolean computeEquals(java.lang.Object):83:83 -> h
     com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo asEventBasedInfo() -> h0
     com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo asPcBasedInfo() -> i0
     com.android.tools.r8.graph.DexDebugInfo$DebugInfoKind getKind() -> j0
@@ -26291,8 +26111,7 @@
     1:1:boolean isPcBasedInfo():47:47 -> l0
     com.android.tools.r8.graph.DexDebugInfo self() -> m0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():66:66 -> n
-com.android.tools.r8.graph.DexDebugInfo$1 -> com.android.tools.r8.graph.e0:
-com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo -> com.android.tools.r8.graph.f0$a:
+com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo -> com.android.tools.r8.graph.b0$a:
     com.android.tools.r8.graph.DexString[] parameters -> f
     com.android.tools.r8.graph.DexDebugEvent[] events -> g
     int startLine -> e
@@ -26310,7 +26129,6 @@
     17:17:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):250:250 -> a
     18:18:boolean com.android.tools.r8.graph.DexDebugInfo.isEventBasedInfo():43:43 -> a
     18:18:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):250 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:20:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):250:251 -> a
     21:21:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):268:268 -> a
     1:1:com.android.tools.r8.graph.DexString[] lambda$specify$1(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):194:194 -> b
@@ -26327,7 +26145,7 @@
     284:284:java.lang.String toString():274:274 -> toString
     285:285:java.lang.String toString():274:274 -> toString
     276:282:java.lang.String toString():274:280 -> toString
-com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo -> com.android.tools.r8.graph.g0:
+com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo -> com.android.tools.r8.graph.c0:
     int maxPc -> f
     boolean $assertionsDisabled -> g
     int parameterCount -> e
@@ -26346,11 +26164,9 @@
     13:18:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):164:169 -> a
     19:20:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):80:81 -> a
     19:20:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):169 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     21:22:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):170:171 -> a
     23:24:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):80:81 -> a
     23:24:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):171 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:25:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):173:173 -> a
     1:1:int lambda$specify$0(com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo):92:92 -> b
     1:1:int lambda$specify$1(com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo):92:92 -> c
@@ -26367,7 +26183,7 @@
     184:184:java.lang.String toString():178:178 -> toString
     185:185:java.lang.String toString():178:178 -> toString
     179:182:java.lang.String toString():178:181 -> toString
-com.android.tools.r8.graph.DexDebugInfo$WritableEventBasedDebugInfo -> com.android.tools.r8.graph.h0:
+com.android.tools.r8.graph.DexDebugInfo$WritableEventBasedDebugInfo -> com.android.tools.r8.graph.d0:
     1:1:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[],com.android.tools.r8.graph.DexDebugInfo$1):328:328 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):333:333 -> <init>
     1:1:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):255:255 -> a
@@ -26378,23 +26194,22 @@
     3:4:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):260:261 -> a
     3:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):338 -> a
     5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):343:343 -> a
-    6:11:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):359:364 -> a
-    12:13:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):80:81 -> a
-    12:13:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):365 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):367:367 -> a
+    6:12:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):359:365 -> a
+    13:14:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):80:81 -> a
+    13:14:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):365 -> a
+    15:15:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):367:367 -> a
     1:2:int estimatedWriteSize():348:349 -> d0
-com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod -> com.android.tools.r8.graph.i0:
+com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod -> com.android.tools.r8.graph.e0:
     com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod INSTANCE -> i
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):16:16 -> <init>
     1:1:com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod getInstance():20:20 -> n0
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.vg:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.dg:
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
     void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens) -> a
     int estimatedWriteSize() -> d0
-com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.graph.j0:
+com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.graph.f0:
     com.android.tools.r8.graph.DexString currentFile -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethod outlineCallee -> g
@@ -26428,7 +26243,7 @@
     1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap getOutlineCallerPositions():136:136 -> g
     1:1:boolean isOutline():128:128 -> h
     1:3:void resetOutlineInformation():140:142 -> i
-com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.graph.k0:
+com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.graph.g0:
     com.android.tools.r8.graph.DexAnnotationSet annotations -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():15:15 -> <clinit>
@@ -26474,7 +26289,7 @@
     boolean isDexEncodedMethod() -> r0
     boolean isStaticMember() -> s0
     1:1:com.android.tools.r8.graph.DexType getContextType():149:149 -> y
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.graph.l0:
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.graph.h0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory() -> a
     1:1:com.android.tools.r8.graph.DexClass contextIndependentDefinitionFor(com.android.tools.r8.graph.DexType):18:18 -> a
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
@@ -26489,7 +26304,7 @@
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> b
     2:2:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):87:87 -> b
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType) -> c
-com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.graph.m0:
+com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.graph.i0:
     com.android.tools.r8.graph.DexAnnotationElement[] elements -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType type -> b
@@ -26504,29 +26319,26 @@
     4:4:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):45 -> a
     5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":55,"2":56,"3":57}}
-    55:55:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    55:55:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):45 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":56,"2":57,"3":58}}
     56:56:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
     56:56:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):45 -> a
-    57:57:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    57:57:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
+    57:57:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
     57:57:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):45 -> a
-    51:51:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    52:52:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):64:64 -> a
-    52:52:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):47 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    53:53:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    53:53:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):64 -> a
+    58:58:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    58:58:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
+    58:58:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):45 -> a
+    51:52:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:47 -> a
+    53:53:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):64:64 -> a
     53:53:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):47 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    54:54:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):65:65 -> a
+    54:54:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    54:54:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):64 -> a
     54:54:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):47 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    58:59:void forEachElement(java.util.function.Consumer):52:53 -> a
-    60:60:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):68:68 -> a
-    61:61:int lambda$sort$2(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):98:98 -> a
-    62:68:com.android.tools.r8.graph.DexEncodedAnnotation rewrite(java.util.function.Function,java.util.function.Function):113:119 -> a
+    55:55:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):65:65 -> a
+    55:55:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):47 -> a
+    59:60:void forEachElement(java.util.function.Consumer):52:53 -> a
+    61:61:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):68:68 -> a
+    62:62:int lambda$sort$2(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):98:98 -> a
+    63:69:com.android.tools.r8.graph.DexEncodedAnnotation rewrite(java.util.function.Function,java.util.function.Function):113:119 -> a
     1:1:com.android.tools.r8.graph.DexAnnotationElement[] lambda$specify$1(com.android.tools.r8.graph.DexEncodedAnnotation):26:26 -> b
     1:3:boolean equals(java.lang.Object):86:88 -> equals
     1:1:int getNumberOfElements():62:62 -> g0
@@ -26546,7 +26358,7 @@
     76:76:java.lang.String toString():73:73 -> toString
     77:77:java.lang.String toString():73:73 -> toString
     74:74:java.lang.String toString():73:73 -> toString
-com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.graph.n0:
+com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.graph.j0:
     com.android.tools.r8.graph.DexValue[] values -> b
     1:2:void <init>(com.android.tools.r8.graph.DexValue[]):14:15 -> <init>
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):26:26 -> a
@@ -26558,7 +26370,7 @@
     47:47:java.lang.String toString():44:44 -> toString
     48:48:java.lang.String toString():44:44 -> toString
     45:45:java.lang.String toString():44:44 -> toString
-com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.graph.q0:
+com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.graph.l0:
     boolean isInlinableByJavaC -> m
     com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo optimizationInfo -> k
     boolean $assertionsDisabled -> o
@@ -26577,21 +26389,20 @@
     1:2:void clearStaticValue():253:254 -> D0
     1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():137:137 -> E0
     1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature getGenericSignature():341:341 -> F0
-    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():127:127 -> G0
-    1:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():116:117 -> H0
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():107:107 -> I0
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():258:259 -> J0
-    1:2:boolean hasExplicitStaticValue():242:243 -> K0
+    1:1:boolean getIsInlinableByJavaC():371:371 -> G0
+    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():127:127 -> H0
+    1:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():116:117 -> I0
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():107:107 -> J0
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():258:259 -> K0
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
-    1:1:boolean isDeprecated():94:94 -> L0
-    1:1:boolean isEnum():204:204 -> M0
-    1:1:boolean isInlinableByJavaC():371:371 -> N0
+    1:2:boolean hasExplicitStaticValue():242:243 -> L0
+    1:1:boolean isDeprecated():94:94 -> M0
+    1:1:boolean isEnum():204:204 -> N0
     1:1:boolean isStatic():213:213 -> O0
-    1:1:void markAsInlinableByJavaC():367:367 -> P0
+    1:1:com.android.tools.r8.graph.DexEncodedField$Builder syntheticBuilder():363:363 -> P0
     1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():127:127 -> Q
     1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():32 -> Q
-    1:1:com.android.tools.r8.graph.DexEncodedField$Builder syntheticBuilder():363:363 -> Q0
-    1:1:com.android.tools.r8.graph.DexType type():90:90 -> R0
+    1:1:com.android.tools.r8.graph.DexType type():90:90 -> Q0
     1:1:com.android.tools.r8.graph.DexValue access$200(com.android.tools.r8.graph.DexEncodedField):32:32 -> a
     2:2:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo access$302(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo):32:32 -> a
     3:8:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):52:57 -> a
@@ -26617,24 +26428,32 @@
     47:47:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):316 -> a
     48:50:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):317:319 -> a
     51:54:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):318:321 -> a
-    55:59:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):325:329 -> a
-    60:60:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":730,"2":731,"3":732}}
-    730:730:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):329:329 -> a
-    731:731:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):329:329 -> a
-    732:732:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):329:329 -> a
-    390:392:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):330:332 -> a
-    393:393:boolean com.android.tools.r8.graph.DexValue.isDexValueNull():0:0 -> a
-    393:393:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):332 -> a
-    394:394:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):333:333 -> a
-    395:395:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":736,"2":737,"3":738}}
-    736:736:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):333:333 -> a
-    737:737:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):333:333 -> a
-    738:738:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):333:333 -> a
-    729:729:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):334:334 -> a
-    739:740:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):345:346 -> a
+    55:56:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):345:346 -> a
+    57:57:boolean getIsInlinableByJavaC():371:371 -> a
+    57:57:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):375 -> a
+    58:58:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):378:378 -> a
+    59:59:boolean isFinal():208:208 -> a
+    59:59:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):378 -> a
+    60:69:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):381:390 -> a
+    70:70:void markAsInlinableByJavaC():367:367 -> a
+    70:70:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):393 -> a
     1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo access$300(com.android.tools.r8.graph.DexEncodedField):32:32 -> b
+    2:6:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):325:329 -> b
+    7:7:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":677,"2":678,"3":679}}
+    677:677:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):329:329 -> b
+    678:678:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):329:329 -> b
+    679:679:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):329:329 -> b
+    337:339:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):330:332 -> b
+    340:340:boolean com.android.tools.r8.graph.DexValue.isDexValueNull():0:0 -> b
+    340:340:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):332 -> b
+    341:341:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):333:333 -> b
+    342:342:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":683,"2":684,"3":685}}
+    683:683:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):333:333 -> b
+    684:684:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):333:333 -> b
+    685:685:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):333:333 -> b
+    676:676:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):334:334 -> b
     1:1:com.android.tools.r8.graph.DexValue lambda$specify$0(com.android.tools.r8.graph.DexEncodedField):54:54 -> c
     1:1:boolean lambda$specify$1(com.android.tools.r8.graph.DexEncodedField):57:57 -> d
     1:1:java.lang.String toSourceString():162:162 -> f0
@@ -26653,8 +26472,7 @@
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevel():112:112 -> u0
     1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():107:107 -> y0
     1:1:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo():32 -> y0
-com.android.tools.r8.graph.DexEncodedField$1 -> com.android.tools.r8.graph.o0:
-com.android.tools.r8.graph.DexEncodedField$Builder -> com.android.tools.r8.graph.p0:
+com.android.tools.r8.graph.DexEncodedField$Builder -> com.android.tools.r8.graph.k0:
     com.android.tools.r8.graph.DexAnnotationSet annotations -> b
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> c
     boolean d8R8Synthesized -> i
@@ -26667,32 +26485,32 @@
     com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo optimizationInfo -> g
     com.android.tools.r8.graph.DexValue staticValue -> e
     java.util.function.Consumer buildConsumer -> j
-    1:1:void <clinit>():374:374 -> <clinit>
-    1:1:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField$1):374:374 -> <init>
-    2:2:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$1):374:374 -> <init>
-    3:3:void <init>(boolean):391:391 -> <init>
-    4:19:void <init>(boolean):377:392 -> <init>
-    20:20:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):395:395 -> <init>
-    21:53:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):377:409 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedField$Builder apply(java.util.function.Consumer):413:413 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedField$Builder setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.AppView):424:424 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedField$Builder addBuildConsumer(java.util.function.Consumer):440:440 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedField$Builder setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.AppView):424 -> a
-    4:5:void lambda$setAbstractValue$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexEncodedField):426:427 -> a
-    6:6:com.android.tools.r8.graph.DexEncodedField$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):435:435 -> a
-    7:7:com.android.tools.r8.graph.DexEncodedField$Builder setField(com.android.tools.r8.graph.DexField):445:445 -> a
-    8:8:com.android.tools.r8.graph.DexEncodedField$Builder setAccessFlags(com.android.tools.r8.graph.FieldAccessFlags):450:450 -> a
-    9:9:com.android.tools.r8.graph.DexEncodedField$Builder setApiLevel(com.android.tools.r8.androidapi.ComputedApiLevel):455:455 -> a
-    10:10:com.android.tools.r8.graph.DexEncodedField$Builder setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):460:460 -> a
-    11:11:com.android.tools.r8.graph.DexEncodedField$Builder setStaticValue(com.android.tools.r8.graph.DexValue):465:465 -> a
-    12:12:com.android.tools.r8.graph.DexEncodedField$Builder disableAndroidApiLevelCheckIf(boolean):480:480 -> a
-    13:29:com.android.tools.r8.graph.DexEncodedField build():486:502 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedField$Builder modifyAccessFlags(java.util.function.Consumer):418:418 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedField$Builder clearAnnotations():431:431 -> b
-    3:3:com.android.tools.r8.graph.DexEncodedField$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):435:435 -> b
-    3:3:com.android.tools.r8.graph.DexEncodedField$Builder clearAnnotations():431 -> b
-    4:4:com.android.tools.r8.graph.DexEncodedField$Builder setDeprecated(boolean):470:470 -> b
-com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.wg:
+    1:1:void <clinit>():397:397 -> <clinit>
+    1:1:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField$1):397:397 -> <init>
+    2:2:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$1):397:397 -> <init>
+    3:3:void <init>(boolean):414:414 -> <init>
+    4:19:void <init>(boolean):400:415 -> <init>
+    20:20:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):418:418 -> <init>
+    21:53:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):400:432 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedField$Builder apply(java.util.function.Consumer):436:436 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedField$Builder setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.AppView):447:447 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedField$Builder addBuildConsumer(java.util.function.Consumer):463:463 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedField$Builder setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.AppView):447 -> a
+    4:5:void lambda$setAbstractValue$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexEncodedField):449:450 -> a
+    6:6:com.android.tools.r8.graph.DexEncodedField$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):458:458 -> a
+    7:7:com.android.tools.r8.graph.DexEncodedField$Builder setField(com.android.tools.r8.graph.DexField):468:468 -> a
+    8:8:com.android.tools.r8.graph.DexEncodedField$Builder setAccessFlags(com.android.tools.r8.graph.FieldAccessFlags):473:473 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedField$Builder setApiLevel(com.android.tools.r8.androidapi.ComputedApiLevel):478:478 -> a
+    10:10:com.android.tools.r8.graph.DexEncodedField$Builder setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):483:483 -> a
+    11:11:com.android.tools.r8.graph.DexEncodedField$Builder setStaticValue(com.android.tools.r8.graph.DexValue):488:488 -> a
+    12:12:com.android.tools.r8.graph.DexEncodedField$Builder disableAndroidApiLevelCheckIf(boolean):503:503 -> a
+    13:29:com.android.tools.r8.graph.DexEncodedField build():509:525 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedField$Builder modifyAccessFlags(java.util.function.Consumer):441:441 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedField$Builder clearAnnotations():454:454 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedField$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):458:458 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedField$Builder clearAnnotations():454 -> b
+    4:4:com.android.tools.r8.graph.DexEncodedField$Builder setDeprecated(boolean):493:493 -> b
+com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.eg:
     com.android.tools.r8.androidapi.ComputedApiLevel apiLevelForDefinition -> e
     boolean d8R8Synthesized -> d
     com.android.tools.r8.graph.DexMember reference -> f
@@ -26718,7 +26536,7 @@
     1:1:com.android.tools.r8.graph.DexString getName():50:50 -> x0
     com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo() -> y0
     1:1:com.android.tools.r8.graph.DexMember getReference():55:55 -> z0
-com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.s0:
+com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.n0:
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotationsList -> i
     com.android.tools.r8.cf.CfVersion classFileVersion -> m
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> l
@@ -26741,31 +26559,32 @@
     2:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):241:241 -> <init>
     3:99:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):158:254 -> <init>
     1:1:void clearGenericSignature():1310:1310 -> A
-    1:1:boolean isSynchronized():444:444 -> A1
-    1:2:boolean isSyntheticMethod():573:574 -> B1
+    1:2:boolean isStatic():559:560 -> A1
+    1:1:boolean isSynchronized():444:444 -> B1
     1:1:boolean belongsToDirectPool():578:578 -> C0
-    1:2:boolean isVirtualMethod():497:498 -> C1
+    1:2:boolean isSyntheticMethod():573:574 -> C1
     1:1:boolean belongsToVirtualPool():582:582 -> D0
-    1:2:void markNotProcessed():722:723 -> D1
+    1:2:boolean isVirtualMethod():497:498 -> D1
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder():1328:1328 -> E0
-    1:2:java.lang.String qualifiedName():832:833 -> E1
+    1:2:void markNotProcessed():722:723 -> E1
     1:1:void checkIfObsolete():179:179 -> F0
-    1:1:com.android.tools.r8.graph.DexType returnType():343:343 -> F1
+    1:2:java.lang.String qualifiedName():832:833 -> F1
     1:1:void clearAllAnnotations():860:860 -> G
     2:2:void clearParameterAnnotations():875:875 -> G
     2:2:void clearAllAnnotations():861 -> G
     1:1:void clearApiLevelForCode():1263:1263 -> G0
-    1:1:void setObsolete():191:191 -> G1
+    1:1:com.android.tools.r8.graph.DexType returnType():343:343 -> G1
     1:2:java.lang.String codeToString():1232:1233 -> H0
-    1:1:boolean shouldNotHaveCode():792:792 -> H1
+    1:1:void setObsolete():191:191 -> H1
     1:2:java.lang.String descriptor():837:838 -> I0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder():1320:1320 -> I1
+    1:1:boolean shouldNotHaveCode():792:792 -> I1
     1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():196:196 -> J0
-    1:2:void unsetCode():747:748 -> J1
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder():1320:1320 -> J1
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1259:1259 -> K0
-    1:1:void unsetObsolete():225:225 -> K1
+    1:2:void unsetCode():747:748 -> K1
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():805:807 -> L0
+    1:1:void unsetObsolete():225:225 -> L1
     1:2:com.android.tools.r8.graph.Code getCode():800:801 -> M0
     1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState getCompilationState():212:212 -> N0
     1:3:com.android.tools.r8.graph.DexWritableCode getDexWritableCodeOrNull():1314:1316 -> O0
@@ -26777,7 +26596,6 @@
     1:1:int getNumberOfArguments():208:208 -> S0
     2:2:int com.android.tools.r8.graph.DexMethod.getNumberOfArguments(boolean):82:82 -> S0
     2:2:int getNumberOfArguments():208 -> S0
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1254:1255 -> T0
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList getParameterAnnotations():883:883 -> U0
     1:1:java.util.Map getParameterInfo():768:768 -> V0
@@ -26793,10 +26611,8 @@
     12:13:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):300:301 -> a
     14:27:int com.android.tools.r8.graph.CfWritableCode.acceptCompareTo(com.android.tools.r8.graph.CfWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):24:37 -> a
     14:27:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):301 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     28:28:int com.android.tools.r8.graph.CfWritableCode.acceptCompareTo(com.android.tools.r8.graph.CfWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):31:31 -> a
     28:28:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):301 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:32:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):303:306 -> a
     33:33:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):298:298 -> a
     34:38:void hashCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.HashingVisitor):314:318 -> a
@@ -26826,88 +26642,83 @@
     788:788:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):415 -> a
     789:791:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):401:403 -> a
     789:791:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):415 -> a
-    792:792:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):472:472 -> a
-    793:794:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):462:463 -> a
-    793:794:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):472 -> a
-    795:795:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    795:795:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):463 -> a
-    795:795:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):472 -> a
-    796:797:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):464:465 -> a
-    796:797:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):472 -> a
-    798:798:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    798:798:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):945 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    799:812:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):951:964 -> a
-    799:812:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):946 -> a
-    813:820:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):968:975 -> a
-    813:820:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):947 -> a
-    821:822:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):605:606 -> a
-    823:825:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):626:628 -> a
-    826:826:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):627:627 -> a
-    827:835:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):636:644 -> a
-    836:836:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2265,"2":2266,"3":2267}}
-    2265:2265:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):644:644 -> a
-    2266:2266:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):644:644 -> a
-    2267:2267:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):644:644 -> a
-    1480:1527:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):644:691 -> a
-    1528:1528:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2314,"2":2315,"3":2316}}
-    2314:2314:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):691:691 -> a
-    2315:2315:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):691:691 -> a
-    2316:2316:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):691:691 -> a
-    2219:2219:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):691:691 -> a
-    2220:2223:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):676:679 -> a
-    2224:2227:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):669:672 -> a
-    2228:2231:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):662:665 -> a
-    2232:2264:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):655:687 -> a
-    2317:2336:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):696:715 -> a
-    2337:2337:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):712:712 -> a
-    2338:2338:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):709:709 -> a
-    2339:2339:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):706:706 -> a
-    2340:2340:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):703:703 -> a
-    2341:2359:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):700:718 -> a
-    2360:2364:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):727:731 -> a
-    2365:2366:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):759:760 -> a
-    2365:2366:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):731 -> a
-    2367:2367:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):733:733 -> a
-    2368:2370:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):741:743 -> a
-    2371:2374:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):752:755 -> a
-    2375:2376:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1254:1255 -> a
-    2375:2376:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):755 -> a
-    2377:2377:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):755:755 -> a
-    2378:2378:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):779:779 -> a
-    2379:2381:void downgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):826:828 -> a
-    2382:2382:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):842:842 -> a
-    2383:2383:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3234,"2":3235,"3":3236}}
-    3234:3234:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):843:843 -> a
-    3235:3235:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):843:843 -> a
-    3236:3236:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):844:844 -> a
-    3228:3233:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):845:850 -> a
-    3237:3237:void rewriteAllAnnotations(java.util.function.BiFunction):868:868 -> a
-    3238:3242:void rewriteAllAnnotations(java.util.function.BiFunction):867:871 -> a
-    3243:3243:void setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):891:891 -> a
-    3243:3243:void rewriteAllAnnotations(java.util.function.BiFunction):869 -> a
-    3244:3244:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):895:895 -> a
-    3245:3245:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4217,"2":4218,"3":4219}}
-    4217:4217:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):896:896 -> a
-    4218:4218:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):896:896 -> a
-    4219:4219:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):897:897 -> a
-    4143:4145:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):898:900 -> a
-    4146:4146:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
-    4146:4146:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):900 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4147:4148:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):900:901 -> a
-    4149:4149:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
-    4149:4149:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():114 -> a
-    4149:4149:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):901 -> a
-    4150:4156:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):901:907 -> a
-    4157:4212:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):516:571 -> a
-    4157:4212:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):908 -> a
-    4213:4216:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):908:911 -> a
-    4220:4229:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):926:935 -> a
+    792:793:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):462:463 -> a
+    794:794:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    794:794:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):463 -> a
+    795:796:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):464:465 -> a
+    797:798:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):605:606 -> a
+    799:801:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):626:628 -> a
+    802:802:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):627:627 -> a
+    803:811:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):636:644 -> a
+    812:812:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2241,"2":2242,"3":2243}}
+    2241:2241:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):644:644 -> a
+    2242:2242:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):644:644 -> a
+    2243:2243:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):644:644 -> a
+    1456:1503:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):644:691 -> a
+    1504:1504:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2290,"2":2291,"3":2292}}
+    2290:2290:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):691:691 -> a
+    2291:2291:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):691:691 -> a
+    2292:2292:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):691:691 -> a
+    2195:2195:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):691:691 -> a
+    2196:2199:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):676:679 -> a
+    2200:2203:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):669:672 -> a
+    2204:2207:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):662:665 -> a
+    2208:2240:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):655:687 -> a
+    2293:2312:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):696:715 -> a
+    2313:2313:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):712:712 -> a
+    2314:2314:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):709:709 -> a
+    2315:2315:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):706:706 -> a
+    2316:2316:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):703:703 -> a
+    2317:2335:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):700:718 -> a
+    2336:2340:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):727:731 -> a
+    2341:2342:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):759:760 -> a
+    2341:2342:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):731 -> a
+    2343:2343:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):733:733 -> a
+    2344:2346:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):741:743 -> a
+    2347:2350:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):752:755 -> a
+    2351:2352:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1254:1255 -> a
+    2351:2352:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):755 -> a
+    2353:2353:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):755:755 -> a
+    2354:2354:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):779:779 -> a
+    2355:2357:void downgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):826:828 -> a
+    2358:2358:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):842:842 -> a
+    2359:2359:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3210,"2":3211,"3":3212}}
+    3210:3210:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):843:843 -> a
+    3211:3211:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):843:843 -> a
+    3212:3212:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):844:844 -> a
+    3204:3209:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):845:850 -> a
+    3213:3213:void rewriteAllAnnotations(java.util.function.BiFunction):868:868 -> a
+    3214:3218:void rewriteAllAnnotations(java.util.function.BiFunction):867:871 -> a
+    3219:3219:void setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):891:891 -> a
+    3219:3219:void rewriteAllAnnotations(java.util.function.BiFunction):869 -> a
+    3220:3220:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):895:895 -> a
+    3221:3221:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4193,"2":4194,"3":4195}}
+    4193:4193:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):896:896 -> a
+    4194:4194:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):896:896 -> a
+    4195:4195:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):897:897 -> a
+    4119:4121:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):898:900 -> a
+    4122:4122:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
+    4122:4122:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):900 -> a
+    4123:4124:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):900:901 -> a
+    4125:4125:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
+    4125:4125:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():114 -> a
+    4125:4125:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):901 -> a
+    4126:4132:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):901:907 -> a
+    4133:4188:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):516:571 -> a
+    4133:4188:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):908 -> a
+    4189:4192:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):908:911 -> a
+    4196:4205:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):926:935 -> a
+    4206:4206:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):945:945 -> a
+    4207:4207:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    4207:4207:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):945 -> a
+    4208:4221:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):951:964 -> a
+    4208:4221:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):946 -> a
+    4222:4229:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):968:975 -> a
+    4222:4229:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):947 -> a
     4230:4233:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):993:996 -> a
     4234:4234:int com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.getParameterCount():227:227 -> a
     4234:4234:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):996 -> a
@@ -26951,9 +26762,8 @@
     4423:4423:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1332:1332 -> a
     4423:4423:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):980 -> a
     4424:4424:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982:982 -> a
-    4425:4425:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    4425:4425:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     4425:4425:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4426:4426:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983:983 -> a
     4427:4428:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1038:1039 -> a
     4427:4428:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
@@ -27000,9 +26810,10 @@
     4505:4509:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1022:1026 -> a
     4505:4509:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):984 -> a
     4510:4516:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):981:987 -> a
-    4517:4517:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):985:985 -> a
-    4518:4518:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1453:1453 -> a
-    4518:4518:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):985 -> a
+    4517:4517:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1453:1453 -> a
+    4517:4517:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):985 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4518:4518:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):985:985 -> a
     4519:4519:void setObsolete():191:191 -> a
     4519:4519:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):988 -> a
     4520:4520:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):989:989 -> a
@@ -27021,18 +26832,6 @@
     20:20:boolean com.android.tools.r8.graph.DexType.isInterface(com.android.tools.r8.graph.DexDefinitionSupplier):366:366 -> b
     20:20:void lambda$toForwardingMethod$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1175 -> b
     21:21:void lambda$toForwardingMethod$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1171:1171 -> b
-    22:28:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1212:1218 -> b
-    29:29:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1332:1332 -> b
-    29:29:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1220 -> b
-    30:32:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1221:1223 -> b
-    33:34:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.createMethodOptimizationInfoFixer():618:619 -> b
-    33:34:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1223 -> b
-    35:35:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.RewrittenPrototypeDescription.createMethodOptimizationInfoFixer():705:705 -> b
-    35:35:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.createMethodOptimizationInfoFixer():619 -> b
-    35:35:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1223 -> b
-    36:39:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1223:1226 -> b
-    40:40:void setObsolete():191:191 -> b
-    40:40:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1227 -> b
     1:1:boolean hasParameterInfo():764:764 -> b1
     1:1:com.android.tools.r8.cf.CfVersion lambda$syntheticSpecify$1(com.android.tools.r8.graph.DexEncodedMethod):282:282 -> c
     2:2:com.android.tools.r8.graph.DexAnnotation lambda$rewriteAllAnnotations$4(java.util.function.BiFunction,com.android.tools.r8.graph.DexAnnotation):871:871 -> c
@@ -27079,19 +26878,19 @@
     1:1:boolean isOnlyInlinedIntoNestMembers():618:618 -> u1
     1:2:boolean isPrivateMethod():541:542 -> v1
     1:2:boolean isProcessed():419:420 -> w1
-    1:2:boolean isPublicMethod():531:532 -> x1
+    1:2:boolean isProtectedMethod():536:537 -> x1
     1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1254:1255 -> y0
     1:2:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo():93 -> y0
-    1:2:boolean isPublicized():526:527 -> y1
-    1:2:boolean isStatic():559:560 -> z1
-com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.r0:
+    1:2:boolean isPublicMethod():531:532 -> y1
+    1:2:boolean isPublicized():526:527 -> z1
+com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.m0:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
     1:1:void <clinit>():698:698 -> <clinit>
     2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] com.android.tools.r8.graph.DexEncodedMethod$CompilationState.values():104:104 -> <clinit>
     2:2:void <clinit>():650 -> <clinit>
     3:3:void <clinit>():650:650 -> <clinit>
-com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.s0$a:
+com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.n0$a:
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotations -> g
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> i
     com.android.tools.r8.graph.GenericSignature$MethodTypeSignature genericSignature -> d
@@ -27139,36 +26938,18 @@
     40:40:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1514:1514 -> a
     41:41:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1486:1486 -> a
     41:41:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1513 -> a
-    42:44:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):1525:1527 -> a
-    45:45:com.android.tools.r8.graph.DexCode com.android.tools.r8.graph.DexCode.withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):181:181 -> a
-    45:45:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):1527 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    46:56:com.android.tools.r8.graph.DexDebugInfo com.android.tools.r8.graph.DexCode.debugInfoWithoutFirstParameter(com.android.tools.r8.graph.DexItemFactory):318:328 -> a
-    46:56:com.android.tools.r8.graph.DexCode com.android.tools.r8.graph.DexCode.withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):188 -> a
-    46:56:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):1527 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    57:57:com.android.tools.r8.graph.DexCode com.android.tools.r8.graph.DexCode.withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):188:188 -> a
-    57:57:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):1527 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    58:60:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):1527:1529 -> a
-    61:61:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1591,"2":1592,"3":1593}}
-    1591:1591:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):1529:1529 -> a
-    1592:1592:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):1529:1529 -> a
-    1593:1593:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):1529:1529 -> a
-    1590:1590:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter(com.android.tools.r8.graph.DexItemFactory):1529:1529 -> a
-    1594:1594:com.android.tools.r8.graph.DexEncodedMethod$Builder setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):1535:1535 -> a
-    1595:1595:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyOptimizationInfo(java.util.function.BiConsumer):1541:1541 -> a
-    1596:1596:com.android.tools.r8.graph.DexEncodedMethod$Builder addBuildConsumer(java.util.function.Consumer):1419:1419 -> a
-    1596:1596:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyOptimizationInfo(java.util.function.BiConsumer):1541 -> a
-    1597:1598:void lambda$modifyOptimizationInfo$1(java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod):1543:1544 -> a
-    1599:1599:com.android.tools.r8.graph.DexEncodedMethod$Builder setCode(com.android.tools.r8.graph.Code):1550:1550 -> a
-    1600:1600:com.android.tools.r8.graph.DexEncodedMethod$Builder setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1559:1559 -> a
-    1601:1601:com.android.tools.r8.graph.DexEncodedMethod$Builder setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1569:1569 -> a
-    1602:1602:com.android.tools.r8.graph.DexEncodedMethod$Builder setDeprecated(boolean):1574:1574 -> a
-    1603:1603:com.android.tools.r8.graph.DexEncodedMethod$Builder setClassFileVersion(com.android.tools.r8.cf.CfVersion):1579:1579 -> a
-    1604:1610:com.android.tools.r8.graph.DexEncodedMethod build():1599:1605 -> a
-    1611:1635:com.android.tools.r8.graph.DexEncodedMethod build():1603:1627 -> a
+    42:42:com.android.tools.r8.graph.DexEncodedMethod$Builder setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):1535:1535 -> a
+    43:43:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyOptimizationInfo(java.util.function.BiConsumer):1541:1541 -> a
+    44:44:com.android.tools.r8.graph.DexEncodedMethod$Builder addBuildConsumer(java.util.function.Consumer):1419:1419 -> a
+    44:44:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyOptimizationInfo(java.util.function.BiConsumer):1541 -> a
+    45:46:void lambda$modifyOptimizationInfo$1(java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod):1543:1544 -> a
+    47:47:com.android.tools.r8.graph.DexEncodedMethod$Builder setCode(com.android.tools.r8.graph.Code):1550:1550 -> a
+    48:48:com.android.tools.r8.graph.DexEncodedMethod$Builder setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1559:1559 -> a
+    49:49:com.android.tools.r8.graph.DexEncodedMethod$Builder setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1569:1569 -> a
+    50:50:com.android.tools.r8.graph.DexEncodedMethod$Builder setDeprecated(boolean):1574:1574 -> a
+    51:51:com.android.tools.r8.graph.DexEncodedMethod$Builder setClassFileVersion(com.android.tools.r8.cf.CfVersion):1579:1579 -> a
+    52:58:com.android.tools.r8.graph.DexEncodedMethod build():1599:1605 -> a
+    59:83:com.android.tools.r8.graph.DexEncodedMethod build():1603:1627 -> a
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyAccessFlags(java.util.function.Consumer):1424:1424 -> b
     2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAnnotations():1469:1469 -> b
     2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAllAnnotations():1477 -> b
@@ -27184,19 +26965,13 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder disableAndroidApiLevelCheck():1594:1594 -> c
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder disableMethodNotNullCheck():1584:1584 -> d
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder disableParameterAnnotationListCheck():1589:1589 -> e
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1520:1520 -> f
-    2:2:void com.android.tools.r8.graph.AccessFlags.promote(int):278:278 -> f
-    2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():248 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1520 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetIsLibraryMethodOverride():1464:1464 -> g
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.xg:
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetIsLibraryMethodOverride():1464:1464 -> f
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.fg:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.t0:
+com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.o0:
     com.android.tools.r8.graph.DexType type -> i
     1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,boolean):27:30 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,boolean):0:0 -> <init>
@@ -27275,9 +27050,9 @@
     405:405:java.lang.String toSourceString():200:200 -> f0
     406:406:java.lang.String toSourceString():200:200 -> f0
     403:403:java.lang.String toSourceString():200:200 -> f0
-    1:5:boolean computeEquals(java.lang.Object):131:135 -> g
     1:3:int computeHashCode():124:126 -> g0
     1:1:com.android.tools.r8.graph.DexType getType():70:70 -> getType
+    1:5:boolean computeEquals(java.lang.Object):131:135 -> h
     com.android.tools.r8.graph.DexField asDexField() -> h0
     boolean isDexField() -> l0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():66:66 -> n
@@ -27289,7 +27064,7 @@
     145:145:java.lang.String toString():142:142 -> toString
     146:146:java.lang.String toString():142:142 -> toString
     143:143:java.lang.String toString():142:142 -> toString
-com.android.tools.r8.graph.DexItem -> com.android.tools.r8.graph.u0:
+com.android.tools.r8.graph.DexItem -> com.android.tools.r8.graph.p0:
     1:1:void <init>():11:11 -> <init>
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
     1:1:void collectAll(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem[]):14:14 -> a
@@ -27300,7 +27075,7 @@
     1:1:void lambda$collectAll$1(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem):19:19 -> b
     1:1:java.lang.String toSmaliString():44:44 -> e0
     1:1:java.lang.String toSourceString():48:48 -> f0
-com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.y0:
+com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.s0:
     com.android.tools.r8.graph.DexString invokeMethodName -> A0
     com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> C3
     com.android.tools.r8.graph.DexString startsWithMethodName -> Q
@@ -27628,148 +27403,147 @@
     843:843:void <init>():127:127 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$8(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):131:131 -> a
-    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
-    2:2:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2400 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2400:2400 -> a
-    4:5:com.android.tools.r8.graph.DexMethod createUnboxMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):744:745 -> a
-    6:6:com.android.tools.r8.graph.DexDebugEvent$Default com.android.tools.r8.graph.DexDebugEvent$Default.create(int,int):756:756 -> a
-    6:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int,int):2750 -> a
-    7:7:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int,int):2750:2750 -> a
-    8:9:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):770:771 -> a
-    10:21:java.util.Set boxedValueOfMethods():780:791 -> a
-    22:24:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):783:785 -> a
-    25:25:void setSkipNameValidationForTesting(boolean):898:898 -> a
-    26:26:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2161:2161 -> a
-    27:27:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):131:131 -> a
-    27:27:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2162 -> a
-    28:29:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2162:2163 -> a
-    30:30:com.android.tools.r8.graph.DexString createString(int,byte[]):2169:2169 -> a
-    31:31:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2209:2209 -> a
-    32:32:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":47,"2":48,"3":49}}
+    2:3:com.android.tools.r8.graph.DexMethod createUnboxMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):744:745 -> a
+    4:4:com.android.tools.r8.graph.DexDebugEvent$Default com.android.tools.r8.graph.DexDebugEvent$Default.create(int,int):756:756 -> a
+    4:4:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int,int):2750 -> a
+    5:5:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int,int):2750:2750 -> a
+    6:7:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):770:771 -> a
+    8:19:java.util.Set boxedValueOfMethods():780:791 -> a
+    20:22:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):783:785 -> a
+    23:23:void setSkipNameValidationForTesting(boolean):898:898 -> a
+    24:24:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2161:2161 -> a
+    25:25:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):131:131 -> a
+    25:25:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2162 -> a
+    26:27:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2162:2163 -> a
+    28:28:com.android.tools.r8.graph.DexString createString(int,byte[]):2169:2169 -> a
+    29:29:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2209:2209 -> a
+    30:30:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":45,"2":46,"3":47}}
+    45:45:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2182:2182 -> a
+    45:45:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210 -> a
+    46:46:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2182:2182 -> a
+    46:46:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210 -> a
     47:47:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2182:2182 -> a
     47:47:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210 -> a
-    48:48:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2182:2182 -> a
-    48:48:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210 -> a
-    49:49:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2182:2182 -> a
-    49:49:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210 -> a
-    33:33:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2184:2184 -> a
-    33:33:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210 -> a
-    34:34:java.lang.String escapeMemberString(java.lang.String):2178:2178 -> a
-    34:34:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2184 -> a
-    34:34:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210 -> a
-    35:42:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2184:2191 -> a
-    35:42:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210 -> a
-    43:46:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210:2213 -> a
-    50:50:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2281:2281 -> a
-    51:51:com.android.tools.r8.graph.DexMethod internalCreateFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2306:2306 -> a
-    51:51:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2282 -> a
-    52:52:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2297:2297 -> a
-    52:52:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2287 -> a
-    53:53:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2297:2297 -> a
-    54:54:com.android.tools.r8.graph.DexMethod internalCreateFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2320:2320 -> a
-    55:59:java.util.Optional lambda$internalCreateFreshMethodNameWithHolder$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2322:2326 -> a
+    31:31:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2184:2184 -> a
+    31:31:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210 -> a
+    32:32:java.lang.String escapeMemberString(java.lang.String):2178:2178 -> a
+    32:32:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2184 -> a
+    32:32:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210 -> a
+    33:40:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2184:2191 -> a
+    33:40:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210 -> a
+    41:44:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2210:2213 -> a
+    48:48:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2281:2281 -> a
+    49:49:com.android.tools.r8.graph.DexMethod internalCreateFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2306:2306 -> a
+    49:49:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2282 -> a
+    50:50:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2297:2297 -> a
+    50:50:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2287 -> a
+    51:51:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2297:2297 -> a
+    52:52:com.android.tools.r8.graph.DexMethod internalCreateFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2320:2320 -> a
+    53:57:java.util.Optional lambda$internalCreateFreshMethodNameWithHolder$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2322:2326 -> a
+    58:58:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2344:2344 -> a
+    59:59:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2196:2196 -> a
+    59:59:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2344 -> a
     60:60:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2344:2344 -> a
-    61:61:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2196:2196 -> a
-    61:61:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2344 -> a
-    62:62:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2344:2344 -> a
-    63:63:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2346:2346 -> a
-    64:64:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):21:21 -> a
-    64:64:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2346 -> a
-    65:68:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2347:2350 -> a
-    69:69:com.android.tools.r8.graph.DexField createFreshFieldNameWithoutHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2364:2364 -> a
-    70:71:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2375:2376 -> a
-    72:72:com.android.tools.r8.graph.DexMethod createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2387:2387 -> a
-    73:74:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2396:2397 -> a
-    75:78:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2405:2408 -> a
-    79:79:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2406:2406 -> a
-    80:98:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2414:2432 -> a
-    99:99:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2431:2431 -> a
-    100:100:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2476:2476 -> a
-    101:101:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2487:2487 -> a
-    101:101:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2476 -> a
-    102:106:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2508:2512 -> a
-    102:106:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2489 -> a
-    102:106:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2476 -> a
-    107:107:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2483:2483 -> a
-    108:108:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2487:2487 -> a
-    108:108:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2482 -> a
-    109:113:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2508:2512 -> a
-    109:113:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2489 -> a
-    109:113:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2482 -> a
-    114:115:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):2538:2539 -> a
-    116:117:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):2544:2545 -> a
-    118:118:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):2549:2549 -> a
-    119:121:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.references.FieldReference):2554:2556 -> a
-    122:122:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.references.FieldReference):2553:2553 -> a
-    123:124:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):2561:2562 -> a
-    125:125:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):2574:2574 -> a
-    126:129:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2592:2595 -> a
-    130:132:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2594:2596 -> a
-    133:135:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2600:2602 -> a
-    133:135:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2432 -> a
-    136:139:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2601:2604 -> a
-    136:139:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2432 -> a
-    140:144:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2614:2618 -> a
-    145:149:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2635:2639 -> a
-    145:149:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2618 -> a
-    150:150:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction.put(java.lang.Object,java.lang.Object):41:41 -> a
-    150:150:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2639 -> a
-    150:150:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2618 -> a
-    151:153:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2642:2644 -> a
-    151:153:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2618 -> a
-    154:160:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2619:2625 -> a
-    161:165:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2624:2628 -> a
-    166:167:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):2658:2659 -> a
-    168:168:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2663:2663 -> a
-    169:171:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2667:2669 -> a
-    172:182:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2668:2678 -> a
-    183:183:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2673:2673 -> a
-    184:184:void lambda$createMethod$7(com.android.tools.r8.graph.DexString[],com.android.tools.r8.references.TypeReference,int):2671:2671 -> a
-    185:187:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean,com.android.tools.r8.graph.DexMethod):2695:2697 -> a
-    188:188:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2707:2707 -> a
-    189:198:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):2715:2724 -> a
-    199:201:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2732:2734 -> a
-    202:204:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2774:2776 -> a
-    205:207:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2781:2783 -> a
-    208:208:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2796:2796 -> a
-    209:216:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2833:2840 -> a
-    217:248:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2839:2870 -> a
-    249:254:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2847:2852 -> a
-    255:265:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AppView.isInterface(com.android.tools.r8.graph.DexType):313:323 -> a
-    255:265:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2853 -> a
-    266:271:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2853:2858 -> a
-    272:286:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2854:2868 -> a
-    287:287:com.android.tools.r8.ir.analysis.type.InterfaceCollection getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2875:2875 -> a
-    288:289:com.android.tools.r8.ir.analysis.type.InterfaceCollection lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$10(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2878:2879 -> a
-    290:290:void forAllTypes(java.util.function.Consumer):2885:2885 -> a
-    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> b
-    1:1:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2409 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2409:2409 -> b
-    3:4:java.util.Map buildLibraryMethodsNonNullParamOrThrow():820:821 -> b
-    5:5:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1503:1503 -> b
-    5:5:java.util.Map buildLibraryMethodsNonNullParamOrThrow():821 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:9:java.util.Map buildLibraryMethodsNonNullParamOrThrow():821:824 -> b
-    10:10:com.android.tools.r8.graph.DexString createString(java.lang.String):2174:2174 -> b
+    61:61:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2346:2346 -> a
+    62:62:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):21:21 -> a
+    62:62:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2346 -> a
+    63:66:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2347:2350 -> a
+    67:67:com.android.tools.r8.graph.DexField createFreshFieldNameWithoutHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2364:2364 -> a
+    68:69:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2375:2376 -> a
+    70:70:com.android.tools.r8.graph.DexMethod createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2387:2387 -> a
+    71:72:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2396:2397 -> a
+    73:73:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2400:2400 -> a
+    74:74:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
+    74:74:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2400 -> a
+    75:75:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2400:2400 -> a
+    76:79:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2405:2408 -> a
+    80:80:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2406:2406 -> a
+    81:99:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2414:2432 -> a
+    100:100:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2431:2431 -> a
+    101:101:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2476:2476 -> a
+    102:102:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2487:2487 -> a
+    102:102:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2476 -> a
+    103:107:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2508:2512 -> a
+    103:107:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2489 -> a
+    103:107:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2476 -> a
+    108:108:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2483:2483 -> a
+    109:109:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2487:2487 -> a
+    109:109:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2482 -> a
+    110:114:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2508:2512 -> a
+    110:114:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2489 -> a
+    110:114:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2482 -> a
+    115:116:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):2538:2539 -> a
+    117:118:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):2544:2545 -> a
+    119:119:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):2549:2549 -> a
+    120:122:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.references.FieldReference):2554:2556 -> a
+    123:123:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.references.FieldReference):2553:2553 -> a
+    124:125:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):2561:2562 -> a
+    126:126:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):2574:2574 -> a
+    127:130:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2592:2595 -> a
+    131:133:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2594:2596 -> a
+    134:136:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2600:2602 -> a
+    134:136:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2432 -> a
+    137:140:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2601:2604 -> a
+    137:140:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2432 -> a
+    141:145:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2614:2618 -> a
+    146:150:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2635:2639 -> a
+    146:150:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2618 -> a
+    151:151:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction.put(java.lang.Object,java.lang.Object):41:41 -> a
+    151:151:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2639 -> a
+    151:151:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2618 -> a
+    152:154:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2642:2644 -> a
+    152:154:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2618 -> a
+    155:161:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2619:2625 -> a
+    162:166:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2624:2628 -> a
+    167:168:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):2658:2659 -> a
+    169:169:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2663:2663 -> a
+    170:172:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2667:2669 -> a
+    173:183:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2668:2678 -> a
+    184:184:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2673:2673 -> a
+    185:185:void lambda$createMethod$7(com.android.tools.r8.graph.DexString[],com.android.tools.r8.references.TypeReference,int):2671:2671 -> a
+    186:188:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean,com.android.tools.r8.graph.DexMethod):2695:2697 -> a
+    189:189:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2707:2707 -> a
+    190:199:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):2715:2724 -> a
+    200:202:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2732:2734 -> a
+    203:205:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2774:2776 -> a
+    206:208:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2781:2783 -> a
+    209:209:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2796:2796 -> a
+    210:217:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2833:2840 -> a
+    218:249:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2839:2870 -> a
+    250:255:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2847:2852 -> a
+    256:266:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AppView.isInterface(com.android.tools.r8.graph.DexType):313:323 -> a
+    256:266:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2853 -> a
+    267:272:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2853:2858 -> a
+    273:287:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2854:2868 -> a
+    288:288:com.android.tools.r8.ir.analysis.type.InterfaceCollection getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2875:2875 -> a
+    289:290:com.android.tools.r8.ir.analysis.type.InterfaceCollection lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$10(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2878:2879 -> a
+    291:291:void forAllTypes(java.util.function.Consumer):2885:2885 -> a
+    1:2:java.util.Map buildLibraryMethodsNonNullParamOrThrow():820:821 -> b
+    3:3:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1503:1503 -> b
+    3:3:java.util.Map buildLibraryMethodsNonNullParamOrThrow():821 -> b
+    4:7:java.util.Map buildLibraryMethodsNonNullParamOrThrow():821:824 -> b
+    8:8:com.android.tools.r8.graph.DexString createString(java.lang.String):2174:2174 -> b
+    9:9:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2373:2373 -> b
+    10:10:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2196:2196 -> b
+    10:10:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2373 -> b
     11:11:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2373:2373 -> b
-    12:12:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2196:2196 -> b
-    12:12:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2373 -> b
-    13:13:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2373:2373 -> b
-    14:14:com.android.tools.r8.graph.DexString lookupString(int,byte[]):2437:2437 -> b
-    15:15:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2487:2487 -> b
-    16:20:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2508:2512 -> b
-    16:20:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2489 -> b
-    21:21:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):2517:2517 -> b
-    22:22:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):2521:2521 -> b
-    23:26:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2566:2569 -> b
-    27:32:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2648:2653 -> b
-    27:32:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2570 -> b
-    33:33:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2567:2567 -> b
-    34:34:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2584:2584 -> b
-    35:37:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2738:2740 -> b
+    12:12:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2409:2409 -> b
+    13:13:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> b
+    13:13:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2409 -> b
+    14:14:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2409:2409 -> b
+    15:15:com.android.tools.r8.graph.DexString lookupString(int,byte[]):2437:2437 -> b
+    16:16:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2487:2487 -> b
+    17:21:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2508:2512 -> b
+    17:21:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2489 -> b
+    22:22:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):2517:2517 -> b
+    23:23:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):2521:2521 -> b
+    24:27:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2566:2569 -> b
+    28:33:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2648:2653 -> b
+    28:33:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2570 -> b
+    34:34:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2567:2567 -> b
+    35:35:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2584:2584 -> b
+    36:38:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2738:2740 -> b
     1:1:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2496:2496 -> c
     2:6:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2508:2512 -> c
     2:6:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2497 -> c
@@ -27794,8 +27568,7 @@
     1:5:java.util.List extractMarkers():2448:2452 -> g
     1:1:boolean getSkipNameValidationForTesting():902:902 -> h
     1:3:boolean verifyNoCachedTypeElements():2810:2812 -> i
-com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.v0:
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.internal.Ag:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.internal.ig:
     com.android.tools.r8.graph.DexField TYPE -> q
     com.android.tools.r8.graph.DexField SUPPORTED_64_BIT_ABIS -> n
     com.android.tools.r8.graph.DexField SUPPORTED_32_BIT_ABIS -> m
@@ -27815,7 +27588,7 @@
     com.android.tools.r8.graph.DexField CPU_ABI -> c
     1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):914:936 -> <init>
     1:17:void forEachFinalField(java.util.function.Consumer):940:956 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.internal.Bg:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.internal.jg:
     com.android.tools.r8.graph.DexField SECURITY_PATCH -> e
     com.android.tools.r8.graph.DexField RELEASE -> b
     com.android.tools.r8.graph.DexField CODENAME -> a
@@ -27823,21 +27596,21 @@
     com.android.tools.r8.graph.DexField SDK -> c
     1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):960:967 -> <init>
     1:5:void forEachFinalField(java.util.function.Consumer):971:975 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.internal.Cg:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.internal.kg:
     com.android.tools.r8.graph.DexField EMPTY -> b
     com.android.tools.r8.graph.DexField CREATOR -> a
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):979:983 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):987:988 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.internal.Dg:
+com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.internal.lg:
     com.android.tools.r8.graph.DexField S_IXUSR -> b
     com.android.tools.r8.graph.DexField S_IRUSR -> a
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):992:995 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):999:1000 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers -> com.android.tools.r8.internal.Eg:
+com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers -> com.android.tools.r8.internal.mg:
     com.android.tools.r8.graph.DexMethod set -> b
     com.android.tools.r8.graph.DexMethod put -> a
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1027:1031 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.internal.Fg:
+com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.internal.ng:
     com.android.tools.r8.graph.DexField SELECTED_STATE_SET -> e
     com.android.tools.r8.graph.DexField EMPTY_STATE_SET -> b
     com.android.tools.r8.graph.DexField TRANSLATION_Z -> a
@@ -27845,18 +27618,18 @@
     com.android.tools.r8.graph.DexField ENABLED_STATE_SET -> c
     1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1004:1015 -> <init>
     1:5:void forEachFinalField(java.util.function.Consumer):1019:1023 -> a
-com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.w0:
+com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.q0:
     com.android.tools.r8.graph.DexMethod initMessageAndCause -> b
     com.android.tools.r8.graph.DexMethod initMessage -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1324:1324 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1328:1333 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.x0:
+com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.r0:
     java.util.Set updaters -> b
     com.android.tools.r8.graph.DexMethod referenceUpdater -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1772:1772 -> <init>
     2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1778:1797 -> <init>
     1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):1801:1801 -> a
-com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.y0$a:
+com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.s0$a:
     com.android.tools.r8.graph.DexField TRUE -> b
     com.android.tools.r8.graph.DexMethod toString -> g
     com.android.tools.r8.graph.DexField FALSE -> a
@@ -27868,22 +27641,22 @@
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1049:1049 -> <init>
     3:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1036:1047 -> <init>
     1:3:void forEachFinalField(java.util.function.Consumer):1053:1055 -> a
-com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.internal.Gg:
+com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.internal.og:
     java.util.List bufferCovariantMethods -> a
     1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1434:1445 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ByteMembers -> com.android.tools.r8.graph.z0:
+com.android.tools.r8.graph.DexItemFactory$ByteMembers -> com.android.tools.r8.graph.t0:
     com.android.tools.r8.graph.DexMethod valueOf -> c
     com.android.tools.r8.graph.DexMethod toString -> b
     com.android.tools.r8.graph.DexMethod byteValue -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1059:1059 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1068:1068 -> <init>
     3:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1061:1066 -> <init>
-com.android.tools.r8.graph.DexItemFactory$CharMembers -> com.android.tools.r8.graph.A0:
+com.android.tools.r8.graph.DexItemFactory$CharMembers -> com.android.tools.r8.graph.u0:
     com.android.tools.r8.graph.DexMethod toString -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1071:1071 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1076:1076 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1073:1074 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.B0:
+com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.v0:
     com.android.tools.r8.graph.DexMethod newInstance -> l
     com.android.tools.r8.graph.DexMethod getPackage -> k
     com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> j
@@ -27902,18 +27675,18 @@
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1531:1531 -> <init>
     3:62:void <init>(com.android.tools.r8.graph.DexItemFactory):1513:1572 -> <init>
     1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1580:1580 -> a
-com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.C0:
+com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.w0:
     com.android.tools.r8.graph.DexMethod newInstance -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1588:1588 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1592:1594 -> <init>
-com.android.tools.r8.graph.DexItemFactory$DoubleMembers -> com.android.tools.r8.graph.D0:
+com.android.tools.r8.graph.DexItemFactory$DoubleMembers -> com.android.tools.r8.graph.x0:
     com.android.tools.r8.graph.DexMethod toString -> b
     com.android.tools.r8.graph.DexMethod isNaN -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1256:1256 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1263:1263 -> <init>
     3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):1260:1267 -> <init>
     11:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1265:1265 -> <init>
-com.android.tools.r8.graph.DexItemFactory$EnumMembers -> com.android.tools.r8.graph.E0:
+com.android.tools.r8.graph.DexItemFactory$EnumMembers -> com.android.tools.r8.graph.y0:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexMethod finalize -> l
     com.android.tools.r8.graph.DexMethod constructor -> k
@@ -27943,67 +27716,67 @@
     4:4:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1703 -> b
     5:5:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> b
     5:5:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1704 -> b
-com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.graph.F0:
+com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.graph.z0:
     com.android.tools.r8.graph.DexField TYPE -> a
     com.android.tools.r8.graph.DexMethod toString -> b
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1079:1079 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1086:1086 -> <init>
     3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1081:1084 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1090:1090 -> a
-com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.internal.Hg:
+com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.internal.pg:
     com.android.tools.r8.graph.DexMethod initWithMessage -> a
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1716:1720 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1719:1719 -> <init>
-com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.internal.Ig:
+com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.internal.qg:
     com.android.tools.r8.graph.DexField TYPE -> a
     com.android.tools.r8.graph.DexMethod toString -> b
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1273:1278 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1282:1282 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.internal.Jg:
+com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.internal.rg:
     com.android.tools.r8.graph.DexField separator -> b
     com.android.tools.r8.graph.DexField pathSeparator -> a
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1094:1097 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):1101:1102 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaLangAnnotationRetentionPolicyMembers -> com.android.tools.r8.graph.G0:
+com.android.tools.r8.graph.DexItemFactory$JavaLangAnnotationRetentionPolicyMembers -> com.android.tools.r8.graph.A0:
     com.android.tools.r8.graph.DexField CLASS -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1602:1602 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1608:1608 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1604:1605 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaLangReflectArrayMembers -> com.android.tools.r8.graph.H0:
+com.android.tools.r8.graph.DexItemFactory$JavaLangReflectArrayMembers -> com.android.tools.r8.graph.B0:
     com.android.tools.r8.graph.DexMethod newInstanceMethodWithDimensions -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1611:1611 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1619:1619 -> <init>
     3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1613:1616 -> <init>
     7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1614:1614 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods -> com.android.tools.r8.graph.I0:
+com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods -> com.android.tools.r8.graph.C0:
     com.android.tools.r8.graph.DexMethod identityHashCode -> b
     com.android.tools.r8.graph.DexMethod arraycopy -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1622:1622 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1632:1632 -> <init>
     3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1624:1627 -> <init>
     7:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1625:1630 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.internal.Kg:
+com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.internal.sg:
     com.android.tools.r8.graph.DexField ZERO -> b
     com.android.tools.r8.graph.DexField ONE -> a
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1106:1110 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):1114:1115 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.internal.Lg:
+com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.internal.tg:
     com.android.tools.r8.graph.DexField BIG_ENDIAN -> b
     com.android.tools.r8.graph.DexField LITTLE_ENDIAN -> a
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1119:1124 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):1128:1129 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.J0:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.D0:
     com.android.tools.r8.graph.DexMethod equalsObjectArray -> b
     com.android.tools.r8.graph.DexMethod asList -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1133:1133 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1138:1142 -> <init>
     7:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1140:1146 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.internal.Mg:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.internal.ug:
     com.android.tools.r8.graph.DexField EMPTY_SET -> b
     com.android.tools.r8.graph.DexField EMPTY_LIST -> a
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1154:1159 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):1163:1164 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.internal.Ng:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.internal.vg:
     com.android.tools.r8.graph.DexField NANOSECONDS -> f
     com.android.tools.r8.graph.DexField MINUTES -> e
     com.android.tools.r8.graph.DexField SECONDS -> g
@@ -28013,13 +27786,13 @@
     com.android.tools.r8.graph.DexField MICROSECONDS -> c
     1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1168:1183 -> <init>
     1:7:void forEachFinalField(java.util.function.Consumer):1187:1193 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.internal.Og:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.internal.wg:
     com.android.tools.r8.graph.DexField ROOT -> b
     com.android.tools.r8.graph.DexField ENGLISH -> a
     com.android.tools.r8.graph.DexField US -> c
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1197:1201 -> <init>
     1:3:void forEachFinalField(java.util.function.Consumer):1205:1207 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.internal.Pg:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.internal.xg:
     com.android.tools.r8.graph.DexField WARNING -> f
     com.android.tools.r8.graph.DexField SEVERE -> e
     com.android.tools.r8.graph.DexField FINE -> b
@@ -28028,10 +27801,10 @@
     com.android.tools.r8.graph.DexField FINER -> c
     1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1211:1224 -> <init>
     1:6:void forEachFinalField(java.util.function.Consumer):1228:1233 -> a
-com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.internal.Qg:
+com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.internal.yg:
     1:1:void <init>():909:909 -> <init>
     void forEachFinalField(java.util.function.Consumer) -> a
-com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.K0:
+com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.E0:
     com.android.tools.r8.graph.DexField TYPE -> a
     com.android.tools.r8.graph.DexMethod toString -> b
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1237:1237 -> <init>
@@ -28039,11 +27812,11 @@
     3:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1239:1247 -> <init>
     12:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1246:1246 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1252:1252 -> a
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.internal.Rg:
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.internal.zg:
     com.android.tools.r8.graph.DexMethod initWithMessage -> b
     com.android.tools.r8.graph.DexMethod init -> a
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1708:1713 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMembers -> com.android.tools.r8.graph.y0$b:
+com.android.tools.r8.graph.DexItemFactory$ObjectMembers -> com.android.tools.r8.graph.s0$b:
     com.android.tools.r8.graph.DexMethod waitLongInt -> n
     com.android.tools.r8.graph.DexMethod waitLong -> m
     com.android.tools.r8.graph.DexMethod wait -> l
@@ -28062,12 +27835,12 @@
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1390:1390 -> <init>
     3:47:void <init>(com.android.tools.r8.graph.DexItemFactory):1367:1411 -> <init>
     1:12:boolean isObjectMember(com.android.tools.r8.graph.DexMethod):1419:1430 -> a
-com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.internal.Sg:
+com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.internal.Ag:
     com.android.tools.r8.graph.DexMethod bootstrap -> a
     1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1346:1357 -> <init>
     13:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1350:1350 -> <init>
     14:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1348:1348 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.y0$c:
+com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.s0$c:
     com.android.tools.r8.graph.DexMethod toStringWithObjectAndNullDefault -> k
     com.android.tools.r8.graph.DexMethod toStringWithObject -> j
     com.android.tools.r8.graph.DexMethod requireNonNullElseGet -> i
@@ -28086,7 +27859,7 @@
     23:39:void <init>(com.android.tools.r8.graph.DexItemFactory):1465:1481 -> <init>
     40:47:void <init>(com.android.tools.r8.graph.DexItemFactory):1479:1486 -> <init>
     48:48:void <init>(com.android.tools.r8.graph.DexItemFactory):1484:1484 -> <init>
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.internal.Tg:
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.internal.Bg:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -28100,23 +27873,23 @@
     1:14:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):2079:2092 -> a
     15:20:java.util.Set createStrings(java.lang.String[]):2097:2102 -> a
     1:7:boolean isPolymorphicInvoke(com.android.tools.r8.graph.DexMethod):2106:2112 -> b
-com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.L0:
+com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.F0:
     java.util.Map boxedFieldTypeToPrimitiveType -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1729:1729 -> <init>
     2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1741:1760 -> <init>
     1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):1764:1764 -> a
-com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.M0:
+com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.G0:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):2118:2118 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):2122:2127 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):2124:2124 -> <init>
-com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.internal.Ug:
+com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.internal.Cg:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod hashCode -> c
     com.android.tools.r8.graph.DexMethod equals -> b
     com.android.tools.r8.graph.DexMethod constructor -> a
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1338:1343 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.N0:
+com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.H0:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
@@ -28125,12 +27898,12 @@
     2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):2138:2144 -> <init>
     9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):2142:2150 -> <init>
     18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):2147:2152 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ShortMembers -> com.android.tools.r8.graph.O0:
+com.android.tools.r8.graph.DexItemFactory$ShortMembers -> com.android.tools.r8.graph.I0:
     com.android.tools.r8.graph.DexMethod toString -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1805:1805 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1810:1810 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1807:1808 -> <init>
-com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.P0:
+com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.J0:
     com.android.tools.r8.graph.DexMethod toString -> m
     com.android.tools.r8.graph.DexMethod stringConstructor -> l
     com.android.tools.r8.graph.DexMethod intConstructor -> k
@@ -28162,13 +27935,13 @@
     2056:2056:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2023:2023 -> a
     2053:2053:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2023:2023 -> a
     1:1:boolean isAppendPrimitiveMethod(com.android.tools.r8.graph.DexMethod):1984:1984 -> b
-com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.internal.Vg:
+com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.internal.Dg:
     com.android.tools.r8.graph.DexMethod makeConcatWithConstants -> b
     com.android.tools.r8.graph.DexMethod makeConcat -> a
     1:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1286:1292 -> <init>
     8:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1289:1298 -> <init>
     18:18:void <init>(com.android.tools.r8.graph.DexItemFactory):1294:1294 -> <init>
-com.android.tools.r8.graph.DexItemFactory$StringMembers -> com.android.tools.r8.graph.y0$d:
+com.android.tools.r8.graph.DexItemFactory$StringMembers -> com.android.tools.r8.graph.s0$d:
     com.android.tools.r8.graph.DexMethod lastIndexOfString -> o
     com.android.tools.r8.graph.DexMethod lastIndexOfInt -> n
     com.android.tools.r8.graph.DexMethod indexOfString -> m
@@ -28195,11 +27968,11 @@
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1845:1845 -> <init>
     3:77:void <init>(com.android.tools.r8.graph.DexItemFactory):1815:1889 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1895:1895 -> a
-com.android.tools.r8.graph.DexItemFactory$SupplierMembers -> com.android.tools.r8.graph.Q0:
+com.android.tools.r8.graph.DexItemFactory$SupplierMembers -> com.android.tools.r8.graph.K0:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):2028:2028 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):2032:2032 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.DexItemFactory):2030:2030 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.y0$e:
+com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.s0$e:
     com.android.tools.r8.graph.DexMethod initCause -> d
     com.android.tools.r8.graph.DexMethod getSuppressed -> c
     com.android.tools.r8.graph.DexMethod getMessage -> b
@@ -28209,7 +27982,7 @@
     5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1309:1312 -> <init>
     9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1311:1318 -> <init>
     17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1316:1316 -> <init>
-com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.R0:
+com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.L0:
     int $r8$clinit -> u
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():22:22 -> <clinit>
@@ -28229,7 +28002,7 @@
     6:6:java.lang.String toSourceString():109:109 -> f0
     boolean isNotProgramClass() -> o1
     1:1:java.lang.String toString():104:104 -> toString
-com.android.tools.r8.graph.DexMember -> com.android.tools.r8.graph.S0:
+com.android.tools.r8.graph.DexMember -> com.android.tools.r8.graph.M0:
     com.android.tools.r8.graph.DexString name -> g
     boolean $assertionsDisabled -> h
     com.android.tools.r8.graph.DexType holder -> f
@@ -28244,20 +28017,20 @@
     1:1:com.android.tools.r8.graph.DexString getName():45:45 -> p0
     java.lang.Iterable getReferencedTypes() -> q0
     1:1:com.android.tools.r8.graph.DexType getContextType():37:37 -> y
-com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.T0:
+com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.N0:
     com.android.tools.r8.graph.DexItem annotations -> c
     com.android.tools.r8.graph.DexMember item -> b
     1:3:void <init>(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexItem):14:16 -> <init>
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):21:21 -> a
     1:3:boolean equals(java.lang.Object):34:36 -> equals
     1:1:int hashCode():26:26 -> hashCode
-com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.internal.Wg:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.internal.Eg:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexAnnotationSet):44:44 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.internal.Xg:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.internal.Fg:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexAnnotationSet):56:56 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.internal.Yg:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.internal.Gg:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ParameterAnnotationsList):69:69 -> <init>
-com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.U0:
+com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.O0:
     com.android.tools.r8.graph.DexProto proto -> i
     1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,boolean):27:30 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,boolean):0:0 -> <init>
@@ -28280,12 +28053,10 @@
     12:12:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):68 -> a
     13:13:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74:74 -> a
     13:13:java.lang.Iterable getReferencedTypes():213 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):68 -> a
     14:14:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
     14:14:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74 -> a
     14:14:java.lang.Iterable getReferencedTypes():213 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     14:14:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):68 -> a
     15:15:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):68:68 -> a
     16:21:com.android.tools.r8.graph.DexType getArgumentType(int,boolean):73:78 -> a
@@ -28339,8 +28110,8 @@
     2:2:java.lang.String toSmaliString():256 -> e0
     3:3:java.lang.String toSmaliString():256:256 -> e0
     1:1:java.lang.String toSourceString():261:261 -> f0
-    1:5:boolean computeEquals(java.lang.Object):223:227 -> g
     1:1:int computeHashCode():218:218 -> g0
+    1:5:boolean computeEquals(java.lang.Object):223:227 -> h
     1:1:com.android.tools.r8.graph.DexType getParameter(int):86:86 -> i
     com.android.tools.r8.graph.DexMethod asDexMethod() -> j0
     boolean isDexMethod() -> m0
@@ -28348,11 +28119,9 @@
     1:1:java.lang.Iterable getReferencedTypes():213:213 -> q0
     2:2:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74:74 -> q0
     2:2:java.lang.Iterable getReferencedTypes():213 -> q0
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> q0
     3:3:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74 -> q0
     3:3:java.lang.Iterable getReferencedTypes():213 -> q0
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     1:12:com.android.tools.r8.references.MethodReference asMethodReference():152:163 -> r0
     13:13:com.android.tools.r8.references.MethodReference asMethodReference():161:161 -> r0
     1:1:int getArity():169:169 -> s0
@@ -28364,7 +28133,7 @@
     1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():173 -> w0
     1:1:java.lang.String qualifiedName():251:251 -> x0
     1:1:java.lang.String toSourceStringWithoutHolder():265:265 -> y0
-com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.W0:
+com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.Q0:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> e
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethod rewrittenTarget -> h
@@ -28403,58 +28172,51 @@
     56:57:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):223:224 -> a
     58:58:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(java.lang.String,java.lang.String,java.lang.String):90:90 -> a
     58:58:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):224 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     59:59:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):94:94 -> a
     59:59:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(java.lang.String,java.lang.String,java.lang.String):90 -> a
     59:59:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):224 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     60:60:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):225:225 -> a
     61:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):98:98 -> a
     61:61:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):225 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     62:62:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):226:226 -> a
     63:63:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.JarApplicationReader.getMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):115:115 -> a
     63:63:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):226 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     64:64:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.DexItemFactory.createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2686:2686 -> a
     64:64:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.JarApplicationReader.getMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):115 -> a
     64:64:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):226 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     68:79:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):258:269 -> a
     80:80:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     80:80:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269 -> a
     81:81:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
     81:81:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
     81:81:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269 -> a
-    82:82:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
-    82:82:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):272 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    83:83:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
-    83:83:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    82:82:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):272:272 -> a
+    83:83:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
     83:83:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):272 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    84:84:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    84:84:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
+    84:84:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     84:84:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     84:84:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):272 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    85:85:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):280:280 -> a
-    86:86:boolean isMethodHandle():294:294 -> a
-    86:86:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):338 -> a
-    87:101:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):339:353 -> a
-    102:102:boolean isFieldHandle():290:290 -> a
-    102:102:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):353 -> a
-    103:110:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):353:360 -> a
-    111:132:int getAsmTag():364:385 -> a
-    111:132:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):360 -> a
-    133:133:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):360:360 -> a
-    134:134:int lambda$specify$0(com.android.tools.r8.graph.DexMethodHandle):322:322 -> a
-    135:139:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):322:326 -> a
+    85:85:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    85:85:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
+    85:85:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    85:85:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):272 -> a
+    86:86:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):280:280 -> a
+    87:87:boolean isMethodHandle():294:294 -> a
+    87:87:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):338 -> a
+    88:102:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):339:353 -> a
+    103:103:boolean isFieldHandle():290:290 -> a
+    103:103:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):353 -> a
+    104:111:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):353:360 -> a
+    112:133:int getAsmTag():364:385 -> a
+    112:133:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):360 -> a
+    134:134:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):360:360 -> a
+    135:135:int lambda$specify$0(com.android.tools.r8.graph.DexMethodHandle):322:322 -> a
+    136:140:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):322:326 -> a
     1:1:boolean lambda$specify$1(com.android.tools.r8.graph.DexMethodHandle):325:325 -> b
     1:1:com.android.tools.r8.graph.DexMethod lambda$specify$2(com.android.tools.r8.graph.DexMethodHandle):326:326 -> c
     1:1:java.lang.String toSmaliString():286:286 -> e0
-    1:6:boolean computeEquals(java.lang.Object):236:241 -> g
     1:1:int computeHashCode():231:231 -> g0
+    1:6:boolean computeEquals(java.lang.Object):236:241 -> h
     1:1:com.android.tools.r8.graph.DexField asField():307:307 -> h0
     2:2:boolean isFieldHandle():290:290 -> h0
     2:2:com.android.tools.r8.graph.DexField asField():307 -> h0
@@ -28467,7 +28229,7 @@
     1:1:boolean isMethodHandle():294:294 -> k0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():318:318 -> n
     1:7:java.lang.String toString():248:254 -> toString
-com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.graph.V0:
+com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.graph.P0:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_INSTANCE -> h
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_STATIC -> g
     boolean $assertionsDisabled -> n
@@ -28525,7 +28287,7 @@
     20:20:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():176:176 -> f
     21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():174:174 -> f
     22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():172:172 -> f
-com.android.tools.r8.graph.DexMethodSignature -> com.android.tools.r8.graph.Z0:
+com.android.tools.r8.graph.DexMethodSignature -> com.android.tools.r8.graph.T0:
     int $r8$clinit -> b
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.graph.DexString getName() -> a
@@ -28553,20 +28315,20 @@
     11:11:com.android.tools.r8.graph.DexType getParameter(int):33:33 -> toString
     11:11:java.lang.String toString():95 -> toString
     12:14:java.lang.String toString():95:97 -> toString
-com.android.tools.r8.graph.DexMethodSignature$MethodBased -> com.android.tools.r8.graph.X0:
+com.android.tools.r8.graph.DexMethodSignature$MethodBased -> com.android.tools.r8.graph.R0:
     com.android.tools.r8.graph.DexMethod method -> c
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):104:105 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexString getName():110:110 -> a
     1:1:com.android.tools.r8.graph.DexProto getProto():115:115 -> b
-com.android.tools.r8.graph.DexMethodSignature$NameAndProtoBased -> com.android.tools.r8.graph.Y0:
+com.android.tools.r8.graph.DexMethodSignature$NameAndProtoBased -> com.android.tools.r8.graph.S0:
     com.android.tools.r8.graph.DexString name -> c
     com.android.tools.r8.graph.DexProto proto -> d
     1:3:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):124:126 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexString getName():131:131 -> a
     1:1:com.android.tools.r8.graph.DexProto getProto():136:136 -> b
-com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.b1:
+com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.V0:
     com.android.tools.r8.synthesis.SyntheticMarker syntheticMarker -> y
     com.android.tools.r8.graph.DexProgramClass[] EMPTY_ARRAY -> z
     com.android.tools.r8.kotlin.KotlinClassLevelInfo kotlinInfo -> w
@@ -28617,162 +28379,122 @@
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> R
     1:1:java.lang.Iterable virtualProgramMethods():243:243 -> R1
     boolean isProgramClass() -> U
-    1:3:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):18:20 -> a
-    1:3:void lambda$collectIndexedItems$24(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):399 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> a
-    4:4:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:void lambda$collectIndexedItems$24(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):399 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    5:5:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
-    5:5:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
-    5:5:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    5:5:void lambda$collectIndexedItems$24(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):399 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    6:7:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):21:22 -> a
-    6:7:void lambda$collectIndexedItems$24(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):399 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:10:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60:62 -> a
-    8:10:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
-    11:11:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):62 -> a
-    11:11:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    12:12:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
-    12:12:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
-    12:12:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):62 -> a
-    12:12:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    13:13:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    13:13:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
-    13:13:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
-    13:13:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):62 -> a
-    13:13:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(4)"]}
-    14:18:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63:67 -> a
-    14:18:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> a
-    19:19:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):67 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    20:20:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
-    20:20:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
-    20:20:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):67 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    20:20:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    21:21:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68:68 -> a
-    21:21:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    22:22:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):153:153 -> a
-    23:37:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):181:195 -> a
-    38:38:boolean lambda$forEachProgramInstanceInitializerMatching$19(java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod):272:272 -> a
-    39:39:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$21(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):341:341 -> a
-    40:40:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$22(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):346:346 -> a
-    41:42:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):356:357 -> a
-    43:45:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$23(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):359:361 -> a
-    46:47:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):378:379 -> a
-    48:48:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
-    48:48:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
-    49:49:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1227,"2":1228,"3":1229}}
-    1227:1227:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1227:1227:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
-    1228:1228:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1228:1228:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
-    1229:1229:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    1229:1229:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
-    1229:1229:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
-    429:429:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):380:380 -> a
-    430:430:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
-    430:430:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
-    431:431:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1230,"2":1231,"3":1232}}
-    1230:1230:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1230:1230:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
-    1231:1231:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1231:1231:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
-    1232:1232:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    1232:1232:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
-    1232:1232:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
-    814:816:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):383:385 -> a
-    817:817:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    817:817:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):386 -> a
-    818:818:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388:388 -> a
-    819:819:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> a
-    819:819:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    820:820:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
-    820:820:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
-    820:820:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    821:821:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):389:389 -> a
-    822:823:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):113:114 -> a
-    822:823:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
-    824:824:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
-    824:824:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    824:824:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
-    825:825:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1233,"2":1234,"3":1235}}
-    1233:1233:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1233:1233:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    1233:1233:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
-    1234:1234:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1234:1234:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    1234:1234:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
-    1235:1235:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    1235:1235:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
-    1235:1235:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    1235:1235:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
-    1217:1224:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):392:399 -> a
-    1225:1225:void forEachProgramField(java.util.function.Consumer):199:199 -> a
-    1225:1225:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):399 -> a
-    1226:1226:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):400:400 -> a
-    1236:1240:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):406:410 -> a
-    1241:1241:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):422:422 -> a
-    1242:1242:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):779:779 -> a
-    1242:1242:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):422 -> a
-    1243:1243:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):473:473 -> a
-    1244:1246:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):487:489 -> a
-    1247:1251:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):502:506 -> a
-    1252:1259:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):516:523 -> a
-    1252:1259:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
-    1260:1260:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):578:578 -> a
-    1260:1260:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
-    1260:1260:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
-    1261:1263:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> a
-    1261:1263:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):579 -> a
-    1261:1263:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
-    1261:1263:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
-    1264:1265:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):583:584 -> a
-    1264:1265:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
-    1264:1265:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
-    1266:1268:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> a
-    1266:1268:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):584 -> a
-    1266:1268:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
-    1266:1268:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
-    1269:1269:int lambda$computeStaticValuesArray$27(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):637:637 -> a
-    1270:1272:boolean hasNonDefaultStaticFieldValues():655:657 -> a
-    1270:1272:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):632 -> a
-    1273:1273:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
-    1273:1273:boolean hasNonDefaultStaticFieldValues():657 -> a
-    1273:1273:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):632 -> a
-    1274:1284:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):635:645 -> a
-    1285:1285:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
-    1285:1285:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):645 -> a
-    1286:1286:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):650:650 -> a
-    1287:1288:void downgradeInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):738:739 -> a
-    1289:1289:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):779:779 -> a
-    1290:1290:java.util.Iterator lambda$asProgramClasses$28(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):780:780 -> a
-    1291:1291:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812:812 -> a
-    1292:1292:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1292:1292:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812 -> a
-    1293:1293:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812:812 -> a
+    1:1:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):153:153 -> a
+    2:16:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):181:195 -> a
+    17:17:boolean lambda$forEachProgramInstanceInitializerMatching$19(java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod):272:272 -> a
+    18:18:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$21(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):341:341 -> a
+    19:19:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$22(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):346:346 -> a
+    20:21:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):356:357 -> a
+    22:24:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$23(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):359:361 -> a
+    25:26:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):378:379 -> a
+    27:27:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
+    27:27:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
+    28:28:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1204,"2":1205,"3":1206}}
+    1204:1204:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1204:1204:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
+    1205:1205:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1205:1205:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
+    1206:1206:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    1206:1206:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
+    1206:1206:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
+    408:408:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):380:380 -> a
+    409:409:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
+    409:409:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
+    410:410:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1207,"2":1208,"3":1209}}
+    1207:1207:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1207:1207:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
+    1208:1208:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1208:1208:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
+    1209:1209:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    1209:1209:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
+    1209:1209:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
+    793:795:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):383:385 -> a
+    796:796:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    796:796:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):386 -> a
+    797:798:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388:389 -> a
+    799:800:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):113:114 -> a
+    799:800:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
+    801:801:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
+    801:801:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    801:801:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
+    802:802:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1210,"2":1211,"3":1212}}
+    1210:1210:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1210:1210:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    1210:1210:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
+    1211:1211:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1211:1211:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    1211:1211:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
+    1212:1212:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    1212:1212:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
+    1212:1212:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    1212:1212:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
+    1194:1201:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):392:399 -> a
+    1202:1202:void forEachProgramField(java.util.function.Consumer):199:199 -> a
+    1202:1202:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):399 -> a
+    1203:1203:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):400:400 -> a
+    1213:1213:void lambda$collectIndexedItems$24(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):399:399 -> a
+    1214:1218:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):18:22 -> a
+    1214:1218:void lambda$collectIndexedItems$24(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):399 -> a
+    1219:1219:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400:400 -> a
+    1220:1222:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60:62 -> a
+    1220:1222:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    1223:1223:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
+    1223:1223:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):62 -> a
+    1223:1223:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    1224:1224:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
+    1224:1224:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    1224:1224:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):62 -> a
+    1224:1224:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    1225:1225:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    1225:1225:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
+    1225:1225:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    1225:1225:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):62 -> a
+    1225:1225:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    1226:1231:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63:68 -> a
+    1226:1231:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    1232:1236:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):406:410 -> a
+    1237:1237:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):422:422 -> a
+    1238:1238:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):779:779 -> a
+    1238:1238:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):422 -> a
+    1239:1239:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):473:473 -> a
+    1240:1242:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):487:489 -> a
+    1243:1247:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):502:506 -> a
+    1248:1255:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):516:523 -> a
+    1248:1255:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
+    1256:1256:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):578:578 -> a
+    1256:1256:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
+    1256:1256:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
+    1257:1259:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> a
+    1257:1259:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):579 -> a
+    1257:1259:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
+    1257:1259:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
+    1260:1261:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):583:584 -> a
+    1260:1261:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
+    1260:1261:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
+    1262:1264:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> a
+    1262:1264:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):584 -> a
+    1262:1264:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
+    1262:1264:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
+    1265:1265:int lambda$computeStaticValuesArray$27(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):637:637 -> a
+    1266:1268:boolean hasNonDefaultStaticFieldValues():655:657 -> a
+    1266:1268:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):632 -> a
+    1269:1269:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
+    1269:1269:boolean hasNonDefaultStaticFieldValues():657 -> a
+    1269:1269:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):632 -> a
+    1270:1280:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):635:645 -> a
+    1281:1281:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
+    1281:1281:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):645 -> a
+    1282:1282:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):650:650 -> a
+    1283:1284:void downgradeInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):738:739 -> a
+    1285:1285:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):779:779 -> a
+    1286:1286:java.util.Iterator lambda$asProgramClasses$28(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):780:780 -> a
+    1287:1287:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812:812 -> a
+    1288:1288:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1288:1288:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812 -> a
+    1289:1289:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812:812 -> a
     com.android.tools.r8.graph.DexClass getContextClass() -> b
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> b
     1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexProgramClass):181:181 -> b
@@ -28788,7 +28510,6 @@
     11:12:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):421:422 -> b
     13:13:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):98:98 -> b
     13:13:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):422 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:17:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):423:426 -> b
     18:19:void com.android.tools.r8.graph.DexAnnotationSet.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):127:128 -> b
     18:19:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):426 -> b
@@ -28866,7 +28587,7 @@
     1:1:com.android.tools.r8.graph.DexType getContextType():723:723 -> y
     1:1:java.lang.Iterable directProgramMethods():235:235 -> y1
     1:1:long getChecksum():821:821 -> z1
-com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.a1:
+com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.U0:
     java.util.Iterator iterator -> c
     com.android.tools.r8.graph.DexProgramClass next -> b
     com.android.tools.r8.graph.DexDefinitionSupplier val$definitions -> d
@@ -28875,9 +28596,9 @@
     1:5:com.android.tools.r8.graph.DexProgramClass findNext():799:803 -> l
     1:2:com.android.tools.r8.graph.DexProgramClass next():793:794 -> next
     1:2:java.lang.Object next():780 -> next
-com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier -> com.android.tools.r8.graph.b1$a:
+com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier -> com.android.tools.r8.graph.V0$a:
     long getChecksum(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.c1:
+com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.W0:
     com.android.tools.r8.graph.DexProto SENTINEL -> h
     com.android.tools.r8.graph.DexString shorty -> e
     com.android.tools.r8.graph.DexTypeList parameters -> g
@@ -28919,34 +28640,29 @@
     253:253:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):103:103 -> a
     254:255:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):113:114 -> a
     254:255:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):103 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     256:256:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
     256:256:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
     256:256:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):103 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     257:257:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":261,"2":262,"3":263}}
     261:261:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
     261:261:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
     261:261:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):103 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     262:262:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
     262:262:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
     262:262:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):103 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     263:263:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
     263:263:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
     263:263:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
     263:263:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):103 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
     264:264:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):109:109 -> a
     1:1:com.android.tools.r8.graph.DexString lambda$specify$1(com.android.tools.r8.graph.DexProto):32:32 -> b
     2:2:java.lang.Iterable getParameterBaseTypes(com.android.tools.r8.graph.DexItemFactory):66:66 -> b
     3:3:com.android.tools.r8.graph.DexType lambda$getParameterBaseTypes$2(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):66:66 -> b
     1:1:java.lang.String toDescriptorString():118:118 -> e0
     1:1:java.lang.String toSmaliString():114 -> e0
-    1:5:boolean computeEquals(java.lang.Object):47:51 -> g
     1:1:int computeHashCode():58:58 -> g0
+    1:5:boolean computeEquals(java.lang.Object):47:51 -> h
     1:1:com.android.tools.r8.graph.DexType getReturnType():62:62 -> h0
     1:1:com.android.tools.r8.graph.DexType getParameter(int):83:83 -> i
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():37:37 -> n
@@ -28956,7 +28672,7 @@
     99:99:java.lang.String toString():96:96 -> toString
     100:100:java.lang.String toString():96:96 -> toString
     97:97:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.d1:
+com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.X0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -28978,7 +28694,7 @@
     1:1:int referenceTypeOrder():87 -> n0
     2:5:int referenceTypeOrder():90:93 -> n0
     com.android.tools.r8.graph.DexType getContextType() -> y
-com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.f1:
+com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.Z0:
     com.android.tools.r8.graph.DexString[] EMPTY_ARRAY -> g
     int size -> e
     boolean $assertionsDisabled -> h
@@ -29014,8 +28730,8 @@
     110:112:com.android.tools.r8.graph.DexString withoutArray(com.android.tools.r8.graph.DexItemFactory):522:524 -> a
     1:5:boolean endsWith(com.android.tools.r8.graph.DexString):480:484 -> b
     1:1:int compareTo(java.lang.Object):20:20 -> compareTo
-    1:3:boolean computeEquals(java.lang.Object):120:122 -> g
     1:1:int computeHashCode():115:115 -> g0
+    1:3:boolean computeEquals(java.lang.Object):120:122 -> h
     1:3:java.lang.String decode():145:147 -> h0
     1:32:int decodedHashCode():191:222 -> i0
     33:46:int decodedHashCode():205:218 -> i0
@@ -29039,7 +28755,7 @@
     1:1:com.android.tools.r8.utils.ThrowingCharIterator iterator():74:74 -> n0
     1:3:java.lang.String toASCIIString():138:140 -> o0
     1:3:java.lang.String toString():130:132 -> toString
-com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.e1:
+com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.Y0:
     com.android.tools.r8.graph.DexString this$0 -> b
     boolean $assertionsDisabled -> c
     int i -> a
@@ -29048,7 +28764,7 @@
     1:24:char nextChar():80:103 -> a
     25:25:char nextChar():81:81 -> a
     1:1:boolean hasNext():108:108 -> hasNext
-com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.g1:
+com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.a1:
     java.lang.String toStringCache -> g
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString descriptor -> f
@@ -29112,15 +28828,11 @@
     277:279:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):440:442 -> a
     280:280:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):473:473 -> a
     280:280:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):442 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     281:284:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):536:539 -> a
     281:284:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):473 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     281:284:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):442 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     285:285:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):473:473 -> a
     285:285:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):442 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     286:290:com.android.tools.r8.graph.DexType addSuffix(java.lang.String,com.android.tools.r8.graph.DexItemFactory):457:461 -> a
     291:295:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):477:481 -> a
     296:299:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):479:482 -> a
@@ -29155,8 +28867,8 @@
     4:4:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):516:516 -> c
     1:1:java.lang.String toSmaliString():235:235 -> e0
     1:9:java.lang.String toSourceString():217:225 -> f0
-    1:2:boolean computeEquals(java.lang.Object):129:130 -> g
     1:1:int computeHashCode():124:124 -> g0
+    1:2:boolean computeEquals(java.lang.Object):129:130 -> h
     com.android.tools.r8.graph.DexType asDexType() -> k0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():93:93 -> n
     1:1:com.android.tools.r8.references.ClassReference asClassReference():56:56 -> o0
@@ -29181,7 +28893,7 @@
     com.android.tools.r8.graph.DexType getContextType() -> y
     1:1:java.lang.String getTypeName():212:212 -> y0
     1:1:boolean isArrayType():318:318 -> z0
-com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.h1:
+com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.b1:
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> c
     com.android.tools.r8.graph.DexType[] values -> b
     int $r8$clinit -> e
@@ -29209,7 +28921,7 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():93:93 -> n
     1:1:int size():137:137 -> size
     1:8:java.lang.String toString():146:153 -> toString
-com.android.tools.r8.graph.DexTypeUtils -> com.android.tools.r8.internal.fh:
+com.android.tools.r8.graph.DexTypeUtils -> com.android.tools.r8.internal.Ng:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:8:com.android.tools.r8.graph.DexType computeLeastUpperBound(com.android.tools.r8.graph.AppView,java.lang.Iterable):16:23 -> a
@@ -29220,7 +28932,7 @@
     54:64:com.android.tools.r8.graph.DexType computeLeastUpperBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):68:78 -> a
     65:75:com.android.tools.r8.graph.DexType computeLeastUpperBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):77:87 -> a
     76:76:com.android.tools.r8.graph.DexType computeLeastUpperBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):38:38 -> a
-com.android.tools.r8.graph.DexValue -> com.android.tools.r8.graph.l1:
+com.android.tools.r8.graph.DexValue -> com.android.tools.r8.graph.e1:
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> b
     1:1:void <clinit>():145:145 -> <clinit>
     1:1:void <init>():34:34 -> <init>
@@ -29289,8 +29001,7 @@
     com.android.tools.r8.graph.DexValue$DexValueShort asDexValueShort() -> x0
     com.android.tools.r8.graph.DexValue$DexValueString asDexValueString() -> y0
     com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> z0
-com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.graph.i1:
-com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.graph.j1:
+com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.graph.c1:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
     1:1:void <clinit>():1274:1274 -> <clinit>
@@ -29315,7 +29026,7 @@
     8:8:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1295:1295 -> b
     1:1:java.lang.Object asAsmEncodedObject():1328:1328 -> g0
     com.android.tools.r8.graph.DexValue$DexItemBasedValueString asDexItemBasedValueString() -> h0
-com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.graph.k1:
+com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.graph.d1:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> c
     1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):1688:1689 -> <init>
     1:1:java.lang.Object getBoxedValue():1744:1744 -> A0
@@ -29339,7 +29050,7 @@
     1779:1779:java.lang.String toString():1776:1776 -> toString
     1780:1780:java.lang.String toString():1776:1776 -> toString
     1777:1777:java.lang.String toString():1776:1776 -> toString
-com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.graph.l1$a:
+com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.graph.e1$a:
     com.android.tools.r8.graph.DexValue[] values -> c
     1:2:void <init>(com.android.tools.r8.graph.DexValue[]):1579:1580 -> <init>
     1:1:java.lang.Object getBoxedValue():1631:1631 -> A0
@@ -29372,7 +29083,7 @@
     1673:1673:java.lang.String toString():1670:1670 -> toString
     1674:1674:java.lang.String toString():1670:1670 -> toString
     1671:1671:java.lang.String toString():1670:1670 -> toString
-com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.graph.l1$b:
+com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.graph.e1$b:
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> e
     com.android.tools.r8.graph.DexValue$DexValueBoolean DEFAULT -> f
@@ -29396,7 +29107,7 @@
     1:1:int hashCode():1942:1942 -> hashCode
     com.android.tools.r8.graph.DexValue$DexValueBoolean asDexValueBoolean() -> k0
     1:1:java.lang.String toString():1955:1955 -> toString
-com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.graph.l1$c:
+com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.graph.e1$c:
     byte value -> c
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> d
     1:1:void <clinit>():471:471 -> <clinit>
@@ -29424,7 +29135,7 @@
     556:556:java.lang.String toString():553:553 -> toString
     557:557:java.lang.String toString():553:553 -> toString
     554:554:java.lang.String toString():553:553 -> toString
-com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.graph.l1$d:
+com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.graph.e1$d:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> d
     char value -> c
     1:1:void <clinit>():657:657 -> <clinit>
@@ -29455,7 +29166,7 @@
     744:744:java.lang.String toString():741:741 -> toString
     745:745:java.lang.String toString():741:741 -> toString
     742:742:java.lang.String toString():741:741 -> toString
-com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.graph.l1$e:
+com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.graph.e1$e:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> d
     double value -> c
     1:1:void <clinit>():1034:1034 -> <clinit>
@@ -29472,7 +29183,7 @@
     5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1094 -> a
     6:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1095:1096 -> a
     8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1107:1107 -> a
-    9:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1142:1142 -> a
+    9:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1166:1166 -> a
     9:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1107 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1048:1048 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1053:1053 -> b
@@ -29486,7 +29197,7 @@
     1129:1129:java.lang.String toString():1126:1126 -> toString
     1130:1130:java.lang.String toString():1126:1126 -> toString
     1127:1127:java.lang.String toString():1126:1126 -> toString
-com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.graph.m1:
+com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.graph.f1:
     1:1:void <init>(com.android.tools.r8.graph.DexField):1494:1494 -> <init>
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1509:1509 -> B0
     boolean isNestedDexValue() -> N0
@@ -29500,7 +29211,7 @@
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1499 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1504:1504 -> b
     com.android.tools.r8.graph.DexValue$DexValueEnum asDexValueEnum() -> o0
-com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.graph.n1:
+com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.graph.g1:
     1:1:void <init>(com.android.tools.r8.graph.DexField):1410:1410 -> <init>
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1425:1425 -> B0
     boolean isNestedDexValue() -> N0
@@ -29514,7 +29225,7 @@
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1415 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1420:1420 -> b
     com.android.tools.r8.graph.DexValue$DexValueField asDexValueField() -> p0
-com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.graph.l1$f:
+com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.graph.e1$f:
     float value -> c
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> d
     1:1:void <clinit>():937:937 -> <clinit>
@@ -29531,7 +29242,7 @@
     5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):996 -> a
     6:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):997:998 -> a
     8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1009:1009 -> a
-    9:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1146:1146 -> a
+    9:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1170:1170 -> a
     9:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1009 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):950:950 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):955:955 -> b
@@ -29545,7 +29256,7 @@
     1031:1031:java.lang.String toString():1028:1028 -> toString
     1032:1032:java.lang.String toString():1028:1028 -> toString
     1029:1029:java.lang.String toString():1028:1028 -> toString
-com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.graph.l1$g:
+com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.graph.e1$g:
     int value -> c
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> d
     1:1:void <clinit>():753:753 -> <clinit>
@@ -29571,7 +29282,7 @@
     836:836:java.lang.String toString():833:833 -> toString
     837:837:java.lang.String toString():833:833 -> toString
     834:834:java.lang.String toString():833:833 -> toString
-com.android.tools.r8.graph.DexValue$DexValueKind -> com.android.tools.r8.graph.o1:
+com.android.tools.r8.graph.DexValue$DexValueKind -> com.android.tools.r8.graph.h1:
     com.android.tools.r8.graph.DexValue$DexValueKind ENUM -> p
     com.android.tools.r8.graph.DexValue$DexValueKind ARRAY -> q
     com.android.tools.r8.graph.DexValue$DexValueKind ANNOTATION -> r
@@ -29595,7 +29306,7 @@
     19:19:void <clinit>():36:36 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):101:102 -> <init>
     1:1:byte toByte():106:106 -> a
-com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.graph.l1$h:
+com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.graph.e1$h:
     long value -> c
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> d
     1:1:void <clinit>():845:845 -> <clinit>
@@ -29609,7 +29320,7 @@
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):877:877 -> a
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):902:902 -> a
     4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):931:931 -> a
-    5:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1158:1158 -> a
+    5:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1182:1182 -> a
     5:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):931 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):858:858 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):863:863 -> b
@@ -29623,7 +29334,7 @@
     928:928:java.lang.String toString():925:925 -> toString
     929:929:java.lang.String toString():925:925 -> toString
     926:926:java.lang.String toString():925:925 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.graph.p1:
+com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.graph.i1:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):1452:1452 -> <init>
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1467:1467 -> B0
     boolean isNestedDexValue() -> N0
@@ -29633,23 +29344,20 @@
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1472:1472 -> a
     3:3:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1472 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     4:4:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1472 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     5:5:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
     5:5:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
     5:5:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1472 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
     6:6:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1487:1487 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1457:1457 -> b
     2:2:int com.android.tools.r8.graph.DexMethod.acceptCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1457 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1462:1462 -> b
     com.android.tools.r8.graph.DexValue$DexValueMethod asDexValueMethod() -> t0
-com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.graph.q1:
+com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.graph.j1:
     1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1968:1968 -> <init>
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1993:1993 -> B0
     boolean isNestedDexValue() -> N0
@@ -29661,7 +29369,7 @@
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1973:1973 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1978:1978 -> b
     com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> u0
-com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.graph.r1:
+com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.graph.k1:
     1:1:void <init>(com.android.tools.r8.graph.DexProto):1536:1536 -> <init>
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1561:1561 -> B0
     boolean isNestedDexValue() -> N0
@@ -29673,7 +29381,7 @@
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1541:1541 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1546:1546 -> b
     com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> v0
-com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.graph.s1:
+com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.graph.l1:
     com.android.tools.r8.graph.DexValue NULL -> c
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():1780:1782 -> <clinit>
@@ -29684,14 +29392,14 @@
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1811:1811 -> a
     2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1821:1821 -> a
     3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1865:1865 -> a
-    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1193:1193 -> a
+    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1217:1217 -> a
     4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1865 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1790:1790 -> b
     2:3:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1795:1796 -> b
     1:1:boolean equals(java.lang.Object):1854:1854 -> equals
     java.lang.Object asAsmEncodedObject() -> g0
     1:1:java.lang.String toString():1859:1859 -> toString
-com.android.tools.r8.graph.DexValue$DexValueNumber -> com.android.tools.r8.graph.t1:
+com.android.tools.r8.graph.DexValue$DexValueNumber -> com.android.tools.r8.graph.m1:
     1:1:void com.android.tools.r8.graph.DexValue$SimpleDexValue.<init>():427:427 -> <init>
     1:1:void com.android.tools.r8.graph.DexValue$SimpleDexValue.<init>(com.android.tools.r8.graph.DexValue$1):427 -> <init>
     1:1:void <init>():449 -> <init>
@@ -29715,7 +29423,7 @@
     6:6:void com.android.tools.r8.graph.DexValue$SimpleDexValue.writeIntegerTo(com.android.tools.r8.graph.DexValue$DexValueKind,long,int,com.android.tools.r8.dex.DexOutputBuffer):445:445 -> a
     7:7:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):465:465 -> a
     com.android.tools.r8.graph.DexValue$DexValueNumber asDexValueNumber() -> w0
-com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.graph.l1$i:
+com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.graph.e1$i:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> d
     short value -> c
     1:1:void <clinit>():565:565 -> <clinit>
@@ -29741,7 +29449,7 @@
     649:649:java.lang.String toString():645:645 -> toString
     646:646:java.lang.String toString():645:645 -> toString
     com.android.tools.r8.graph.DexValue$DexValueShort asDexValueShort() -> x0
-com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.graph.l1$j:
+com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.graph.e1$j:
     1:1:void <init>(com.android.tools.r8.graph.DexString):1203:1203 -> <init>
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1242:1242 -> B0
     boolean isDexValueString() -> L0
@@ -29771,7 +29479,7 @@
     9:9:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1217 -> b
     1:1:java.lang.Object asAsmEncodedObject():1237:1237 -> g0
     com.android.tools.r8.graph.DexValue$DexValueString asDexValueString() -> y0
-com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.graph.l1$k:
+com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.graph.e1$k:
     1:1:void <init>(com.android.tools.r8.graph.DexType):1368:1368 -> <init>
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1383:1383 -> B0
     boolean isDexValueType() -> M0
@@ -29797,7 +29505,7 @@
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1373 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1378:1378 -> b
     com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> z0
-com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.graph.l1$l:
+com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.graph.e1$l:
     com.android.tools.r8.graph.IndexedDexItem value -> c
     1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):1130:1130 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):1134:1135 -> <init>
@@ -29835,7 +29543,7 @@
     1199:1199:java.lang.String toString():1196:1196 -> toString
     1200:1200:java.lang.String toString():1196:1196 -> toString
     1197:1197:java.lang.String toString():1196:1196 -> toString
-com.android.tools.r8.graph.DexWritableCode -> com.android.tools.r8.graph.v1:
+com.android.tools.r8.graph.DexWritableCode -> com.android.tools.r8.graph.o1:
     1:1:void <clinit>():18:18 -> <clinit>
     com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting() -> B
     com.android.tools.r8.graph.DexCode asDexCode() -> J
@@ -29862,11 +29570,11 @@
     com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers() -> v
     com.android.tools.r8.graph.DexString getHighestSortingString() -> x
     int getOutgoingRegisterSize() -> z
-com.android.tools.r8.graph.DexWritableCode$1 -> com.android.tools.r8.graph.u1:
+com.android.tools.r8.graph.DexWritableCode$1 -> com.android.tools.r8.graph.n1:
     int[] $SwitchMap$com$android$tools$r8$graph$DexWritableCode$DexWritableCodeKind -> b
     boolean $assertionsDisabled -> a
     1:9:void <clinit>():37:45 -> <clinit>
-com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind -> com.android.tools.r8.internal.jh:
+com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind -> com.android.tools.r8.internal.Rg:
     com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind THROW_EXCEPTION -> e
     com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind THROW_NULL -> d
     com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind[] $VALUES -> f
@@ -29876,7 +29584,7 @@
     5:5:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
     1:1:com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind[] values():20:20 -> a
-com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.graph.y1:
+com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.graph.q1:
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> m
     boolean $assertionsDisabled -> n
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> l
@@ -29891,17 +29599,16 @@
     2:2:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):109:109 -> a
     3:3:java.util.List programClasses():64:64 -> a
     3:3:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):109 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:5:boolean mappingIsValid(java.util.List,com.android.tools.r8.graph.GraphLens):132:133 -> a
     4:5:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):109 -> a
     6:6:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16,"2":17,"3":18}}
     16:16:boolean mappingIsValid(java.util.List,com.android.tools.r8.graph.GraphLens):134:134 -> a
     16:16:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):109 -> a
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     17:17:boolean mappingIsValid(java.util.List,com.android.tools.r8.graph.GraphLens):134 -> a
     17:17:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):109 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     18:18:boolean mappingIsValid(java.util.List,com.android.tools.r8.graph.GraphLens):134 -> a
     18:18:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):109 -> a
     7:14:boolean mappingIsValid(java.util.List,com.android.tools.r8.graph.GraphLens):135:142 -> a
@@ -29941,11 +29648,9 @@
     1:4:boolean verifyCodeObjectsOwners():162:165 -> n
     5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):220:220 -> n
     5:5:boolean verifyCodeObjectsOwners():165 -> n
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:16:boolean verifyCodeObjectsOwners():165:175 -> n
     1:1:java.lang.String toString():105:105 -> toString
-com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.w1:
-com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.x1:
+com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.p1:
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> j
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> i
     boolean $assertionsDisabled -> l
@@ -29997,7 +29702,7 @@
     38:38:java.util.List getClasspathClasses():273:273 -> e
     38:38:com.android.tools.r8.graph.DirectMappedDexApplication build():311 -> e
     39:41:com.android.tools.r8.graph.DirectMappedDexApplication build():311:313 -> e
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.graph.z1:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.graph.r1:
     int $r8$clinit -> d
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
@@ -30012,28 +29717,25 @@
     15:15:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
     15:15:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):86 -> a
     16:16:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":108,"2":109,"3":110}}
-    108:108:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    108:108:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):86 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":109,"2":110,"3":111}}
     109:109:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
     109:109:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):86 -> a
-    110:110:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    110:110:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
+    110:110:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
     110:110:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):86 -> a
-    104:104:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):88:88 -> a
-    105:105:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
-    105:105:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):89 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    106:106:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
-    106:106:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    111:111:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    111:111:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
+    111:111:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):86 -> a
+    104:105:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):88:89 -> a
+    106:106:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
     106:106:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):89 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    107:107:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    107:107:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
+    107:107:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     107:107:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     107:107:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):89 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    111:115:boolean isEnclosingPinned(com.android.tools.r8.graph.AppView):103:107 -> a
+    108:108:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    108:108:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
+    108:108:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    108:108:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):89 -> a
+    112:116:boolean isEnclosingPinned(com.android.tools.r8.graph.AppView):103:107 -> a
     1:1:com.android.tools.r8.graph.DexMethod getEnclosingMethod():60:60 -> b
     1:1:com.android.tools.r8.graph.DexType getEnclosingType():68:68 -> c
     1:1:boolean equals(java.lang.Object):79:79 -> equals
@@ -30049,7 +29751,7 @@
     101:101:java.lang.String toString():98:98 -> toString
     102:102:java.lang.String toString():98:98 -> toString
     103:103:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.B1:
+com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.t1:
     boolean $assertionsDisabled -> f
     int $r8$clinit -> g
     1:1:void <clinit>():11:11 -> <clinit>
@@ -30078,7 +29780,7 @@
     3:3:void <init>(int):40:40 -> k
     3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):90 -> k
     com.android.tools.r8.graph.AccessFlags self() -> y
-com.android.tools.r8.graph.FieldAccessFlags$Builder -> com.android.tools.r8.graph.A1:
+com.android.tools.r8.graph.FieldAccessFlags$Builder -> com.android.tools.r8.graph.s1:
     1:1:void <init>():138:138 -> <init>
     1:1:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.AccessFlags$BuilderBase.build():366:366 -> a
     1:1:com.android.tools.r8.graph.AccessFlags build():0 -> a
@@ -30093,9 +29795,9 @@
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():361:362 -> e
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase setSynthetic():0 -> e
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.xj:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.yj:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.zj:
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.fj:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.gj:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.hj:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -30116,7 +29818,7 @@
     1:1:void flattenAccessContexts():35:35 -> b
     2:2:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):50:50 -> b
     1:1:boolean verifyMappingIsOneToOne():95:95 -> c
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.Aj:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.ij:
     com.android.tools.r8.graph.AbstractAccessContexts readsWithContexts -> c
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> e
@@ -30148,9 +29850,8 @@
     27:27:void com.android.tools.r8.graph.FieldAccessInfoImpl.clearReadFromRecordInvokeDynamic():227:227 -> a
     27:27:void clearReads():303 -> a
     28:28:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):311:311 -> a
-    29:29:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
+    29:29:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
     29:29:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):311 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:33:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):311:314 -> a
     34:37:com.android.tools.r8.graph.FieldAccessInfoImpl join(com.android.tools.r8.graph.FieldAccessInfoImpl):319:322 -> a
     1:1:void setWritesWithContexts(com.android.tools.r8.graph.AbstractAccessContexts):84:84 -> b
@@ -30190,7 +29891,7 @@
     1:1:void setReadFromMethodHandle():219:219 -> r
     1:1:void setReadFromRecordInvokeDynamic():223:223 -> s
     1:1:void setWrittenFromMethodHandle():242:242 -> t
-com.android.tools.r8.graph.FieldResolutionResult -> com.android.tools.r8.internal.dk:
+com.android.tools.r8.graph.FieldResolutionResult -> com.android.tools.r8.internal.Jj:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     1:1:com.android.tools.r8.graph.DexClassAndMember com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult.getResolutionPair():73:73 -> c
@@ -30206,7 +29907,7 @@
     com.android.tools.r8.graph.DexField getResolvedFieldReference() -> p
     boolean isFailedOrUnknownResolution() -> q
     boolean isSuccessfulResolution() -> r
-com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult -> com.android.tools.r8.graph.C1:
+com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult -> com.android.tools.r8.graph.u1:
     com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult INSTANCE -> a
     1:1:void <clinit>():154:154 -> <clinit>
     1:1:void <init>():152:152 -> <init>
@@ -30214,7 +29915,7 @@
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> g
     boolean isFailedResolution() -> h
     1:1:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult access$000():152:152 -> s
-com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult -> com.android.tools.r8.graph.D1:
+com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult -> com.android.tools.r8.graph.v1:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> a
     com.android.tools.r8.graph.DexClass resolvedHolder -> b
     com.android.tools.r8.graph.DexEncodedField resolvedField -> c
@@ -30237,7 +29938,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedField getResolvedField():100:100 -> o
     1:1:com.android.tools.r8.graph.DexField getResolvedFieldReference():105:105 -> p
     boolean isSuccessfulResolution() -> r
-com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult -> com.android.tools.r8.graph.E1:
+com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult -> com.android.tools.r8.graph.w1:
     com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult INSTANCE -> a
     1:1:void <clinit>():179:179 -> <clinit>
     1:1:void <init>():177:177 -> <init>
@@ -30245,17 +29946,17 @@
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> g
     boolean isFailedOrUnknownResolution() -> q
     1:1:com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult access$100():177:177 -> s
-com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.vk:
+com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.ak:
     java.util.Map mapping -> a
     1:2:void <init>(java.util.Map):14:15 -> <init>
     1:1:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
     4:4:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):37:37 -> a
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     5:5:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):37 -> a
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     6:6:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):37 -> a
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
     2:2:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):38 -> a
     3:3:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):39:39 -> a
     7:7:com.android.tools.r8.graph.InitClassLens$Builder com.android.tools.r8.graph.InitClassLens.builder():13:13 -> a
@@ -30274,7 +29975,7 @@
     51:51:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):24:24 -> a
     52:52:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):24:24 -> a
     45:45:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):24:24 -> a
-com.android.tools.r8.graph.GenericSignature -> com.android.tools.r8.graph.G1:
+com.android.tools.r8.graph.GenericSignature -> com.android.tools.r8.graph.x1:
     java.util.List EMPTY_TYPE_ARGUMENTS -> b
     java.util.List EMPTY_TYPE_PARAMS -> a
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature NO_FIELD_TYPE_SIGNATURE -> e
@@ -30297,8 +29998,7 @@
     1:1:java.util.List access$600():100:100 -> e
     1:1:java.util.List getEmptySuperInterfaces():116:116 -> f
     1:1:java.util.List getEmptyTypeArguments():112:112 -> g
-com.android.tools.r8.graph.GenericSignature$1 -> com.android.tools.r8.graph.F1:
-com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature -> com.android.tools.r8.graph.G1$a:
+com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature -> com.android.tools.r8.graph.x1$a:
     com.android.tools.r8.graph.GenericSignature$TypeSignature elementSignature -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():660:660 -> <clinit>
@@ -30311,14 +30011,14 @@
     2:2:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():696 -> f
     com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature asArrayTypeSignature() -> g
     boolean isArrayTypeSignature() -> l
-com.android.tools.r8.graph.GenericSignature$BaseTypeSignature -> com.android.tools.r8.graph.H1:
+com.android.tools.r8.graph.GenericSignature$BaseTypeSignature -> com.android.tools.r8.graph.y1:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():752:752 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexType):755:758 -> <init>
     com.android.tools.r8.graph.GenericSignature$BaseTypeSignature asBaseTypeSignature() -> c
     1:2:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():773:774 -> f
-com.android.tools.r8.graph.GenericSignature$ClassSignature -> com.android.tools.r8.graph.G1$b:
+com.android.tools.r8.graph.GenericSignature$ClassSignature -> com.android.tools.r8.graph.x1$b:
     java.util.List formalTypeParameters -> a
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature superClassSignature -> b
     java.util.List superInterfaceSignatures -> c
@@ -30341,7 +30041,7 @@
     1:1:java.lang.String toString():287:287 -> toString
     2:8:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):276:282 -> toString
     2:8:java.lang.String toString():287 -> toString
-com.android.tools.r8.graph.GenericSignature$ClassSignature$ClassSignatureBuilder -> com.android.tools.r8.graph.I1:
+com.android.tools.r8.graph.GenericSignature$ClassSignature$ClassSignatureBuilder -> com.android.tools.r8.graph.z1:
     java.util.List formalTypeParameters -> a
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature superClassSignature -> b
     java.util.List superInterfaceSignatures -> c
@@ -30352,7 +30052,7 @@
     2:2:com.android.tools.r8.graph.GenericSignature$ClassSignature$ClassSignatureBuilder addInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):334:334 -> a
     3:3:com.android.tools.r8.graph.GenericSignature$ClassSignature build():339:339 -> a
     1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature$ClassSignatureBuilder setSuperClassSignature(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):329:329 -> b
-com.android.tools.r8.graph.GenericSignature$ClassTypeSignature -> com.android.tools.r8.graph.G1$c:
+com.android.tools.r8.graph.GenericSignature$ClassTypeSignature -> com.android.tools.r8.graph.x1$c:
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature enclosingTypeSignature -> d
     java.util.List typeArguments -> c
     boolean $assertionsDisabled -> e
@@ -30370,10 +30070,10 @@
     boolean isClassTypeSignature() -> m
     1:1:com.android.tools.r8.graph.DexType type():601:601 -> q
     1:1:java.util.List typeArguments():605:605 -> r
-com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature -> com.android.tools.r8.graph.G1$d:
+com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature -> com.android.tools.r8.graph.x1$d:
     1:1:boolean hasNoSignature():152:152 -> a
     boolean hasSignature() -> b
-com.android.tools.r8.graph.GenericSignature$FieldTypeSignature -> com.android.tools.r8.graph.G1$e:
+com.android.tools.r8.graph.GenericSignature$FieldTypeSignature -> com.android.tools.r8.graph.x1$e:
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator wildcardIndicator -> a
     1:1:void <init>(com.android.tools.r8.graph.GenericSignature$WildcardIndicator,com.android.tools.r8.graph.GenericSignature$1):413:413 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):418:419 -> <init>
@@ -30394,7 +30094,7 @@
     1:1:java.lang.String toString():487:487 -> toString
     2:8:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:482 -> toString
     2:8:java.lang.String toString():487 -> toString
-com.android.tools.r8.graph.GenericSignature$FormalTypeParameter -> com.android.tools.r8.graph.G1$f:
+com.android.tools.r8.graph.GenericSignature$FormalTypeParameter -> com.android.tools.r8.graph.x1$f:
     java.util.List interfaceBounds -> c
     java.lang.String name -> a
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature classBound -> b
@@ -30403,7 +30103,7 @@
     1:6:void <init>(java.lang.String,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,java.util.List):173:178 -> <init>
     1:1:java.lang.String getName():182:182 -> a
     2:10:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visit(com.android.tools.r8.graph.GenericSignatureVisitor):194:202 -> a
-com.android.tools.r8.graph.GenericSignature$MethodTypeSignature -> com.android.tools.r8.graph.G1$g:
+com.android.tools.r8.graph.GenericSignature$MethodTypeSignature -> com.android.tools.r8.graph.x1$g:
     java.util.List typeSignatures -> b
     com.android.tools.r8.graph.GenericSignature$MethodTypeSignature NO_METHOD_TYPE_SIGNATURE -> e
     java.util.List formalTypeParameters -> a
@@ -30422,7 +30122,7 @@
     1:1:java.lang.String toString():889:889 -> toString
     2:8:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:884 -> toString
     2:8:java.lang.String toString():889 -> toString
-com.android.tools.r8.graph.GenericSignature$Parser -> com.android.tools.r8.graph.J1:
+com.android.tools.r8.graph.GenericSignature$Parser -> com.android.tools.r8.graph.A1:
     char[] buffer -> d
     com.android.tools.r8.graph.DexItemFactory factory -> f
     boolean $assertionsDisabled -> g
@@ -30541,27 +30241,27 @@
     35:35:void scanIdentifier():1402 -> f
     36:36:void scanIdentifier():1405:1405 -> f
     1:11:void scanSymbol():1335:1345 -> g
-com.android.tools.r8.graph.GenericSignature$ReturnType -> com.android.tools.r8.graph.G1$h:
+com.android.tools.r8.graph.GenericSignature$ReturnType -> com.android.tools.r8.graph.x1$h:
     com.android.tools.r8.graph.GenericSignature$ReturnType VOID -> b
     com.android.tools.r8.graph.GenericSignature$TypeSignature typeSignature -> a
     1:1:void <clinit>():779:779 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.GenericSignature$TypeSignature):784:785 -> <init>
     1:1:boolean isVoidDescriptor():789:789 -> a
     1:1:com.android.tools.r8.graph.GenericSignature$TypeSignature typeSignature():793:793 -> b
-com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature -> com.android.tools.r8.graph.K1:
+com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature -> com.android.tools.r8.graph.B1:
     com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature STAR_FIELD_TYPE_SIGNATURE -> b
     1:1:void <clinit>():534:534 -> <clinit>
     1:1:void <init>():538:538 -> <init>
     1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):543:543 -> a
     boolean isStar() -> n
     1:1:com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature access$1000():532:532 -> q
-com.android.tools.r8.graph.GenericSignature$TypeSignature -> com.android.tools.r8.graph.G1$i:
+com.android.tools.r8.graph.GenericSignature$TypeSignature -> com.android.tools.r8.graph.x1$i:
     1:1:void <init>():383:383 -> <init>
     com.android.tools.r8.graph.GenericSignature$BaseTypeSignature asBaseTypeSignature() -> c
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asFieldTypeSignature() -> d
     boolean isFieldTypeSignature() -> e
     com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature() -> f
-com.android.tools.r8.graph.GenericSignature$TypeVariableSignature -> com.android.tools.r8.graph.G1$j:
+com.android.tools.r8.graph.GenericSignature$TypeVariableSignature -> com.android.tools.r8.graph.x1$j:
     java.lang.String typeVariable -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():711:711 -> <clinit>
@@ -30572,14 +30272,14 @@
     1:1:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():743:743 -> f
     com.android.tools.r8.graph.GenericSignature$TypeVariableSignature asTypeVariableSignature() -> i
     boolean isTypeVariableSignature() -> o
-com.android.tools.r8.graph.GenericSignature$WildcardIndicator -> com.android.tools.r8.graph.G1$k:
+com.android.tools.r8.graph.GenericSignature$WildcardIndicator -> com.android.tools.r8.graph.x1$k:
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NONE -> c
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NOT_AN_ARGUMENT -> b
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator POSITIVE -> e
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NEGATIVE -> d
     1:4:void <clinit>():407:410 -> <clinit>
     1:1:void <init>(java.lang.String,int):406:406 -> <init>
-com.android.tools.r8.graph.GenericSignatureContextBuilder -> com.android.tools.r8.graph.L1:
+com.android.tools.r8.graph.GenericSignatureContextBuilder -> com.android.tools.r8.graph.C1:
     java.util.Map formalsInfo -> a
     java.util.Map enclosingInfo -> b
     int $r8$clinit -> d
@@ -30591,53 +30291,49 @@
     43:43:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):149:149 -> a
     44:44:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():680:680 -> a
     44:44:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):151 -> a
-    45:45:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):151:151 -> a
-    46:46:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
-    46:46:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):152 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    47:47:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):152:152 -> a
-    48:75:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):150:177 -> a
-    76:76:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):173:173 -> a
-    77:80:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):156:159 -> a
-    81:81:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():874:874 -> a
-    81:81:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):161 -> a
-    82:82:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):160:160 -> a
-    83:83:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):158:158 -> a
-    84:85:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate):203:204 -> a
-    86:90:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):213:217 -> a
-    91:91:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
-    91:91:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):222 -> a
-    92:100:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):223:231 -> a
-    101:101:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
-    101:101:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):231 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    102:110:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):231:239 -> a
-    111:118:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):234:241 -> a
-    119:119:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.access$100(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):55:55 -> a
-    119:119:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):241 -> a
-    120:121:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.combine(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):74:75 -> a
-    120:121:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.access$100(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):55 -> a
-    120:121:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):241 -> a
-    122:127:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):242:247 -> a
-    128:128:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):588:588 -> a
-    128:128:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):247 -> a
-    129:130:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):250:251 -> a
-    131:131:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():874:874 -> a
-    131:131:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):251 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    132:132:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):251:251 -> a
-    133:133:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.access$100(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):55:55 -> a
-    133:133:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):253 -> a
-    134:135:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.combine(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):74:75 -> a
-    134:135:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.access$100(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):55 -> a
-    134:135:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):253 -> a
-    136:159:boolean hasPrunedRelationship(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,java.util.function.Predicate):261:284 -> a
+    45:46:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):151:152 -> a
+    47:47:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
+    47:47:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):152 -> a
+    48:48:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):152:152 -> a
+    49:76:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):150:177 -> a
+    77:77:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):173:173 -> a
+    78:81:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):156:159 -> a
+    82:82:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():874:874 -> a
+    82:82:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):161 -> a
+    83:83:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):160:160 -> a
+    84:84:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):158:158 -> a
+    85:86:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate):203:204 -> a
+    87:91:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):213:217 -> a
+    92:92:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
+    92:92:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):222 -> a
+    93:101:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):223:231 -> a
+    102:102:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
+    102:102:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):231 -> a
+    103:111:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):231:239 -> a
+    112:119:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):234:241 -> a
+    120:120:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.access$100(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):55:55 -> a
+    120:120:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):241 -> a
+    121:122:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.combine(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):74:75 -> a
+    121:122:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.access$100(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):55 -> a
+    121:122:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):241 -> a
+    123:128:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):242:247 -> a
+    129:129:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):588:588 -> a
+    129:129:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):247 -> a
+    130:131:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):250:251 -> a
+    132:132:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():874:874 -> a
+    132:132:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):251 -> a
+    133:133:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):251:251 -> a
+    134:134:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.access$100(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):55:55 -> a
+    134:134:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):253 -> a
+    135:136:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.combine(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):74:75 -> a
+    135:136:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.access$100(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):55 -> a
+    135:136:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):253 -> a
+    137:160:boolean hasPrunedRelationship(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,java.util.function.Predicate):261:284 -> a
     1:8:boolean hasGenericTypeVariables(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.Predicate):290:297 -> b
     9:9:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> b
     9:9:boolean hasGenericTypeVariables(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.Predicate):297 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:boolean hasGenericTypeVariables(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.Predicate):297:297 -> b
-com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext -> com.android.tools.r8.graph.L1$a:
+com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext -> com.android.tools.r8.graph.C1$a:
     java.util.Map prunedParametersWithBounds -> a
     com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext EMPTY -> c
     java.util.Set liveParameters -> b
@@ -30654,39 +30350,39 @@
     22:35:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext addPrunedSubstitutions(java.util.Map):110:123 -> a
     36:37:void lambda$addPrunedSubstitutions$1(java.util.Map,java.util.HashSet,java.lang.String):119:120 -> a
     1:1:boolean isLiveParameter(java.lang.String):83:83 -> b
-com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions -> com.android.tools.r8.graph.M1:
+com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions -> com.android.tools.r8.graph.D1:
     java.util.Map parametersWithBounds -> a
     1:2:void <init>(java.util.Map):32:33 -> <init>
     1:1:java.util.Map access$000(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions):28:28 -> a
     2:2:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions access$200(java.util.List):28:28 -> a
-    3:3:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getClassBound():186:186 -> a
-    3:3:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):40 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):41:41 -> a
-    5:5:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getClassBound():186:186 -> a
-    5:5:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):42 -> a
-    6:6:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):42:42 -> a
-    7:7:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():182:182 -> a
-    7:7:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):43 -> a
-    8:8:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getClassBound():186:186 -> a
+    3:3:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):40:40 -> a
+    4:4:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getClassBound():186:186 -> a
+    4:4:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):40 -> a
+    5:5:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):41:41 -> a
+    6:6:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getClassBound():186:186 -> a
+    6:6:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):42 -> a
+    7:7:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):42:42 -> a
+    8:8:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():182:182 -> a
     8:8:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):43 -> a
-    9:9:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):43:43 -> a
-    10:10:java.util.List com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getInterfaceBounds():190:190 -> a
-    10:10:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):44 -> a
-    11:11:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):44:44 -> a
-    12:12:java.util.List com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getInterfaceBounds():190:190 -> a
-    12:12:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):45 -> a
-    13:13:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):45:45 -> a
-    14:14:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():182:182 -> a
-    14:14:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):46 -> a
-    15:15:java.util.List com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getInterfaceBounds():190:190 -> a
+    9:9:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getClassBound():186:186 -> a
+    9:9:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):43 -> a
+    10:10:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):43:43 -> a
+    11:11:java.util.List com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getInterfaceBounds():190:190 -> a
+    11:11:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):44 -> a
+    12:12:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):44:44 -> a
+    13:13:java.util.List com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getInterfaceBounds():190:190 -> a
+    13:13:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):45 -> a
+    14:14:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):45:45 -> a
+    15:15:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():182:182 -> a
     15:15:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):46 -> a
-    16:16:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):46:46 -> a
-    17:17:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():182:182 -> a
-    17:17:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):48 -> a
-    18:18:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):48:48 -> a
+    16:16:java.util.List com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getInterfaceBounds():190:190 -> a
+    16:16:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):46 -> a
+    17:17:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):46:46 -> a
+    18:18:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():182:182 -> a
+    18:18:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):48 -> a
+    19:19:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):48:48 -> a
     1:15:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions create(java.util.List):37:51 -> b
-com.android.tools.r8.graph.GenericSignatureCorrectnessHelper -> com.android.tools.r8.graph.P1:
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper -> com.android.tools.r8.graph.G1:
     com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode mode -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GenericSignatureContextBuilder contextBuilder -> c
@@ -30697,62 +30393,55 @@
     2:8:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult run(java.util.List):110:116 -> a
     9:9:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.combine(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):66:66 -> a
     9:9:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult run(java.util.List):116 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:27:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):122:139 -> a
     28:28:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
     28:28:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):139 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:38:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):139:148 -> a
     39:39:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
     39:39:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):149 -> a
     40:40:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):146:146 -> a
     41:41:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):145:145 -> a
-    42:42:void com.android.tools.r8.graph.DexClass.clearClassSignature():1034:1034 -> a
+    42:42:void com.android.tools.r8.graph.DexClass.clearClassSignature():1043:1043 -> a
     42:42:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):152 -> a
     43:46:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):154:157 -> a
-    47:47:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.combine(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):66:66 -> a
-    47:47:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):156 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    48:51:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):183:186 -> a
-    52:52:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.combine(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):66:66 -> a
-    52:52:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):185 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    53:53:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult lambda$evaluateSignaturesForClass$0(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):160:160 -> a
-    54:55:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):165:166 -> a
-    56:56:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
-    56:56:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):166 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    57:67:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):166:176 -> a
-    68:68:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    68:68:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):177 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    69:69:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):174:174 -> a
-    70:77:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):173:180 -> a
-    78:78:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult lambda$evaluateSignaturesForClass$2(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):189:189 -> a
-    79:82:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):192:195 -> a
-    83:83:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
-    83:83:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):195 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    84:93:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):195:204 -> a
-    94:94:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    94:94:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):205 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    95:95:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):202:202 -> a
-    96:103:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):201:208 -> a
-    104:110:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):219:225 -> a
-    111:111:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.isValid():58:58 -> a
-    111:111:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):225 -> a
-    112:112:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):225:225 -> a
-    113:113:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
-    113:113:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):225 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    114:116:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):225:227 -> a
-    117:117:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):222:222 -> a
+    47:47:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):156:156 -> a
+    48:48:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.combine(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):66:66 -> a
+    48:48:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):156 -> a
+    49:52:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):183:186 -> a
+    53:53:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):185:185 -> a
+    54:54:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.combine(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):66:66 -> a
+    54:54:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):185 -> a
+    55:55:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult lambda$evaluateSignaturesForClass$0(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):160:160 -> a
+    56:57:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):165:166 -> a
+    58:58:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
+    58:58:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):166 -> a
+    59:70:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):166:177 -> a
+    71:71:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    71:71:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):177 -> a
+    72:72:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):174:174 -> a
+    73:80:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):173:180 -> a
+    81:81:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult lambda$evaluateSignaturesForClass$2(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):189:189 -> a
+    82:85:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):192:195 -> a
+    86:86:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
+    86:86:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):195 -> a
+    87:97:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):195:205 -> a
+    98:98:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    98:98:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):205 -> a
+    99:99:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):202:202 -> a
+    100:107:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):201:208 -> a
+    108:114:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):219:225 -> a
+    115:115:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.isValid():58:58 -> a
+    115:115:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):225 -> a
+    116:116:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):225:225 -> a
+    117:117:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
+    117:117:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):225 -> a
+    118:120:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):225:227 -> a
+    121:121:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):222:222 -> a
     1:1:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper createForVerification(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GenericSignatureContextBuilder):106:106 -> b
-com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$1 -> com.android.tools.r8.graph.N1:
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$1 -> com.android.tools.r8.graph.E1:
     int[] $SwitchMap$com$android$tools$r8$graph$GenericSignatureCorrectnessHelper$SignatureEvaluationResult -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator -> com.android.tools.r8.graph.O1:
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator -> com.android.tools.r8.graph.F1:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProgramClass context -> b
     com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode mode -> c
@@ -30760,159 +30449,133 @@
     1:1:void <clinit>():232:232 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$1):232:232 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode,com.android.tools.r8.graph.DexProgramClass):239:242 -> <init>
-    1:1:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$300(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232:232 -> a
-    2:6:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):247:251 -> a
-    2:6:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):346:346 -> a
-    7:7:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):252 -> a
-    7:7:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8:19:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):358:369 -> a
-    8:19:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):348 -> a
-    8:19:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):252 -> a
-    8:19:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    20:24:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):349:353 -> a
-    20:24:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):252 -> a
-    20:24:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    25:28:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):253:256 -> a
-    25:28:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    29:29:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():229:229 -> a
-    29:29:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):257 -> a
-    29:29:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    30:32:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):257:259 -> a
-    30:32:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:33:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():229:229 -> a
-    33:33:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):259 -> a
-    33:33:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():601:601 -> a
-    34:34:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):259 -> a
+    1:1:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$200(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232:232 -> a
+    2:5:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):338:341 -> a
+    2:5:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$200(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    6:6:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$300(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232:232 -> a
+    7:11:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):247:251 -> a
+    7:11:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    12:12:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):346:346 -> a
+    12:12:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):252 -> a
+    12:12:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    13:24:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):358:369 -> a
+    13:24:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):348 -> a
+    13:24:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):252 -> a
+    13:24:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    25:29:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):349:353 -> a
+    25:29:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):252 -> a
+    25:29:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    30:33:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):253:256 -> a
+    30:33:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    34:34:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():229:229 -> a
+    34:34:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):257 -> a
     34:34:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    35:35:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):260:260 -> a
-    35:35:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:36:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
-    36:36:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):260 -> a
-    36:36:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    37:38:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):260:261 -> a
-    37:38:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    39:39:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():229:229 -> a
-    39:39:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):265 -> a
+    35:37:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):257:259 -> a
+    35:37:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    38:38:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():229:229 -> a
+    38:38:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):259 -> a
+    38:38:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    39:39:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):259:259 -> a
     39:39:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    40:40:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():605:605 -> a
-    40:40:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):265 -> a
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():601:601 -> a
+    40:40:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):259 -> a
     40:40:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    41:41:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):265:265 -> a
+    41:41:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):260:260 -> a
     41:41:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    42:46:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):264:268 -> a
-    42:46:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    47:47:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
-    47:47:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):271 -> a
+    42:42:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
+    42:42:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):260 -> a
+    42:42:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    43:44:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):260:261 -> a
+    43:44:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    45:45:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():229:229 -> a
+    45:45:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):265 -> a
+    45:45:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    46:46:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):265:265 -> a
+    46:46:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    47:47:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():605:605 -> a
+    47:47:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):265 -> a
     47:47:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    48:49:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):272:273 -> a
-    48:49:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    50:50:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
-    50:50:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):273 -> a
-    50:50:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    51:58:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):273:280 -> a
-    51:58:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    59:59:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():605:605 -> a
-    59:59:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):280 -> a
-    59:59:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    60:60:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):280:280 -> a
-    60:60:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    61:67:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):279:285 -> a
-    61:67:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    68:68:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):249:249 -> a
-    68:68:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    69:73:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):291:295 -> a
-    74:74:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():874:874 -> a
-    74:74:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):299 -> a
-    75:75:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):299:299 -> a
-    76:76:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):298:298 -> a
-    77:77:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):297:297 -> a
-    78:78:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():874:874 -> a
-    78:78:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):301 -> a
-    79:79:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):346:346 -> a
-    79:79:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):301 -> a
-    80:91:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):358:369 -> a
-    80:91:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):348 -> a
-    80:91:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):301 -> a
-    92:96:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):349:353 -> a
-    92:96:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):301 -> a
-    97:100:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):302:305 -> a
-    101:108:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):325:332 -> a
-    101:108:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):305 -> a
-    109:112:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):306:309 -> a
-    113:120:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):325:332 -> a
-    113:120:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):309 -> a
-    121:127:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):310:316 -> a
-    128:131:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):338:341 -> a
-    128:131:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$200(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    132:132:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):374:374 -> a
-    133:133:boolean com.android.tools.r8.graph.GenericSignature$TypeSignature.isBaseTypeSignature():0:0 -> a
-    133:133:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):374 -> a
-    134:142:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):375:383 -> a
-    143:143:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():747:747 -> a
-    143:143:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):383 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    144:147:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):384:387 -> a
-    148:148:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
-    148:148:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):387 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    149:154:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):387:392 -> a
-    155:155:com.android.tools.r8.graph.GenericSignature$TypeSignature com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature.elementSignature():675:675 -> a
-    155:155:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):392 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    156:160:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):391:395 -> a
-    161:161:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):400:400 -> a
-    161:161:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):395 -> a
-    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():601:601 -> a
-    162:162:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):401 -> a
-    162:162:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):395 -> a
-    163:163:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):400:400 -> a
-    163:163:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):395 -> a
-    164:164:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):379:379 -> a
-    165:169:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):408:412 -> a
-    170:170:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
-    170:170:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):412 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    171:185:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):412:426 -> a
-    186:186:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
-    186:186:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):426 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    187:188:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):426:427 -> a
-    189:189:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
-    189:189:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):427 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    190:193:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):427:430 -> a
-com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Yl:
+    48:48:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):265:265 -> a
+    48:48:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    49:53:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):264:268 -> a
+    49:53:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    54:54:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
+    54:54:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):271 -> a
+    54:54:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    55:56:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):272:273 -> a
+    55:56:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    57:57:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
+    57:57:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):273 -> a
+    57:57:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    58:65:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):273:280 -> a
+    58:65:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    66:66:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():605:605 -> a
+    66:66:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):280 -> a
+    66:66:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    67:67:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):280:280 -> a
+    67:67:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    68:74:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):279:285 -> a
+    68:74:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    75:75:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignatureForContext(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):249:249 -> a
+    75:75:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult access$100(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):232 -> a
+    76:80:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):291:295 -> a
+    81:81:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():874:874 -> a
+    81:81:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):299 -> a
+    82:82:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):299:299 -> a
+    83:83:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):298:298 -> a
+    84:84:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):297:297 -> a
+    85:85:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():874:874 -> a
+    85:85:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):301 -> a
+    86:86:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):346:346 -> a
+    86:86:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):301 -> a
+    87:98:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):358:369 -> a
+    87:98:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):348 -> a
+    87:98:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):301 -> a
+    99:103:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):349:353 -> a
+    99:103:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):301 -> a
+    104:107:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):302:305 -> a
+    108:115:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):325:332 -> a
+    108:115:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):305 -> a
+    116:119:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):306:309 -> a
+    120:127:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):325:332 -> a
+    120:127:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):309 -> a
+    128:134:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):310:316 -> a
+    135:135:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):374:374 -> a
+    136:136:boolean com.android.tools.r8.graph.GenericSignature$TypeSignature.isBaseTypeSignature():0:0 -> a
+    136:136:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):374 -> a
+    137:145:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):375:383 -> a
+    146:146:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():747:747 -> a
+    146:146:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):383 -> a
+    147:150:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):384:387 -> a
+    151:151:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
+    151:151:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):387 -> a
+    152:157:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):387:392 -> a
+    158:158:com.android.tools.r8.graph.GenericSignature$TypeSignature com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature.elementSignature():675:675 -> a
+    158:158:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):392 -> a
+    159:163:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):391:395 -> a
+    164:164:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):400:400 -> a
+    164:164:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):395 -> a
+    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():601:601 -> a
+    165:165:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):401 -> a
+    165:165:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):395 -> a
+    166:166:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):400:400 -> a
+    166:166:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):395 -> a
+    167:167:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):379:379 -> a
+    168:172:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):408:412 -> a
+    173:173:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
+    173:173:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):412 -> a
+    174:188:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):412:426 -> a
+    189:189:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
+    189:189:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):426 -> a
+    190:191:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):426:427 -> a
+    192:192:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.doNotVerify():41:41 -> a
+    192:192:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):427 -> a
+    193:196:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):427:430 -> a
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Bl:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.clearIfInvalid() -> a
-com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult -> com.android.tools.r8.graph.P1$a:
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult -> com.android.tools.r8.graph.G1$a:
     com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult[] $VALUES -> g
     com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult INVALID_SUPER_TYPE -> b
     boolean $assertionsDisabled -> h
@@ -30924,7 +30587,7 @@
     1:1:void <init>(java.lang.String,int):49:49 -> <init>
     1:1:boolean isInvalid():62:62 -> a
     1:1:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult[] values():49:49 -> b
-com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis -> com.android.tools.r8.graph.Q1:
+com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis -> com.android.tools.r8.graph.H1:
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> a
     java.util.Set processedSignatures -> b
     boolean $assertionsDisabled -> c
@@ -30944,7 +30607,7 @@
     21:24:void processSignature(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):57 -> a
     25:27:void processSignature(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):60:62 -> a
     28:28:void processSignature(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):61:61 -> a
-com.android.tools.r8.graph.GenericSignatureFormatDiagnostic -> com.android.tools.r8.graph.R1:
+com.android.tools.r8.graph.GenericSignatureFormatDiagnostic -> com.android.tools.r8.graph.I1:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     java.lang.String message -> d
@@ -30956,7 +30619,7 @@
     1:1:java.lang.String getDiagnosticMessage():36:36 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():26:26 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():31:31 -> getPosition
-com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier -> com.android.tools.r8.graph.S1:
+com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier -> com.android.tools.r8.graph.J1:
     java.util.function.BiPredicate enclosingPruned -> b
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature objectArgument -> e
     com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext typeParameterContext -> a
@@ -30986,7 +30649,7 @@
     21:21:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> a
     21:21:java.util.List visitInterfaceBounds(java.util.List):115 -> a
     22:26:java.util.List visitTypeArguments(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.List):130:134 -> a
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     27:27:java.util.List visitTypeArguments(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.List):134 -> a
     28:31:java.util.List visitTypeArguments(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.List):134:137 -> a
     32:32:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> a
@@ -30995,24 +30658,22 @@
     37:37:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):161:161 -> a
     38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():601:601 -> a
     38:38:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):161 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     39:39:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":370,"2":371,"3":372}}
     370:370:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):161:161 -> a
-    371:371:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    371:371:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     371:371:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):161 -> a
-    372:372:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    372:372:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     372:372:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):161 -> a
     201:201:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):162:162 -> a
     202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():601:601 -> a
     202:202:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):162 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     203:203:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":373,"2":374,"3":375}}
     373:373:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):162:162 -> a
-    374:374:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    374:374:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     374:374:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):162 -> a
-    375:375:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    375:375:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     375:375:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):162 -> a
     366:369:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):163:166 -> a
     376:384:com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):180:188 -> a
@@ -31024,7 +30685,6 @@
     7:23:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):215:231 -> b
     24:24:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():747:747 -> b
     24:24:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):231 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:38:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):232:245 -> b
     1:4:java.util.List visitFormalTypeParameters(java.util.List):194:197 -> c
     5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> c
@@ -31037,7 +30697,7 @@
     5:5:java.util.List visitSuperInterfaces(java.util.List):124 -> e
     1:7:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier buildForMethod(java.util.List):57:63 -> f
     8:8:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier buildForMethod(java.util.List):62:62 -> f
-com.android.tools.r8.graph.GenericSignaturePrinter -> com.android.tools.r8.graph.T1:
+com.android.tools.r8.graph.GenericSignaturePrinter -> com.android.tools.r8.graph.K1:
     com.android.tools.r8.naming.NamingLens namingLens -> a
     java.util.function.Predicate isTypeMissing -> b
     java.lang.StringBuilder sb -> c
@@ -31071,7 +30731,7 @@
     1:3:java.util.List visitMethodTypeSignatures(java.util.List):50:52 -> d
     1:1:java.util.List visitSuperInterfaces(java.util.List):119:119 -> e
     1:1:java.lang.String toString():226:226 -> toString
-com.android.tools.r8.graph.GenericSignatureTypeRewriter -> com.android.tools.r8.graph.W1:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter -> com.android.tools.r8.graph.M1:
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature objectTypeSignature -> e
     java.util.function.Predicate wasPruned -> b
     java.util.function.Function lookupType -> c
@@ -31088,19 +30748,23 @@
     7:7:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
     7:7:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):88 -> a
     7:7:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):64 -> a
-    8:11:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):88:91 -> a
-    8:11:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):64 -> a
-    12:17:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):68:73 -> a
-    18:21:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):77:80 -> a
-    22:22:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):98:98 -> a
-    22:22:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):80 -> a
+    8:9:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):88:89 -> a
+    8:9:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):64 -> a
+    10:10:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.graph.GenericSignatureTypeRewriter):24:24 -> a
+    10:10:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):90 -> a
+    10:10:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):64 -> a
+    11:12:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):90:91 -> a
+    11:12:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):64 -> a
+    13:18:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):68:73 -> a
+    19:22:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):77:80 -> a
+    23:23:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):98:98 -> a
+    23:23:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):80 -> a
     1:1:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature access$200(com.android.tools.r8.graph.GenericSignatureTypeRewriter):24:24 -> b
     1:1:com.android.tools.r8.graph.DexProgramClass access$300(com.android.tools.r8.graph.GenericSignatureTypeRewriter):24:24 -> c
     1:1:java.util.function.Predicate access$400(com.android.tools.r8.graph.GenericSignatureTypeRewriter):24:24 -> d
     1:1:java.util.function.Predicate access$500(com.android.tools.r8.graph.GenericSignatureTypeRewriter):24:24 -> e
     1:1:java.util.function.Function access$600(com.android.tools.r8.graph.GenericSignatureTypeRewriter):24:24 -> f
-com.android.tools.r8.graph.GenericSignatureTypeRewriter$1 -> com.android.tools.r8.graph.U1:
-com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter -> com.android.tools.r8.graph.V1:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter -> com.android.tools.r8.graph.L1:
     com.android.tools.r8.graph.GenericSignatureTypeRewriter this$0 -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():83:83 -> <clinit>
@@ -31168,7 +30832,7 @@
     5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> e
     5:5:java.util.List visitSuperInterfaces(java.util.List):162 -> e
     6:7:java.util.List visitSuperInterfaces(java.util.List):165:166 -> e
-com.android.tools.r8.graph.GenericSignatureTypeVisitor -> com.android.tools.r8.graph.X1:
+com.android.tools.r8.graph.GenericSignatureTypeVisitor -> com.android.tools.r8.graph.N1:
     java.util.function.BiConsumer visitedTypeConsumer -> b
     com.android.tools.r8.graph.ProgramDefinition context -> a
     boolean $assertionsDisabled -> c
@@ -31193,12 +30857,12 @@
     2:2:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitInterfaceBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):86:86 -> c
     1:1:java.util.List visitMethodTypeSignatures(java.util.List):135:135 -> d
     1:1:java.util.List visitSuperInterfaces(java.util.List):100:100 -> e
-com.android.tools.r8.graph.GenericSignatureUtils -> com.android.tools.r8.graph.Y1:
+com.android.tools.r8.graph.GenericSignatureUtils -> com.android.tools.r8.graph.O1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:11:boolean verifyNoDuplicateGenericDefinitions(com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature,com.android.tools.r8.graph.DexAnnotationSet):13:23 -> a
     12:12:boolean verifyNoDuplicateGenericDefinitions(com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature,com.android.tools.r8.graph.DexAnnotationSet):19:19 -> a
-com.android.tools.r8.graph.GenericSignatureValidationDiagnostic -> com.android.tools.r8.graph.Z1:
+com.android.tools.r8.graph.GenericSignatureValidationDiagnostic -> com.android.tools.r8.graph.P1:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     java.lang.String message -> d
@@ -31226,7 +30890,7 @@
     1:1:java.lang.String getDiagnosticMessage():36:36 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():26:26 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():31:31 -> getPosition
-com.android.tools.r8.graph.GenericSignatureVisitor -> com.android.tools.r8.graph.a2:
+com.android.tools.r8.graph.GenericSignatureVisitor -> com.android.tools.r8.graph.Q1:
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitClassBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature) -> a
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature) -> a
     java.util.List visitInterfaceBounds(java.util.List) -> a
@@ -31239,7 +30903,7 @@
     java.util.List visitFormalTypeParameters(java.util.List) -> c
     java.util.List visitMethodTypeSignatures(java.util.List) -> d
     java.util.List visitSuperInterfaces(java.util.List) -> e
-com.android.tools.r8.graph.GraphLens -> com.android.tools.r8.graph.n2:
+com.android.tools.r8.graph.GraphLens -> com.android.tools.r8.graph.c2:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():54:54 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.GraphLens$1):54:54 -> <init>
@@ -31247,146 +30911,162 @@
     com.android.tools.r8.optimize.MemberRebindingIdentityLens asMemberRebindingIdentityLens() -> a
     com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField) -> a
     com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType) -> a
+    com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens) -> a
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation) -> a
     com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation) -> a
     com.android.tools.r8.graph.GraphLens$FieldLookupResult lambda$lookupFieldResult$0(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> a
     com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens) -> a
-    com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod) -> a
     com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens) -> a
     java.lang.String lookupPackageName(java.lang.String) -> a
     1:1:com.android.tools.r8.graph.DexMember getOriginalMemberSignature(com.android.tools.r8.graph.DexMember):312:312 -> a
     2:2:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
     3:8:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):322:327 -> a
-    9:17:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):354:362 -> a
-    9:17:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):347 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):588:588 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):363 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):347 -> a
-    19:19:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):364:364 -> a
-    19:19:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):347 -> a
-    20:20:boolean isSimpleRenaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):380:380 -> a
-    21:21:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    21:21:void lambda$rewriteTypeKeys$6(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):688 -> a
-    22:24:void lambda$rewriteTypeKeys$6(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):689:691 -> a
-    25:25:void lambda$rewriteTypeKeys$6(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):690:690 -> a
-    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    27:27:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):465:465 -> a
-    28:28:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):497:497 -> a
-    29:34:boolean assertDefinitionsNotModified(java.lang.Iterable):564:569 -> a
-    35:38:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):576:579 -> a
-    39:45:boolean assertReferencesNotModified(java.lang.Iterable):584:590 -> a
-    39:45:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):580 -> a
-    46:46:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    46:46:boolean assertReferencesNotModified(java.lang.Iterable):590 -> a
-    46:46:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):580 -> a
-    47:49:boolean assertReferencesNotModified(java.lang.Iterable):590:592 -> a
-    47:49:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):580 -> a
-    50:50:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    50:50:boolean assertReferencesNotModified(java.lang.Iterable):592 -> a
-    50:50:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):580 -> a
-    51:52:boolean assertReferencesNotModified(java.lang.Iterable):592:593 -> a
-    51:52:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):580 -> a
-    53:53:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    53:53:boolean assertReferencesNotModified(java.lang.Iterable):594 -> a
-    53:53:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):580 -> a
-    54:54:boolean assertReferencesNotModified(java.lang.Iterable):594:594 -> a
-    54:54:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):580 -> a
-    55:57:java.util.Map rewriteCallSites(java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier):602:604 -> a
-    58:62:void lambda$rewriteCallSites$2(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Map,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.utils.collections.ProgramMethodSet):606:610 -> a
-    63:63:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteCallSites$1(com.android.tools.r8.graph.DexCallSite):609:609 -> a
-    64:66:java.util.Set rewriteReferences(java.util.Set):624:626 -> a
-    67:85:java.util.Map rewriteReferenceKeys(java.util.Map,java.util.function.BiFunction):633:651 -> a
-    86:91:void lambda$rewriteReferenceKeys$3(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):637:642 -> a
-    92:94:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newArrayList(java.lang.Object,java.lang.Object):194:196 -> a
-    92:94:void lambda$rewriteReferenceKeys$3(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):646 -> a
-    95:96:void lambda$rewriteReferenceKeys$3(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):646:647 -> a
-    97:99:void lambda$rewriteReferenceKeys$4(java.util.function.BiFunction,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):653:655 -> a
-    100:102:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):671:673 -> a
-    103:103:void lambda$rewriteFieldKeys$5(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):672:672 -> a
-    104:120:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):698:714 -> a
-    121:121:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
-    121:121:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):714 -> a
-    122:122:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
-    122:122:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
-    122:122:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):714 -> a
-    123:129:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):717:723 -> a
-    130:130:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1605,"2":1606,"3":1607}}
-    1605:1605:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):723:723 -> a
-    1606:1606:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):723:723 -> a
-    1607:1607:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):723:723 -> a
-    855:863:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):725:733 -> a
-    864:864:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    864:864:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):733 -> a
-    865:865:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):734:734 -> a
-    866:866:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1618,"2":1619,"3":1620}}
-    1618:1618:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):734:734 -> a
-    1619:1619:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):734:734 -> a
-    1620:1620:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):734:734 -> a
-    1602:1604:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):736:738 -> a
+    9:9:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    9:9:void lambda$rewriteFieldKeys$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):696 -> a
+    10:10:void lambda$rewriteFieldKeys$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):696:696 -> a
+    11:20:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):358:367 -> a
+    11:20:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):351 -> a
+    21:21:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):588:588 -> a
+    21:21:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):367 -> a
+    21:21:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):351 -> a
+    22:22:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):368:368 -> a
+    22:22:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):351 -> a
+    23:23:boolean isSimpleRenaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):384:384 -> a
+    24:24:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    24:24:void lambda$rewriteTypeKeys$9(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):712 -> a
+    25:27:void lambda$rewriteTypeKeys$9(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):713:715 -> a
+    28:28:void lambda$rewriteTypeKeys$9(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):714:714 -> a
+    29:29:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):498:498 -> a
+    30:35:boolean assertDefinitionsNotModified(java.lang.Iterable):581:586 -> a
+    36:39:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):593:596 -> a
+    40:43:boolean assertReferencesNotModified(java.lang.Iterable):601:604 -> a
+    40:43:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):597 -> a
+    44:44:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    44:44:boolean assertReferencesNotModified(java.lang.Iterable):604 -> a
+    44:44:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):597 -> a
+    45:48:boolean assertReferencesNotModified(java.lang.Iterable):604:607 -> a
+    45:48:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):597 -> a
+    49:49:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
+    49:49:boolean assertReferencesNotModified(java.lang.Iterable):607 -> a
+    49:49:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):597 -> a
+    50:52:boolean assertReferencesNotModified(java.lang.Iterable):607:609 -> a
+    50:52:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):597 -> a
+    53:53:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    53:53:boolean assertReferencesNotModified(java.lang.Iterable):609 -> a
+    53:53:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):597 -> a
+    54:55:boolean assertReferencesNotModified(java.lang.Iterable):609:610 -> a
+    54:55:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):597 -> a
+    56:56:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    56:56:boolean assertReferencesNotModified(java.lang.Iterable):611 -> a
+    56:56:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):597 -> a
+    57:57:boolean assertReferencesNotModified(java.lang.Iterable):611:611 -> a
+    57:57:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):597 -> a
+    58:60:java.util.Map rewriteCallSites(java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier):619:621 -> a
+    61:65:void lambda$rewriteCallSites$2(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Map,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.utils.collections.ProgramMethodSet):623:627 -> a
+    66:66:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteCallSites$1(com.android.tools.r8.graph.DexCallSite):626:626 -> a
+    67:67:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):635:635 -> a
+    67:67:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):661 -> a
+    68:72:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):662:666 -> a
+    73:75:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newArrayList(java.lang.Object,java.lang.Object):194:196 -> a
+    73:75:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):670 -> a
+    76:77:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):670:671 -> a
+    78:79:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.GraphLens):640:641 -> a
+    80:80:com.android.tools.r8.graph.DexReference lambda$rewriteReference$3(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):642:642 -> a
+    81:81:com.android.tools.r8.graph.DexReference lambda$rewriteReference$4(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexField):643:643 -> a
+    82:82:com.android.tools.r8.graph.DexReference lambda$rewriteReference$5(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod):644:644 -> a
+    83:84:java.util.Set rewriteReferences(java.util.Set):648:649 -> a
+    85:85:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):635:635 -> a
+    85:85:java.util.Set rewriteReferences(java.util.Set):650 -> a
+    86:86:java.util.Set rewriteReferences(java.util.Set):650:650 -> a
+    87:105:java.util.Map rewriteReferenceKeys(java.util.Map,java.util.function.BiFunction):657:675 -> a
+    106:108:void lambda$rewriteReferenceKeys$7(java.util.function.BiFunction,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):677:679 -> a
+    109:111:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):695:697 -> a
+    112:128:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):722:738 -> a
+    129:129:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
+    129:129:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):738 -> a
+    130:130:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    130:130:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
+    130:130:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):738 -> a
+    131:137:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):741:747 -> a
+    138:138:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1661,"2":1662,"3":1663}}
+    1661:1661:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):747:747 -> a
+    1662:1662:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):747:747 -> a
+    1663:1663:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):747:747 -> a
+    887:895:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):749:757 -> a
+    896:896:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    896:896:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):757 -> a
+    897:897:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):758:758 -> a
+    898:898:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1674,"2":1675,"3":1676}}
+    1674:1674:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):758:758 -> a
+    1675:1675:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):758:758 -> a
+    1676:1676:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):758:758 -> a
+    1658:1660:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):760:762 -> a
     com.android.tools.r8.optimize.MemberRebindingLens asMemberRebindingLens() -> b
     java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType) -> b
-    com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField) -> b
     com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens) -> b
-    com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod) -> b
     com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens) -> b
-    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> b
-    2:2:com.android.tools.r8.graph.GraphLens$FieldLookupResult lookupFieldResult(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):477:477 -> b
-    3:4:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):618:619 -> b
-    5:6:java.util.Map rewriteTypeKeys(java.util.Map,java.util.function.BiFunction):685:686 -> b
+    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> b
+    3:3:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):474:474 -> b
+    4:5:java.util.Map rewriteTypeKeys(java.util.Map,java.util.function.BiFunction):709:710 -> b
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens asNonIdentityLens() -> c
-    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):393:393 -> c
-    2:2:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):400:400 -> c
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> c
-    3:3:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):401 -> c
-    4:4:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):401:401 -> c
-    5:5:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):458:458 -> c
-    com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod) -> d
-    1:1:com.android.tools.r8.graph.GraphLens getIdentityLens():517:517 -> d
+    com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens) -> c
+    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):397:397 -> c
+    2:2:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):404:404 -> c
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> c
+    3:3:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):405 -> c
+    4:4:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):405:405 -> c
+    5:5:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):467:467 -> c
+    6:6:com.android.tools.r8.graph.GraphLens$FieldLookupResult lookupFieldResult(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):486:486 -> c
+    1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):514:514 -> d
+    2:2:com.android.tools.r8.graph.GraphLens getIdentityLens():518:518 -> d
     boolean hasCodeRewritings() -> e
-    1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):513:513 -> e
-    boolean isContextFreeForMethods() -> f
-    boolean isIdentityLens() -> g
-    boolean isNonIdentityLens() -> h
-com.android.tools.r8.graph.GraphLens$1 -> com.android.tools.r8.graph.b2:
-com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.internal.gm:
+    boolean hasCustomCodeRewritings() -> f
+    boolean isContextFreeForMethods() -> g
+    boolean isEnumUnboxerLens() -> h
+    boolean isIdentityLens() -> i
+    boolean isNonIdentityLens() -> j
+com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.internal.Jl:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap methodMap -> b
     java.util.Map typeMap -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap fieldMap -> a
     1:1:void <init>():269:269 -> <init>
     2:5:void <init>():264:267 -> <init>
     1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):282:282 -> a
-com.android.tools.r8.graph.GraphLens$ClearCodeRewritingGraphLens -> com.android.tools.r8.graph.c2:
+com.android.tools.r8.graph.GraphLens$ClearCodeRewritingGraphLens -> com.android.tools.r8.graph.R1:
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():1006:1006 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):1009:1009 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1014:1014 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1024:1024 -> a
-    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1058:1058 -> a
-    4:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):1073:1075 -> a
-    7:7:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1082:1082 -> a
-    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1019:1019 -> b
-    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1029:1029 -> b
-    3:3:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1035:1035 -> b
-    4:4:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1063:1063 -> b
+    1:1:void <clinit>():1037:1037 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):1040:1040 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1045:1045 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1055:1055 -> a
+    3:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):1061:1061 -> a
+    4:4:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    4:4:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):1061 -> a
+    5:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1091:1091 -> a
+    6:8:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):1106:1108 -> a
+    9:9:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1115:1115 -> a
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1050:1050 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1068:1068 -> b
+    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1096:1096 -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1080:1080 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1047:1047 -> d
-    com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-    1:1:boolean isContextFreeForMethods():1092:1092 -> f
-com.android.tools.r8.graph.GraphLens$FieldLookupResult -> com.android.tools.r8.graph.e2:
+    com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
+    1:1:boolean isContextFreeForMethods():1125:1125 -> g
+com.android.tools.r8.graph.GraphLens$FieldLookupResult -> com.android.tools.r8.graph.T1:
     com.android.tools.r8.graph.DexType writeCastType -> d
     com.android.tools.r8.graph.DexType readCastType -> c
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens$1):119:119 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):129:131 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder builder(com.android.tools.r8.graph.GraphLens):135:135 -> a
     1:1:com.android.tools.r8.graph.DexType getRewrittenReadCastType(java.util.function.Function):147:147 -> b
     1:1:com.android.tools.r8.graph.DexType getRewrittenWriteCastType(java.util.function.Function):159:159 -> c
-    1:1:com.android.tools.r8.graph.DexType getReadCastType():143:143 -> d
-    1:1:com.android.tools.r8.graph.DexType getWriteCastType():155:155 -> e
-    1:1:boolean hasReadCastType():139:139 -> f
-    1:1:boolean hasWriteCastType():151:151 -> g
-com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder -> com.android.tools.r8.graph.d2:
+    1:1:com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder builder(com.android.tools.r8.graph.GraphLens):135:135 -> d
+    1:1:com.android.tools.r8.graph.DexType getReadCastType():143:143 -> e
+    1:1:com.android.tools.r8.graph.DexType getWriteCastType():155:155 -> f
+    1:1:boolean hasReadCastType():139:139 -> g
+    1:1:boolean hasWriteCastType():151:151 -> h
+com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder -> com.android.tools.r8.graph.S1:
     com.android.tools.r8.graph.DexType writeCastType -> d
     com.android.tools.r8.graph.DexType readCastType -> c
     1:1:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$1):162:162 -> <init>
@@ -31396,45 +31076,44 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder setReadCastType(com.android.tools.r8.graph.DexType):173:173 -> a
     3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult build():189:189 -> a
-    com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder self() -> b
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:102 -> b
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder setReference(com.android.tools.r8.graph.DexMember):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder setWriteCastType(com.android.tools.r8.graph.DexType):178:178 -> b
-com.android.tools.r8.graph.GraphLens$IdentityGraphLens -> com.android.tools.r8.graph.f2:
+com.android.tools.r8.graph.GraphLens$IdentityGraphLens -> com.android.tools.r8.graph.U1:
     com.android.tools.r8.graph.GraphLens$IdentityGraphLens INSTANCE -> b
     boolean $assertionsDisabled -> c
-    1:3:void <clinit>():898:900 -> <clinit>
-    1:1:void <init>():902:902 -> <init>
+    1:3:void <clinit>():929:931 -> <clinit>
+    1:1:void <init>():933:933 -> <init>
     com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField) -> a
     com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType) -> a
+    com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens) -> a
     java.lang.String lookupPackageName(java.lang.String) -> a
-    1:1:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):955:955 -> a
-    2:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):962:963 -> a
+    1:1:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):986:986 -> a
+    2:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):993:994 -> a
     4:4:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:102 -> a
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):963 -> a
-    5:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):963:963 -> a
-    6:6:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):978:978 -> a
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):994 -> a
+    5:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):994:994 -> a
+    6:6:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1009:1009 -> a
     7:7:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:102 -> a
-    7:7:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):978 -> a
-    8:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):978:978 -> a
-    9:9:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):977:977 -> a
-    10:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):990:990 -> a
-    com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField) -> b
+    7:7:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1009 -> a
+    8:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1009:1009 -> a
+    9:9:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1008:1008 -> a
+    10:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):1021:1021 -> a
     com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens) -> b
     com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens) -> b
-    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):925:925 -> b
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):969:969 -> d
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):956:956 -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1000:1000 -> c
     boolean hasCodeRewritings() -> e
-    boolean isContextFreeForMethods() -> f
-    boolean isIdentityLens() -> g
-    boolean isNonIdentityLens() -> h
-    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens access$400():898:898 -> i
-com.android.tools.r8.graph.GraphLens$LookupFieldContinuation -> com.android.tools.r8.graph.g2:
+    boolean isContextFreeForMethods() -> g
+    boolean isIdentityLens() -> i
+    boolean isNonIdentityLens() -> j
+    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens access$400():929:929 -> k
+com.android.tools.r8.graph.GraphLens$LookupFieldContinuation -> com.android.tools.r8.graph.V1:
     com.android.tools.r8.graph.GraphLens$FieldLookupResult lookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> a
-com.android.tools.r8.graph.GraphLens$LookupMethodContinuation -> com.android.tools.r8.graph.h2:
+com.android.tools.r8.graph.GraphLens$LookupMethodContinuation -> com.android.tools.r8.graph.W1:
     com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult) -> a
-com.android.tools.r8.graph.GraphLens$MemberLookupResult -> com.android.tools.r8.graph.j2:
+com.android.tools.r8.graph.GraphLens$MemberLookupResult -> com.android.tools.r8.graph.Y1:
     com.android.tools.r8.graph.DexMember reference -> a
     com.android.tools.r8.graph.DexMember reboundReference -> b
     1:1:void <init>(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.GraphLens$1):56:56 -> <init>
@@ -31445,18 +31124,18 @@
     1:1:com.android.tools.r8.graph.DexMember getReference():67:67 -> b
     2:2:com.android.tools.r8.graph.DexMember getRewrittenReference(com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):71:71 -> b
     1:1:boolean hasReboundReference():79:79 -> c
-com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder -> com.android.tools.r8.graph.i2:
+com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder -> com.android.tools.r8.graph.X1:
     com.android.tools.r8.graph.DexMember reference -> a
     com.android.tools.r8.graph.DexMember reboundReference -> b
     1:1:void <init>():96:96 -> <init>
-com.android.tools.r8.graph.GraphLens$MethodLookupResult -> com.android.tools.r8.graph.l2:
+com.android.tools.r8.graph.GraphLens$MethodLookupResult -> com.android.tools.r8.graph.a2:
     com.android.tools.r8.graph.RewrittenPrototypeDescription prototypeChanges -> d
     com.android.tools.r8.ir.code.Invoke$Type type -> c
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.RewrittenPrototypeDescription):211:213 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder builder(com.android.tools.r8.graph.GraphLens):217:217 -> a
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges():225:225 -> d
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():221:221 -> e
-com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder -> com.android.tools.r8.graph.k2:
+    1:1:com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder builder(com.android.tools.r8.graph.GraphLens):217:217 -> d
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges():225:225 -> e
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():221:221 -> f
+com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder -> com.android.tools.r8.graph.Z1:
     com.android.tools.r8.graph.RewrittenPrototypeDescription prototypeChanges -> c
     com.android.tools.r8.ir.code.Invoke$Type type -> d
     boolean $assertionsDisabled -> e
@@ -31470,89 +31149,87 @@
     2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder setPrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription):239:239 -> a
     3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder setType(com.android.tools.r8.ir.code.Invoke$Type):244:244 -> a
     4:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult build():249:251 -> a
-    com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder self() -> b
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:102 -> b
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder setReference(com.android.tools.r8.graph.DexMember):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens -> com.android.tools.r8.graph.m2:
+com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens -> com.android.tools.r8.graph.b2:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map arrayTypeCache -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.GraphLens previousLens -> c
-    1:1:void <clinit>():745:745 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):753:753 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):756:756 -> <init>
-    3:11:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):750:758 -> <init>
+    1:1:void <clinit>():769:769 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):777:777 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):780:780 -> <init>
+    3:11:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):774:782 -> <init>
     com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod) -> a
     com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$lookupMethod$1(com.android.tools.r8.graph.GraphLens$MethodLookupResult) -> a
-    1:1:com.android.tools.r8.graph.GraphLens getPrevious():766:766 -> a
-    1:1:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens findPrevious(java.util.function.Predicate):772 -> a
-    2:4:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens findPrevious(java.util.function.Predicate):773:775 -> a
-    5:5:com.android.tools.r8.graph.GraphLens getPrevious():766:766 -> a
-    5:5:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens findPrevious(java.util.function.Predicate):778 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:com.android.tools.r8.graph.GraphLens getPrevious():766:766 -> a
-    6:6:java.lang.String lookupPackageName(java.lang.String):808 -> a
-    7:7:java.lang.String lookupPackageName(java.lang.String):808:808 -> a
-    8:8:com.android.tools.r8.graph.GraphLens getPrevious():766:766 -> a
-    8:8:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):784 -> a
-    9:11:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):785:787 -> a
-    12:13:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):793:794 -> a
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    14:14:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):794 -> a
-    15:16:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):794:795 -> a
-    17:17:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():141:141 -> a
-    17:17:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):795 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:20:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):795:795 -> a
-    22:23:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):797:798 -> a
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    24:24:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):798 -> a
-    25:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):798:798 -> a
-    26:27:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:103 -> a
-    26:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):798 -> a
-    28:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):798:803 -> a
-    34:34:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):834:834 -> a
+    1:1:com.android.tools.r8.graph.GraphLens getPrevious():790:790 -> a
+    1:1:java.lang.String lookupPackageName(java.lang.String):839 -> a
+    2:2:java.lang.String lookupPackageName(java.lang.String):839:839 -> a
+    3:3:com.android.tools.r8.graph.GraphLens getPrevious():790:790 -> a
+    3:3:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):815 -> a
+    4:6:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):816:818 -> a
+    7:12:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens find(java.util.function.Predicate):797:802 -> a
+    13:13:com.android.tools.r8.graph.GraphLens getPrevious():790:790 -> a
+    13:13:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens find(java.util.function.Predicate):802 -> a
+    14:15:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):824:825 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    16:16:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):825 -> a
+    17:18:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):825:826 -> a
+    19:19:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():141:141 -> a
+    19:19:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):826 -> a
+    20:22:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):826:826 -> a
+    24:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):828:829 -> a
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):829 -> a
+    27:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):829:829 -> a
+    28:28:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:102 -> a
+    28:28:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):829 -> a
+    29:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):830:834 -> a
+    34:34:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):865:865 -> a
     35:35:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":875,"2":876,"3":877}}
-    875:875:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):834:834 -> a
-    876:876:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):834:834 -> a
-    877:877:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):834:834 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":906,"2":907,"3":908}}
+    906:906:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):865:865 -> a
+    907:907:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):865:865 -> a
+    908:908:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):865:865 -> a
     36:36:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":878,"2":879,"3":880,"4":881}}
-    878:878:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):834:834 -> a
-    879:879:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):834:834 -> a
-    880:880:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):834:834 -> a
-    881:881:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):834:834 -> a
-    870:870:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):834:834 -> a
-    871:871:com.android.tools.r8.graph.GraphLens getPrevious():766:766 -> a
-    871:871:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):838 -> a
-    872:872:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):838:838 -> a
-    873:873:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):387:387 -> a
-    873:873:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):838 -> a
-    874:874:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):838:838 -> a
-    882:884:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):845:847 -> a
-    885:885:com.android.tools.r8.graph.GraphLens$FieldLookupResult lambda$internalLookupField$2(com.android.tools.r8.graph.GraphLens$LookupFieldContinuation,com.android.tools.r8.graph.GraphLens$FieldLookupResult):850:850 -> a
-    886:892:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):861:867 -> a
-    893:893:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):865:865 -> a
-    894:894:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$internalLookupMethod$3(com.android.tools.r8.graph.GraphLens$LookupMethodContinuation,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):870:870 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":909,"2":910,"3":911,"4":912}}
+    909:909:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):865:865 -> a
+    910:910:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):865:865 -> a
+    911:911:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):865:865 -> a
+    912:912:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):865:865 -> a
+    901:901:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):865:865 -> a
+    902:902:com.android.tools.r8.graph.GraphLens getPrevious():790:790 -> a
+    902:902:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):869 -> a
+    903:903:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):869:869 -> a
+    904:904:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):391:391 -> a
+    904:904:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):869 -> a
+    905:905:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):869:869 -> a
+    913:915:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):876:878 -> a
+    916:916:com.android.tools.r8.graph.GraphLens$FieldLookupResult lambda$internalLookupField$2(com.android.tools.r8.graph.GraphLens$LookupFieldContinuation,com.android.tools.r8.graph.GraphLens$FieldLookupResult):881:881 -> a
+    917:923:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):892:898 -> a
+    924:924:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):896:896 -> a
+    925:925:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$internalLookupMethod$3(com.android.tools.r8.graph.GraphLens$LookupMethodContinuation,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):901:901 -> a
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
-    1:7:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):816:822 -> b
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
-    8:8:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):823 -> b
-    9:10:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):824:825 -> b
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):387:387 -> b
-    11:11:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):829 -> b
+    1:1:com.android.tools.r8.graph.GraphLens getPrevious():790:790 -> b
+    1:1:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens findPrevious(java.util.function.Predicate):810 -> b
+    2:2:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens findPrevious(java.util.function.Predicate):811:811 -> b
+    3:9:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):847:853 -> b
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> b
+    10:10:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):854 -> b
+    11:12:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):855:856 -> b
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):391:391 -> b
+    13:13:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):860 -> b
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens asNonIdentityLens() -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> e
-    1:1:boolean lambda$lookupMethod$0(com.android.tools.r8.graph.DexType):796 -> e
-    com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-    boolean isIdentityLens() -> g
-    boolean isNonIdentityLens() -> h
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():762:762 -> i
-    1:1:com.android.tools.r8.graph.GraphLens getPrevious():766:766 -> j
-com.android.tools.r8.graph.ImmediateProgramSubtypingInfo -> com.android.tools.r8.internal.Sn:
+    com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
+    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> e
+    1:1:boolean lambda$lookupMethod$0(com.android.tools.r8.graph.DexType):827 -> e
+    boolean isIdentityLens() -> i
+    boolean isNonIdentityLens() -> j
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():786:786 -> k
+    1:1:com.android.tools.r8.graph.GraphLens getPrevious():790:790 -> l
+com.android.tools.r8.graph.ImmediateProgramSubtypingInfo -> com.android.tools.r8.internal.xn:
     java.util.Map immediateSubtypes -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):28:30 -> <init>
@@ -31567,30 +31244,30 @@
     22:22:void forEachImmediateProgramSuperClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):86:86 -> a
     23:23:void forEachImmediateProgramSuperClassMatching(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Consumer):93:93 -> a
     24:26:void lambda$forEachImmediateProgramSuperClassMatching$6(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):95:97 -> a
-    27:28:void lambda$forEachImmediateSubClassMatching$7(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):114:115 -> a
-    29:29:java.util.List getSubclasses(com.android.tools.r8.graph.DexProgramClass):121:121 -> a
+    27:28:void lambda$forEachImmediateSubClassMatching$7(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):109:110 -> a
+    29:29:java.util.List getSubclasses(com.android.tools.r8.graph.DexProgramClass):116:116 -> a
     1:3:void lambda$forEachImmediateSuperClassMatching$5(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):77:79 -> b
-    4:5:void forEachImmediateSubClassMatching(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Consumer):111:112 -> b
-com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.o2:
+    4:5:void forEachImmediateSubClassMatching(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Consumer):106:107 -> b
+com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.d2:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():9:9 -> <init>
     int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):14:14 -> a
-com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.lp:
+com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.Oo:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.graph.InitClassLens$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.graph.ThrowingInitClassLens getThrowingInstance():17:17 -> b
-com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.kp:
+com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.No:
     java.util.Map mapping -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>():28:30 -> <init>
     1:2:void map(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):33:34 -> a
     3:3:com.android.tools.r8.graph.FinalInitClassLens build():38:38 -> a
-com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.Hp:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.jp:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
@@ -31647,9 +31324,9 @@
     130:130:java.lang.String toString():127:127 -> toString
     131:131:java.lang.String toString():127:127 -> toString
     132:132:java.lang.String toString():127:127 -> toString
-com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.hq:
+com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.Jp:
     void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer) -> a
-com.android.tools.r8.graph.InvalidCode -> com.android.tools.r8.graph.p2:
+com.android.tools.r8.graph.InvalidCode -> com.android.tools.r8.graph.e2:
     com.android.tools.r8.graph.InvalidCode INSTANCE -> d
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():23:23 -> <init>
@@ -31658,12 +31335,12 @@
     3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):32:32 -> a
     4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):37:37 -> a
     5:9:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):47:51 -> a
-    boolean computeEquals(java.lang.Object) -> g
     1:1:int computeHashCode():66:66 -> g0
+    boolean computeEquals(java.lang.Object) -> h
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():56:56 -> k0
     1:1:com.android.tools.r8.graph.Code getInstance():16:16 -> t0
     1:1:java.lang.String toString():42:42 -> toString
-com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.internal.xv:
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.internal.Ru:
     com.android.tools.r8.graph.ApplicationReaderMap applicationReaderMap -> e
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
@@ -31717,7 +31394,7 @@
     3:4:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):57:58 -> f
     5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.JarApplicationReader.getType(com.android.tools.r8.org.objectweb.asm.Type):53:53 -> f
     5:5:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):58 -> f
-com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.u2:
+com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.j2:
     java.util.function.Consumer classConsumer -> b
     com.android.tools.r8.graph.JarApplicationReader application -> a
     boolean $assertionsDisabled -> e
@@ -31733,67 +31410,75 @@
     9:9:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     9:9:void internalRead(com.android.tools.r8.origin.Origin,byte[]):105 -> a
     9:9:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
-    10:14:void internalRead(com.android.tools.r8.origin.Origin,byte[]):105:109 -> a
-    10:14:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
-    15:15:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(byte[]):166:166 -> a
-    15:15:void internalRead(com.android.tools.r8.origin.Origin,byte[]):109 -> a
-    15:15:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
-    16:25:void internalRead(com.android.tools.r8.origin.Origin,byte[]):115:124 -> a
-    16:25:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
-    26:38:void internalRead(com.android.tools.r8.origin.Origin,byte[]):122:134 -> a
-    26:38:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
-    39:43:void internalRead(com.android.tools.r8.origin.Origin,byte[]):132:136 -> a
-    39:43:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
-    44:44:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    44:44:void internalRead(com.android.tools.r8.origin.Origin,byte[]):136 -> a
-    44:44:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
-    45:45:void internalRead(com.android.tools.r8.origin.Origin,byte[]):136:136 -> a
+    10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    10:10:void internalRead(com.android.tools.r8.origin.Origin,byte[]):105 -> a
+    10:10:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
+    11:15:void internalRead(com.android.tools.r8.origin.Origin,byte[]):105:109 -> a
+    11:15:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
+    16:16:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(byte[]):166:166 -> a
+    16:16:void internalRead(com.android.tools.r8.origin.Origin,byte[]):109 -> a
+    16:16:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
+    17:26:void internalRead(com.android.tools.r8.origin.Origin,byte[]):115:124 -> a
+    17:26:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
+    27:39:void internalRead(com.android.tools.r8.origin.Origin,byte[]):122:134 -> a
+    27:39:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
+    40:44:void internalRead(com.android.tools.r8.origin.Origin,byte[]):132:136 -> a
+    40:44:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
+    45:45:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory() -> a
+    45:45:void internalRead(com.android.tools.r8.origin.Origin,byte[]):136 -> a
     45:45:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
-    46:46:void internalRead(com.android.tools.r8.origin.Origin,byte[]):101:101 -> a
+    46:46:void internalRead(com.android.tools.r8.origin.Origin,byte[]):136:136 -> a
     46:46:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
-    47:47:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    47:47:void internalRead(com.android.tools.r8.origin.Origin,byte[]):101 -> a
+    47:47:void internalRead(com.android.tools.r8.origin.Origin,byte[]):101:101 -> a
     47:47:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
-    48:48:void internalRead(com.android.tools.r8.origin.Origin,byte[]):101:101 -> a
+    48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    48:48:void internalRead(com.android.tools.r8.origin.Origin,byte[]):101 -> a
     48:48:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
-    49:51:com.android.tools.r8.graph.MethodAccessFlags createMethodAccessFlags(java.lang.String,int):155:157 -> a
-    52:55:void lambda$createAnnotationVisitor$1(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):169:169 -> a
-    56:60:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):608:612 -> a
-    56:60:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
-    61:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexAnnotationSet.findDuplicateEntryType(java.util.List):78:81 -> a
-    61:64:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):612 -> a
-    61:64:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
-    65:65:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):614:614 -> a
-    65:65:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
-    66:66:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":79,"2":80,"3":81}}
-    79:79:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):614:614 -> a
-    79:79:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
-    80:80:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):614:614 -> a
-    80:80:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
+    49:49:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    49:49:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    49:49:void internalRead(com.android.tools.r8.origin.Origin,byte[]):101 -> a
+    49:49:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
+    50:50:void internalRead(com.android.tools.r8.origin.Origin,byte[]):101:101 -> a
+    50:50:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):96 -> a
+    51:53:com.android.tools.r8.graph.MethodAccessFlags createMethodAccessFlags(java.lang.String,int):155:157 -> a
+    54:57:void lambda$createAnnotationVisitor$1(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):169:169 -> a
+    58:62:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):608:612 -> a
+    58:62:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
+    63:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexAnnotationSet.findDuplicateEntryType(java.util.List):78:81 -> a
+    63:66:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):612 -> a
+    63:66:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
+    67:67:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):614:614 -> a
+    67:67:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
+    68:68:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81,"2":82,"3":83}}
     81:81:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):614:614 -> a
     81:81:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
-    67:67:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":82,"2":83,"3":84,"4":85}}
-    82:82:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615:615 -> a
+    82:82:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):614:614 -> a
     82:82:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
-    83:83:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615:615 -> a
+    83:83:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):614:614 -> a
     83:83:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
+    69:69:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":84,"2":85,"3":86,"4":87}}
     84:84:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615:615 -> a
     84:84:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
     85:85:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615:615 -> a
     85:85:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
-    68:68:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    68:68:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615 -> a
-    68:68:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
-    69:69:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    69:69:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    69:69:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615 -> a
-    69:69:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
-    70:73:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615:618 -> a
-    70:73:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
-    74:74:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):609:609 -> a
-    74:74:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
+    86:86:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615:615 -> a
+    86:86:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
+    87:87:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615:615 -> a
+    87:87:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
+    70:70:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    70:70:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615 -> a
+    70:70:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
+    71:71:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    71:71:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    71:71:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615 -> a
+    71:71:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
+    72:75:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):615:618 -> a
+    72:75:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
+    76:76:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):609:609 -> a
+    76:76:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):73 -> a
     1:1:void read(com.android.tools.r8.origin.Origin,byte[]):96:96 -> b
     2:2:void com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,java.lang.Runnable):225:225 -> b
     2:2:void read(com.android.tools.r8.origin.Origin,byte[]):96 -> b
@@ -31806,7 +31491,7 @@
     7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):166:166 -> b
     8:10:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):184:184 -> b
     12:16:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):186:190 -> b
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.q2:
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.f2:
     java.util.List values -> e
     java.util.List names -> d
     com.android.tools.r8.graph.JarApplicationReader application -> b
@@ -31818,7 +31503,6 @@
     1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):992:993 -> a
     3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):94:94 -> a
     3:3:void visitEnum(java.lang.String,java.lang.String,java.lang.String):993 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void visitEnum(java.lang.String,java.lang.String,java.lang.String):993:993 -> a
     5:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):998:998 -> a
     6:8:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):999:999 -> a
@@ -31835,7 +31519,7 @@
     98:98:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):1084:1084 -> a
     98:98:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1112 -> a
     98:98:void visit(java.lang.String,java.lang.Object):987 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.r2:
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.g2:
     com.android.tools.r8.graph.ClassKind classKind -> d
     com.android.tools.r8.graph.DexType superType -> l
     com.android.tools.r8.graph.DexType type -> j
@@ -31872,207 +31556,200 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     1:1:com.android.tools.r8.graph.JarClassFileReader$ReparseContext access$1000(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> a
     2:2:boolean access$1376(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int):193:193 -> a
-    3:6:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):242:245 -> a
-    7:9:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):252:254 -> a
-    10:10:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":794,"2":795,"3":796,"4":797,"5":798}}
-    794:794:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
-    795:795:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
-    796:796:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
-    797:797:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
-    798:798:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
-    264:264:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
-    265:265:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):0:0 -> a
+    3:3:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):193:193 -> a
+    4:7:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):584:587 -> a
+    4:7:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):193 -> a
+    8:11:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):242:245 -> a
+    12:14:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):252:254 -> a
+    15:15:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":799,"2":800,"3":801,"4":802,"5":803}}
     799:799:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
     800:800:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
     801:801:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
     802:802:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
     803:803:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
-    519:519:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
-    520:520:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):0:0 -> a
+    269:269:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
+    270:270:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":804,"2":805,"3":806,"4":807,"5":808}}
     804:804:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
     805:805:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
     806:806:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
     807:807:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
     808:808:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
-    774:777:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
-    787:793:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):264:264 -> a
-    809:814:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):275:280 -> a
-    815:816:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):279:280 -> a
-    817:819:void visitNestHost(java.lang.String):285:287 -> a
-    820:820:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):310:310 -> a
-    821:821:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":826,"2":827,"3":828}}
-    826:826:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):298:298 -> a
-    826:826:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):310 -> a
-    827:827:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):298:298 -> a
+    524:524:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
+    525:525:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":809,"2":810,"3":811,"4":812,"5":813}}
+    809:809:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
+    810:810:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
+    811:811:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
+    812:812:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
+    813:813:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
+    779:782:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):254:254 -> a
+    792:798:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):264:264 -> a
+    814:819:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):275:280 -> a
+    820:821:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):279:280 -> a
+    822:824:void visitNestHost(java.lang.String):285:287 -> a
+    825:825:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):310:310 -> a
+    826:826:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":831,"2":832,"3":833}}
+    831:831:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):298:298 -> a
+    831:831:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):310 -> a
+    832:832:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):298:298 -> a
+    832:832:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):310 -> a
+    833:833:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):298:298 -> a
+    833:833:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):310 -> a
+    827:827:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):299:299 -> a
     827:827:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):310 -> a
-    828:828:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):298:298 -> a
-    828:828:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):310 -> a
-    822:822:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):299:299 -> a
-    822:822:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):310 -> a
-    823:823:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):310:310 -> a
-    824:824:java.lang.String illegalClassFilePostfix(com.android.tools.r8.cf.CfVersion):305:305 -> a
-    824:824:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):312 -> a
-    825:825:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):312:312 -> a
-    829:852:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):348:371 -> a
-    853:853:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    853:853:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    853:853:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):371 -> a
-    854:858:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):371:375 -> a
-    859:859:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2011,"2":2012,"3":2013,"4":2014,"5":2015}}
-    2011:2011:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
-    2012:2012:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
-    2013:2013:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
-    2014:2014:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
-    2015:2015:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
-    1235:1235:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:376 -> a
-    1236:1236:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    1236:1236:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    1236:1236:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376 -> a
-    1237:1247:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:386 -> a
-    1248:1255:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):68:75 -> a
-    1248:1255:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):386 -> a
-    1256:1258:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):386:388 -> a
-    1259:1259:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    1259:1259:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1260:1260:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390:390 -> a
-    1261:1261:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):389:389 -> a
-    1262:1262:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):361:361 -> a
-    1263:1263:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2016,"2":2017,"3":2018}}
-    2016:2016:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):361:361 -> a
-    2017:2017:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):361:361 -> a
-    2018:2018:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):361:361 -> a
-    1624:1629:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):361:366 -> a
-    1630:1630:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):362:362 -> a
-    1631:1631:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    1631:1631:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    1631:1631:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):362 -> a
-    1632:1632:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):362:362 -> a
-    1633:1633:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
-    1634:1634:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2019,"2":2020,"3":2021}}
-    2019:2019:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
-    2020:2020:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
-    2021:2021:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
-    1984:1984:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
-    1985:1985:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    1985:1985:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    1985:1985:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350 -> a
-    1986:1986:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
-    2022:2022:void visitSource(java.lang.String,java.lang.String):397:397 -> a
-    2023:2026:java.util.List getAnnotations():595:598 -> a
-    2023:2026:void visitSource(java.lang.String,java.lang.String):400 -> a
-    2027:2029:void visitSource(java.lang.String,java.lang.String):400:402 -> a
-    2030:2030:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    2030:2030:void visitSource(java.lang.String,java.lang.String):402 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2031:2034:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createSourceDebugExtensionAnnotation(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexItemFactory):240:243 -> a
-    2031:2034:void visitSource(java.lang.String,java.lang.String):401 -> a
-    2035:2035:void visitSource(java.lang.String,java.lang.String):400:400 -> a
-    2036:2044:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):409:417 -> a
-    2045:2052:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):423:430 -> a
-    2053:2054:void visitEnd():447:448 -> a
-    2055:2055:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    2055:2055:void visitEnd():449 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2056:2056:void visitEnd():448:448 -> a
-    2057:2060:java.util.List getAnnotations():595:598 -> a
-    2057:2060:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):591 -> a
-    2057:2060:void visitEnd():448 -> a
-    2061:2061:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):591:591 -> a
-    2061:2061:void visitEnd():448 -> a
-    2062:2062:void checkReachabilitySensitivity():561:561 -> a
-    2062:2062:void visitEnd():451 -> a
-    2063:2063:boolean hasReachabilitySensitiveField():572:572 -> a
-    2063:2063:void checkReachabilitySensitivity():561 -> a
-    2063:2063:void visitEnd():451 -> a
-    2064:2064:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    2064:2064:boolean hasReachabilitySensitiveField():572 -> a
-    2064:2064:void checkReachabilitySensitivity():561 -> a
-    2064:2064:void visitEnd():451 -> a
-    2065:2066:boolean hasReachabilitySensitiveField():572:573 -> a
-    2065:2066:void checkReachabilitySensitivity():561 -> a
-    2065:2066:void visitEnd():451 -> a
-    2067:2067:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    2067:2067:boolean hasReachabilitySensitiveField():573 -> a
-    2067:2067:void checkReachabilitySensitivity():561 -> a
-    2067:2067:void visitEnd():451 -> a
-    2068:2070:boolean hasReachabilitySensitiveField():573:575 -> a
-    2068:2070:void checkReachabilitySensitivity():561 -> a
-    2068:2070:void visitEnd():451 -> a
-    2071:2071:void checkReachabilitySensitivity():562:562 -> a
+    828:828:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):310:310 -> a
+    829:829:java.lang.String illegalClassFilePostfix(com.android.tools.r8.cf.CfVersion):305:305 -> a
+    829:829:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):312 -> a
+    830:830:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):312:312 -> a
+    834:857:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):348:371 -> a
+    858:858:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    858:858:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    858:858:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):371 -> a
+    859:863:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):371:375 -> a
+    864:864:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2018,"2":2019,"3":2020,"4":2021,"5":2022}}
+    2018:2018:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
+    2019:2019:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
+    2020:2020:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
+    2021:2021:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
+    2022:2022:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
+    1240:1240:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:376 -> a
+    1241:1241:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    1241:1241:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    1241:1241:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376 -> a
+    1242:1252:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:386 -> a
+    1253:1260:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):68:75 -> a
+    1253:1260:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):386 -> a
+    1261:1265:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):386:390 -> a
+    1266:1266:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    1266:1266:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390 -> a
+    1267:1267:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390:390 -> a
+    1268:1268:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):389:389 -> a
+    1269:1269:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):361:361 -> a
+    1270:1270:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2023,"2":2024,"3":2025}}
+    2023:2023:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):361:361 -> a
+    2024:2024:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):361:361 -> a
+    2025:2025:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):361:361 -> a
+    1631:1636:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):361:366 -> a
+    1637:1637:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):362:362 -> a
+    1638:1638:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    1638:1638:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    1638:1638:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):362 -> a
+    1639:1639:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):362:362 -> a
+    1640:1640:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
+    1641:1641:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2026,"2":2027,"3":2028}}
+    2026:2026:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
+    2027:2027:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
+    2028:2028:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
+    1991:1991:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
+    1992:1992:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    1992:1992:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    1992:1992:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350 -> a
+    1993:1993:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):350:350 -> a
+    2029:2029:void visitSource(java.lang.String,java.lang.String):397:397 -> a
+    2030:2033:java.util.List getAnnotations():595:598 -> a
+    2030:2033:void visitSource(java.lang.String,java.lang.String):400 -> a
+    2034:2036:void visitSource(java.lang.String,java.lang.String):400:402 -> a
+    2037:2037:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    2037:2037:void visitSource(java.lang.String,java.lang.String):402 -> a
+    2038:2041:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createSourceDebugExtensionAnnotation(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexItemFactory):240:243 -> a
+    2038:2041:void visitSource(java.lang.String,java.lang.String):401 -> a
+    2042:2042:void visitSource(java.lang.String,java.lang.String):400:400 -> a
+    2043:2051:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):409:417 -> a
+    2052:2059:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):423:430 -> a
+    2060:2062:void visitEnd():447:449 -> a
+    2063:2063:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    2063:2063:void visitEnd():449 -> a
+    2064:2064:void visitEnd():448:448 -> a
+    2065:2068:java.util.List getAnnotations():595:598 -> a
+    2065:2068:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):591 -> a
+    2065:2068:void visitEnd():448 -> a
+    2069:2069:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):591:591 -> a
+    2069:2069:void visitEnd():448 -> a
+    2070:2070:void checkReachabilitySensitivity():561:561 -> a
+    2070:2070:void visitEnd():451 -> a
+    2071:2071:boolean hasReachabilitySensitiveField():572:572 -> a
+    2071:2071:void checkReachabilitySensitivity():561 -> a
     2071:2071:void visitEnd():451 -> a
-    2072:2072:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    2072:2072:void checkReachabilitySensitivity():562 -> a
+    2072:2072:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    2072:2072:boolean hasReachabilitySensitiveField():572 -> a
+    2072:2072:void checkReachabilitySensitivity():561 -> a
     2072:2072:void visitEnd():451 -> a
-    2073:2076:void checkReachabilitySensitivity():562:565 -> a
-    2073:2076:void visitEnd():451 -> a
-    2077:2093:void checkRecord():518:534 -> a
-    2077:2093:void visitEnd():452 -> a
-    2094:2094:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    2094:2094:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    2094:2094:void checkRecord():534 -> a
-    2094:2094:void visitEnd():452 -> a
-    2095:2095:void checkRecord():534:534 -> a
-    2095:2095:void visitEnd():452 -> a
-    2096:2114:void visitEnd():453:471 -> a
-    2115:2115:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    2115:2115:void visitEnd():472 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2116:2117:void visitEnd():472:473 -> a
-    2118:2149:void visitEnd():454:485 -> a
-    2150:2158:void com.android.tools.r8.graph.DexClass.replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):1051:1059 -> a
-    2150:2158:void visitEnd():486 -> a
-    2159:2167:void visitEnd():487:495 -> a
-    2168:2168:void visitEnd():491:491 -> a
-    2169:2169:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    2169:2169:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    2169:2169:void visitEnd():491 -> a
-    2170:2181:void visitEnd():491:502 -> a
-    2182:2182:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    2182:2182:void visitEnd():504 -> a
-    2183:2192:void visitEnd():505:514 -> a
-    2193:2193:void checkRecord():529:529 -> a
-    2193:2193:void visitEnd():452 -> a
-    2194:2194:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    2194:2194:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    2194:2194:void checkRecord():529 -> a
-    2194:2194:void visitEnd():452 -> a
-    2195:2195:void checkRecord():529:529 -> a
-    2195:2195:void visitEnd():452 -> a
-    2196:2202:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.ClassKind):540:546 -> a
-    2203:2206:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):584:587 -> a
-    2203:2206:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):193 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2207:2210:java.util.List getAnnotations():595:598 -> a
-    2207:2210:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):435 -> a
-    2211:2211:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):435:435 -> a
+    2073:2074:boolean hasReachabilitySensitiveField():572:573 -> a
+    2073:2074:void checkReachabilitySensitivity():561 -> a
+    2073:2074:void visitEnd():451 -> a
+    2075:2075:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
+    2075:2075:boolean hasReachabilitySensitiveField():573 -> a
+    2075:2075:void checkReachabilitySensitivity():561 -> a
+    2075:2075:void visitEnd():451 -> a
+    2076:2078:boolean hasReachabilitySensitiveField():573:575 -> a
+    2076:2078:void checkReachabilitySensitivity():561 -> a
+    2076:2078:void visitEnd():451 -> a
+    2079:2079:void checkReachabilitySensitivity():562:562 -> a
+    2079:2079:void visitEnd():451 -> a
+    2080:2080:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
+    2080:2080:void checkReachabilitySensitivity():562 -> a
+    2080:2080:void visitEnd():451 -> a
+    2081:2084:void checkReachabilitySensitivity():562:565 -> a
+    2081:2084:void visitEnd():451 -> a
+    2085:2101:void checkRecord():518:534 -> a
+    2085:2101:void visitEnd():452 -> a
+    2102:2102:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    2102:2102:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    2102:2102:void checkRecord():534 -> a
+    2102:2102:void visitEnd():452 -> a
+    2103:2103:void checkRecord():534:534 -> a
+    2103:2103:void visitEnd():452 -> a
+    2104:2123:void visitEnd():453:472 -> a
+    2124:2124:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    2124:2124:void visitEnd():472 -> a
+    2125:2126:void visitEnd():472:473 -> a
+    2127:2158:void visitEnd():454:485 -> a
+    2159:2167:void com.android.tools.r8.graph.DexClass.replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):1060:1068 -> a
+    2159:2167:void visitEnd():486 -> a
+    2168:2176:void visitEnd():487:495 -> a
+    2177:2177:void visitEnd():491:491 -> a
+    2178:2178:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    2178:2178:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    2178:2178:void visitEnd():491 -> a
+    2179:2190:void visitEnd():491:502 -> a
+    2191:2191:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    2191:2191:void visitEnd():504 -> a
+    2192:2201:void visitEnd():505:514 -> a
+    2202:2202:void checkRecord():529:529 -> a
+    2202:2202:void visitEnd():452 -> a
+    2203:2203:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    2203:2203:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    2203:2203:void checkRecord():529 -> a
+    2203:2203:void visitEnd():452 -> a
+    2204:2204:void checkRecord():529:529 -> a
+    2204:2204:void visitEnd():452 -> a
+    2205:2211:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.ClassKind):540:546 -> a
+    2212:2215:java.util.List getAnnotations():595:598 -> a
+    2212:2215:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):435 -> a
+    2216:2216:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):435:435 -> a
     1:1:com.android.tools.r8.cf.CfVersion access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> b
     2:4:void visitNestMember(java.lang.String):292:294 -> b
-    5:9:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):318:322 -> b
-    10:10:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> b
-    10:10:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):324 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:13:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):324:326 -> b
-    14:17:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):325:328 -> b
-    18:18:boolean isInANest():602:602 -> b
+    5:11:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):318:324 -> b
+    12:12:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> b
+    12:12:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):324 -> b
+    13:15:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):324:326 -> b
+    16:19:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):325:328 -> b
+    20:20:boolean isInANest():602:602 -> b
     1:1:java.util.Set access$1200(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> c
     2:3:void visitPermittedSubclass(java.lang.String):333:334 -> c
-    4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> c
-    4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> c
+    4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> c
     4:4:void visitPermittedSubclass(java.lang.String):334 -> c
     5:5:void visitPermittedSubclass(java.lang.String):334:334 -> c
     1:1:java.util.List access$1400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> d
     2:2:void checkName(java.lang.String):550:550 -> d
     3:3:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> d
     3:3:void checkName(java.lang.String):550 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:5:void checkName(java.lang.String):550:551 -> d
     6:13:boolean com.android.tools.r8.graph.DexString.isValidSimpleName(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):404:411 -> d
     6:13:void checkName(java.lang.String):551 -> d
@@ -32099,7 +31776,7 @@
     1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> j
     1:1:java.util.List access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> k
     1:1:com.android.tools.r8.graph.ClassKind access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.s2:
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.h2:
     java.lang.String desc -> f
     java.lang.Object value -> g
     boolean $assertionsDisabled -> j
@@ -32116,7 +31793,6 @@
     1:2:void visitEnd():669:670 -> a
     3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):94:94 -> a
     3:3:void visitEnd():670 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:9:void visitEnd():671:676 -> a
     10:10:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):703:703 -> a
     10:10:void visitEnd():676 -> a
@@ -32140,14 +31816,14 @@
     43:43:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):733:733 -> a
     43:43:void visitEnd():676 -> a
     44:50:void visitEnd():678:684 -> a
-    51:51:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():475:475 -> a
+    51:51:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():498:498 -> a
     51:51:void visitEnd():685 -> a
     52:61:void visitEnd():686:695 -> a
     62:62:void visitEnd():693:693 -> a
     68:71:java.util.List getAnnotations():737:740 -> a
     68:71:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):657 -> a
     72:72:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):657:657 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.t2:
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.i2:
     java.util.List parameterFlags -> r
     int annotableParameterCount -> o
     java.util.List parameterNames -> q
@@ -32185,16 +31861,14 @@
     1:6:void visitParameter(java.lang.String,int):864:869 -> b
     7:7:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> b
     7:7:void visitParameter(java.lang.String,int):869 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:10:void visitParameter(java.lang.String,int):869:871 -> b
     11:11:void visitCode():876:876 -> b
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> c
     1:3:void visitEnd():888:890 -> c
     4:5:boolean classRequiresCode():880:881 -> c
     4:5:void visitEnd():890 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1835:1835 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1857:1857 -> c
     6:6:boolean classRequiresCode():881 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void visitEnd():890 -> c
     7:9:boolean classRequiresCode():881:883 -> c
     7:9:void visitEnd():890 -> c
@@ -32208,7 +31882,6 @@
     30:33:void visitEnd():909:912 -> c
     34:34:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> c
     34:34:void visitEnd():912 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     35:55:void visitEnd():909:929 -> c
     56:56:boolean isReachabilitySensitive():950:950 -> c
     56:56:void visitEnd():929 -> c
@@ -32226,12 +31899,12 @@
     70:80:void visitEnd():931:941 -> c
     81:81:void visitEnd():938:938 -> c
     82:90:void visitEnd():936:944 -> c
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.internal.yv:
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.internal.Su:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
     1:8:void <init>():1116:1123 -> <init>
-com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.A2:
+com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.o2:
     com.android.tools.r8.graph.CfCode code -> f
     com.android.tools.r8.graph.JarApplicationReader application -> e
     boolean $assertionsDisabled -> i
@@ -32245,25 +31918,25 @@
     3:3:void com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,java.lang.Runnable):225:225 -> F
     3:3:com.android.tools.r8.graph.CfCode asCfCode():138 -> F
     4:5:com.android.tools.r8.graph.CfCode asCfCode():140:141 -> F
-    1:1:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):174:174 -> a
-    2:2:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):190:190 -> a
-    3:25:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,boolean):1057:1079 -> a
-    3:25:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):190 -> a
-    26:26:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):192:192 -> a
-    27:27:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):294:294 -> a
-    27:27:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):195 -> a
-    28:33:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):195:200 -> a
-    34:38:void setCode(com.android.tools.r8.graph.CfCode):204:208 -> a
-    34:38:void access$100(com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.graph.CfCode):93 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    39:39:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):243:243 -> a
-    40:41:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):256:257 -> a
-    42:42:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):270:270 -> a
-    43:43:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):275:275 -> a
-    44:44:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):290:290 -> a
-    45:45:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):1103:1103 -> a
-    1:1:boolean computeEquals(java.lang.Object):218:218 -> g
+    1:1:void access$100(com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.graph.CfCode):93:93 -> a
+    2:6:void setCode(com.android.tools.r8.graph.CfCode):204:208 -> a
+    2:6:void access$100(com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.graph.CfCode):93 -> a
+    7:7:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):174:174 -> a
+    8:8:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):190:190 -> a
+    9:31:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,boolean):1057:1079 -> a
+    9:31:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):190 -> a
+    32:32:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):192:192 -> a
+    33:33:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):294:294 -> a
+    33:33:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):195 -> a
+    34:39:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):195:200 -> a
+    40:40:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):243:243 -> a
+    41:42:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):256:257 -> a
+    43:43:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):270:270 -> a
+    44:44:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):275:275 -> a
+    45:45:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):290:290 -> a
+    46:46:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):1103:1103 -> a
     1:1:int computeHashCode():213:213 -> g0
+    1:1:boolean computeEquals(java.lang.Object):218:218 -> h
     1:1:com.android.tools.r8.graph.CfWritableCode asCfWritableCode():146:146 -> h0
     1:1:boolean estimatedSizeForInliningAtMost(int):233:233 -> i
     com.android.tools.r8.graph.LazyCfCode asLazyCfCode() -> j0
@@ -32278,8 +31951,7 @@
     28:28:void internalParseCode():166:166 -> t0
     1:1:java.lang.String toString():285:285 -> toString
     1:2:void markReachabilitySensitive():116:117 -> u0
-com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.v2:
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.w2:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.k2:
     java.util.function.BiFunction codeLocator -> d
     com.android.tools.r8.graph.JarApplicationReader application -> e
     com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions debugParsingOptions -> h
@@ -32288,12 +31960,12 @@
     com.android.tools.r8.graph.DexClass clazz -> c
     1:7:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):329:335 -> <init>
     1:11:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):341:351 -> a
-com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.mB:
+com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.vA:
     boolean lineInfo -> a
     boolean localInfo -> b
     int asmReaderOptions -> c
     1:4:void <init>(boolean,boolean,int):182:185 -> <init>
-com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.x2:
+com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.l2:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> a
     int methodIndex -> b
     1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode$1):297:297 -> <init>
@@ -32302,9 +31974,9 @@
     1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):297:297 -> apply
     2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):309:309 -> apply
     2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):297 -> apply
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.y2:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.m2:
     1:1:void <init>(java.lang.String):97:97 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.z2:
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.n2:
     int maxLocals -> n
     java.util.List localVariables -> r
     java.util.List tryCatchRanges -> q
@@ -32658,11 +32330,9 @@
     1269:1269:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):817:817 -> a
     1270:1270:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):98:98 -> a
     1270:1270:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):817 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1271:1271:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):818:818 -> a
     1272:1272:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
     1272:1272:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):818 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1273:1273:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):818:818 -> a
     1274:1274:boolean com.android.tools.r8.graph.DexItemFactory.isClassConstructor(com.android.tools.r8.graph.DexMethod):2800:2800 -> a
     1274:1274:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):818 -> a
@@ -33078,7 +32748,7 @@
     781:785:void visitVarInsn(int,int):756:760 -> d
     786:815:void visitVarInsn(int,int):752:781 -> d
     816:816:void visitVarInsn(int,int):772:772 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.D2:
+com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.q2:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> k
     boolean $assertionsDisabled -> l
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> j
@@ -33131,8 +32801,7 @@
     296:296:java.lang.String toString():293:293 -> toString
     297:297:java.lang.String toString():293:293 -> toString
     294:294:java.lang.String toString():293:293 -> toString
-com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.B2:
-com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.C2:
+com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.p2:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList programClasses -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> c
@@ -33146,7 +32815,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getLibraryClasses():164:164 -> b
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getProgramClasses():156:156 -> c
-com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.D2$a:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.q2$a:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> j
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> k
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> i
@@ -33159,9 +32828,9 @@
     2:4:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):256:258 -> b
     com.android.tools.r8.graph.DexApplication$Builder self() -> d
     1:5:com.android.tools.r8.graph.LazyLoadedDexApplication build():263:267 -> e
-com.android.tools.r8.graph.LibraryDefinition -> com.android.tools.r8.internal.DB:
+com.android.tools.r8.graph.LibraryDefinition -> com.android.tools.r8.internal.NA:
     1:1:com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext):21:21 -> a
-com.android.tools.r8.graph.LibraryField -> com.android.tools.r8.graph.E2:
+com.android.tools.r8.graph.LibraryField -> com.android.tools.r8.graph.r2:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):11:11 -> <init>
@@ -33171,7 +32840,7 @@
     3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> z
     3:3:com.android.tools.r8.graph.DexLibraryClass getHolder():17 -> z
     4:5:com.android.tools.r8.graph.DexLibraryClass getHolder():17:18 -> z
-com.android.tools.r8.graph.LibraryMethod -> com.android.tools.r8.graph.F2:
+com.android.tools.r8.graph.LibraryMethod -> com.android.tools.r8.graph.s2:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):11:11 -> <init>
@@ -33181,7 +32850,7 @@
     4:5:com.android.tools.r8.graph.DexLibraryClass getHolder():17:18 -> F
     com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> N
     1:1:com.android.tools.r8.graph.DexClass getHolder():7:7 -> r
-com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.graph.G2:
+com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.graph.t2:
     java.util.Set pinnedMethods -> c
     com.android.tools.r8.graph.PinnedPredicate pinnedPredicate -> a
     java.util.Set pinnedInstantiations -> b
@@ -33203,7 +32872,7 @@
     32:33:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
     32:33:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):79 -> a
     32:33:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
-com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.sD:
+com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.AC:
     com.android.tools.r8.graph.DexClassAndMethod method -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
@@ -33212,15 +32881,14 @@
     2:2:com.android.tools.r8.graph.DexClassAndMethod getImplementationMethod():38:38 -> a
     boolean isLambdaTarget() -> j
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> n
-com.android.tools.r8.graph.LookupResult -> com.android.tools.r8.graph.K2:
+com.android.tools.r8.graph.LookupResult -> com.android.tools.r8.graph.w2:
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess asLookupResultSuccess() -> a
     void forEach(java.util.function.Consumer,java.util.function.Consumer) -> a
     void forEachFailureDependency(java.util.function.Consumer) -> a
     boolean isLookupResultFailure() -> b
     boolean isLookupResultSuccess() -> c
-com.android.tools.r8.graph.LookupResult$1 -> com.android.tools.r8.graph.H2:
-com.android.tools.r8.graph.LookupResult$LookupResultFailure -> com.android.tools.r8.graph.I2:
+com.android.tools.r8.graph.LookupResult$LookupResultFailure -> com.android.tools.r8.graph.u2:
     com.android.tools.r8.graph.LookupResult$LookupResultFailure INSTANCE -> a
     1:1:void <clinit>():195:195 -> <clinit>
     1:1:void <init>():197:197 -> <init>
@@ -33228,7 +32896,7 @@
     void forEachFailureDependency(java.util.function.Consumer) -> a
     boolean isLookupResultFailure() -> b
     1:1:com.android.tools.r8.graph.LookupResult$LookupResultFailure access$100():193:193 -> d
-com.android.tools.r8.graph.LookupResult$LookupResultSuccess -> com.android.tools.r8.graph.K2$a:
+com.android.tools.r8.graph.LookupResult$LookupResultSuccess -> com.android.tools.r8.graph.w2$a:
     java.util.List lambdaTargets -> b
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState state -> d
     java.util.List methodsCausingFailure -> c
@@ -33249,7 +32917,7 @@
     1:1:boolean isComplete():134:134 -> g
     1:1:boolean isIncomplete():130:130 -> h
     1:1:void setIncomplete():139:139 -> i
-com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder -> com.android.tools.r8.graph.J2:
+com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder -> com.android.tools.r8.graph.v2:
     java.util.List lambdaTargets -> b
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState state -> d
     java.util.List methodsCausingFailure -> c
@@ -33260,13 +32928,13 @@
     3:3:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder addMethodCausingFailure(com.android.tools.r8.graph.DexEncodedMethod):178:178 -> a
     4:4:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder setState(com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState):183:183 -> a
     5:5:com.android.tools.r8.graph.LookupResult$LookupResultSuccess build():188:188 -> a
-com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.uD:
+com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.CC:
     void accept(java.util.function.Consumer,java.util.function.Consumer) -> a
     boolean isLambdaTarget() -> j
     com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> m
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> n
     boolean isMethodTarget() -> p
-com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.rE:
+com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.wD:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):25:25 -> a
@@ -33276,7 +32944,7 @@
     boolean isFailedResolution() -> h
     boolean isFieldResolutionResult() -> i
     boolean isSuccessfulMemberResolutionResult() -> j
-com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.M2:
+com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.y2:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):61:61 -> <init>
@@ -33340,7 +33008,7 @@
     1:1:void unsetDeclaredSynchronized():243:243 -> i0
     1:1:void unsetVarargs():163:163 -> j0
     com.android.tools.r8.graph.AccessFlags self() -> y
-com.android.tools.r8.graph.MethodAccessFlags$Builder -> com.android.tools.r8.graph.L2:
+com.android.tools.r8.graph.MethodAccessFlags$Builder -> com.android.tools.r8.graph.x2:
     1:1:void <init>():249:249 -> <init>
     1:3:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPrivate(boolean):326:328 -> a
     1:3:com.android.tools.r8.graph.AccessFlags$BuilderBase setPrivate(boolean):0 -> a
@@ -33359,23 +33027,18 @@
     1:1:com.android.tools.r8.graph.MethodAccessFlags$Builder setConstructor():258:258 -> d
     2:2:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():219:219 -> d
     2:2:com.android.tools.r8.graph.MethodAccessFlags$Builder setConstructor():258 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):264:264 -> d
     4:4:void com.android.tools.r8.graph.MethodAccessFlags.setStrict():203:203 -> d
     4:4:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):264 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):266:266 -> d
     6:6:void com.android.tools.r8.graph.MethodAccessFlags.unsetStrict():211:211 -> d
     6:6:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):266 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):273:273 -> e
     2:2:void com.android.tools.r8.graph.MethodAccessFlags.setSynchronized():127:127 -> e
     2:2:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):273 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):275:275 -> e
     4:4:void com.android.tools.r8.graph.MethodAccessFlags.unsetSynchronized():135:135 -> e
     4:4:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):275 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:6:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPackagePrivate():320:321 -> e
     5:6:com.android.tools.r8.graph.AccessFlags$BuilderBase setPackagePrivate():0 -> e
       # {"id":"com.android.tools.r8.synthesized"}
@@ -33385,7 +33048,7 @@
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():361:362 -> g
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase setSynthetic():0 -> g
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.LE:
+com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.OD:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -33400,9 +33063,8 @@
     10:16:com.android.tools.r8.graph.MethodAccessInfoCollection rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):93:99 -> a
     17:17:void rewriteInvokesWithLens(com.android.tools.r8.graph.MethodAccessInfoCollection$Builder,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.Invoke$Type):108:108 -> a
     18:21:void lambda$rewriteInvokesWithLens$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.MethodAccessInfoCollection$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):110:113 -> a
-    22:22:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    22:22:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     22:22:void lambda$rewriteInvokesWithLens$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.MethodAccessInfoCollection$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):113 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     23:25:void lambda$rewriteInvokesWithLens$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.MethodAccessInfoCollection$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):114:116 -> a
     1:1:com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder identityBuilder():46:46 -> b
     2:2:void forEachInterfaceInvoke(java.util.function.BiConsumer):68:68 -> b
@@ -33411,8 +33073,7 @@
     2:2:void forEachStaticInvoke(java.util.function.BiConsumer):72:72 -> c
     1:1:void forEachSuperInvoke(java.util.function.BiConsumer):76:76 -> d
     1:1:void forEachVirtualInvoke(java.util.function.BiConsumer):84:84 -> e
-com.android.tools.r8.graph.MethodAccessInfoCollection$1 -> com.android.tools.r8.internal.GE:
-com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.HE:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.KD:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -33464,17 +33125,17 @@
     1:1:boolean registerInvokeStaticInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:200 -> h
     1:1:boolean registerInvokeSuperInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):208:208 -> i
     1:1:boolean registerInvokeVirtualInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):216:216 -> j
-com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.IE:
+com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.LD:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):237:237 -> <init>
     2:2:void <init>():241:241 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.JE:
+com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.MD:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):245:245 -> <init>
     2:2:void <init>():249:249 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.KE:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.ND:
     1:1:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.graph.MethodAccessInfoCollection$1):253:253 -> <init>
     2:2:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map):261:261 -> <init>
     1:5:void addAll(com.android.tools.r8.graph.MethodAccessInfoCollection):265:269 -> a
-com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.graph.N2:
+com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.graph.z2:
     com.android.tools.r8.graph.DexEncodedMethod[] virtualMethods -> b
     com.android.tools.r8.graph.DexEncodedMethod[] directMethods -> a
     boolean $assertionsDisabled -> c
@@ -33604,7 +33265,7 @@
     1:2:boolean verifyNoDuplicateMethods():28:29 -> j
     3:3:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):42:42 -> j
     3:3:boolean verifyNoDuplicateMethods():29 -> j
-com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.graph.O2:
+com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.graph.A2:
     com.android.tools.r8.graph.DexClass holder -> a
     com.android.tools.r8.graph.MethodCollectionBacking backing -> b
     com.android.tools.r8.graph.DexEncodedMethod cachedClassInitializer -> c
@@ -33663,7 +33324,6 @@
     1:1:void forEachMethodMatching(java.util.function.Predicate,java.util.function.Consumer):103:103 -> b
     2:2:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):42:42 -> b
     2:2:void forEachMethodMatching(java.util.function.Predicate,java.util.function.Consumer):103 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:void lambda$forEachMethodMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):105:106 -> b
     5:5:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):163:163 -> b
     6:6:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):188:188 -> b
@@ -33765,7 +33425,7 @@
     2:2:boolean verify():350 -> m
     3:3:boolean verify():354:354 -> m
     1:1:java.lang.Iterable virtualMethods():159:159 -> n
-com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.graph.P2:
+com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.graph.B2:
     1:1:void <init>():15:15 -> <init>
     void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void addDirectMethods(java.util.Collection) -> a
@@ -33805,7 +33465,7 @@
     int size() -> g
     boolean verify() -> h
     java.lang.Iterable virtualMethods() -> i
-com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.graph.Q2:
+com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.graph.C2:
     boolean $assertionsDisabled -> b
     java.util.SortedMap methodMap -> a
     1:1:void <clinit>():21:21 -> <clinit>
@@ -33980,7 +33640,7 @@
     2:2:java.util.SortedMap createdLinkedMap():39 -> k
     1:1:java.util.Iterator lambda$directMethods$1():108:108 -> l
     1:1:java.util.Iterator lambda$virtualMethods$2():113:113 -> m
-com.android.tools.r8.graph.MethodResolutionResult -> com.android.tools.r8.graph.V2:
+com.android.tools.r8.graph.MethodResolutionResult -> com.android.tools.r8.graph.G2:
     1:1:void <init>():22:22 -> <init>
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     boolean isIllegalAccessErrorResult(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
@@ -34008,8 +33668,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod getSingleTarget():97:97 -> p
     boolean isSingleResolution() -> q
     boolean isVirtualTarget() -> r
-com.android.tools.r8.graph.MethodResolutionResult$1 -> com.android.tools.r8.graph.R2:
-com.android.tools.r8.graph.MethodResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.S2:
+com.android.tools.r8.graph.MethodResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.D2:
     com.android.tools.r8.graph.MethodResolutionResult$ArrayCloneMethodResult INSTANCE -> a
     1:1:void <clinit>():840:840 -> <clinit>
     1:1:void <init>():842:842 -> <init>
@@ -34027,16 +33686,16 @@
     com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> d
     boolean isVirtualTarget() -> r
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> s
-com.android.tools.r8.graph.MethodResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.T2:
+com.android.tools.r8.graph.MethodResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.E2:
     com.android.tools.r8.graph.MethodResolutionResult$ClassNotFoundResult INSTANCE -> a
     1:1:void <clinit>():910:910 -> <clinit>
     1:1:void <init>():912:912 -> <init>
-com.android.tools.r8.graph.MethodResolutionResult$EmptyResult -> com.android.tools.r8.graph.U2:
+com.android.tools.r8.graph.MethodResolutionResult$EmptyResult -> com.android.tools.r8.graph.F2:
     1:1:void <init>():772:772 -> <init>
     1:1:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):772:772 -> a
     com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> s
-com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.V2$a:
+com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.G2$a:
     1:1:void <init>():870:870 -> <init>
     void forEachFailureDependency(java.util.function.Consumer) -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
@@ -34056,13 +33715,13 @@
     boolean isVirtualTarget() -> r
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> s
     boolean hasMethodsCausingError() -> t
-com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.W2:
+com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.H2:
     java.util.Collection methodsCausingError -> a
     1:1:void <init>(java.util.Collection,com.android.tools.r8.graph.MethodResolutionResult$1):922:922 -> <init>
     2:3:void <init>(java.util.Collection):926:927 -> <init>
     1:1:void forEachFailureDependency(java.util.function.Consumer):933:933 -> a
     1:1:boolean hasMethodsCausingError():938:938 -> t
-com.android.tools.r8.graph.MethodResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.X2:
+com.android.tools.r8.graph.MethodResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.I2:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():972:972 -> <clinit>
@@ -34074,17 +33733,17 @@
     22:22:void lambda$verifyInvalidSymbolicReference$1(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):1025:1025 -> a
     1:10:boolean isNoSuchMethodErrorResult(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1008:1017 -> b
     1:7:boolean verifyInvalidSymbolicReference():1022:1028 -> u
-com.android.tools.r8.graph.MethodResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.Y2:
+com.android.tools.r8.graph.MethodResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.J2:
     com.android.tools.r8.graph.MethodResolutionResult$IncompatibleClassResult INSTANCE -> b
     1:2:void <clinit>():943:944 -> <clinit>
     1:1:void <init>(java.util.Collection):947:947 -> <init>
     1:3:com.android.tools.r8.graph.MethodResolutionResult$IncompatibleClassResult create(java.util.Collection):951:953 -> a
-com.android.tools.r8.graph.MethodResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.V2$b:
+com.android.tools.r8.graph.MethodResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.G2$b:
     com.android.tools.r8.graph.MethodResolutionResult$NoSuchMethodResult INSTANCE -> a
     1:1:void <clinit>():964:964 -> <clinit>
     1:1:void <init>():962:962 -> <init>
     boolean isNoSuchMethodErrorResult(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
-com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.V2$c:
+com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.G2$c:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> a
     com.android.tools.r8.graph.DexClass resolvedHolder -> b
     com.android.tools.r8.graph.DexEncodedMethod resolvedMethod -> c
@@ -34184,11 +33843,11 @@
     1:2:com.android.tools.r8.graph.ProgramMethod getResolvedProgramMethod():213:214 -> o
     boolean isSingleResolution() -> q
     1:1:boolean isVirtualTarget():261:261 -> r
-com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.MG:
+com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.JF:
     1:1:int compareToWithNamingLens(com.android.tools.r8.graph.NamingLensComparable,com.android.tools.r8.naming.NamingLens):13:13 -> a
     2:3:int com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens.run(java.lang.Object,java.lang.Object,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):23:24 -> a
     2:3:int compareToWithNamingLens(com.android.tools.r8.graph.NamingLensComparable,com.android.tools.r8.naming.NamingLens):13 -> a
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.UG:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.RF:
     com.android.tools.r8.graph.DexType nestHost -> b
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
@@ -34200,7 +33859,7 @@
     3:3:com.android.tools.r8.graph.DexType getNestHost():26:26 -> a
     4:5:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):34:35 -> a
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():45:45 -> n
-com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.VG:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.SF:
     com.android.tools.r8.graph.DexType nestMember -> b
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
@@ -34212,7 +33871,7 @@
     3:3:com.android.tools.r8.graph.DexType getNestMember():32:32 -> a
     4:5:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):36:37 -> a
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():47:47 -> n
-com.android.tools.r8.graph.NestedGraphLens -> com.android.tools.r8.graph.Z2:
+com.android.tools.r8.graph.NestedGraphLens -> com.android.tools.r8.graph.K2:
     boolean $assertionsDisabled -> m
     java.util.function.Function methodMap -> g
     com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap EMPTY_METHOD_MAP -> k
@@ -34228,74 +33887,71 @@
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):89:89 -> <init>
     9:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.function.Function,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):101:105 -> <init>
     com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod) -> a
+    com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type) -> a
     1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):118:118 -> a
     2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):128:128 -> a
     3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> a
     3:3:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):128 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:5:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):128:129 -> a
-    6:16:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):186:196 -> a
-    17:20:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):194:197 -> a
-    21:21:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:102 -> a
-    21:21:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):198 -> a
-    22:22:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):107:107 -> a
-    22:22:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):199 -> a
-    23:23:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):202:202 -> a
-    24:24:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):201:201 -> a
-    25:30:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):200:205 -> a
-    31:31:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):204:204 -> a
-    32:51:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):203:222 -> a
-    52:52:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:102 -> a
-    52:52:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):223 -> a
-    53:55:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):224:226 -> a
-    56:56:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):258:258 -> a
-    57:70:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):283:296 -> a
-    71:74:void lambda$toString$0(java.lang.StringBuilder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):318:321 -> a
-    75:76:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):325:326 -> a
-    77:77:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":411,"2":412,"3":413}}
-    411:411:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):326:326 -> a
-    412:412:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):326:326 -> a
-    413:413:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):326:326 -> a
-    404:404:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):327:327 -> a
-    405:410:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):324:329 -> a
-    com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type) -> b
+    6:6:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):137:137 -> a
+    7:7:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    7:7:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):137 -> a
+    8:8:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):138:138 -> a
+    9:19:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):189:199 -> a
+    20:23:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):197:200 -> a
+    24:24:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:102 -> a
+    24:24:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):201 -> a
+    25:25:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):107:107 -> a
+    25:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):202 -> a
+    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):205:205 -> a
+    27:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):204:204 -> a
+    28:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):203:208 -> a
+    34:34:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):207:207 -> a
+    35:54:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):206:225 -> a
+    55:55:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:102 -> a
+    55:55:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):226 -> a
+    56:58:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):227:229 -> a
+    59:72:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):280:293 -> a
+    73:76:void lambda$toString$0(java.lang.StringBuilder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):315:318 -> a
+    77:78:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):322:323 -> a
+    79:79:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":410,"2":411,"3":412}}
+    410:410:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):323:323 -> a
+    411:411:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):323:323 -> a
+    412:412:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):323:323 -> a
+    403:403:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):324:324 -> a
+    404:409:void lambda$toString$1(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):321:326 -> a
     1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):123:123 -> b
-    2:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):134:135 -> b
-    4:5:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):143:144 -> b
-    6:14:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):154:162 -> b
-    15:18:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):160:163 -> b
-    19:20:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):107:108 -> b
-    19:20:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):164 -> b
-    21:21:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):164:164 -> b
-    22:23:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:103 -> b
-    22:23:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):165 -> b
-    24:27:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):165:168 -> b
-    28:35:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):167:174 -> b
-    36:37:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:103 -> b
-    36:37:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):175 -> b
-    38:41:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):175:178 -> b
-    42:44:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):177:179 -> b
-    45:45:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):263:263 -> b
-    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):149:149 -> d
-    2:5:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):232:235 -> d
-    6:6:com.android.tools.r8.graph.DexField internalGetNextFieldSignature(com.android.tools.r8.graph.DexField):244:244 -> d
-    1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):308:308 -> e
+    2:3:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):146:147 -> b
+    4:12:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):157:165 -> b
+    13:16:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):163:166 -> b
+    17:17:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):107:107 -> b
+    17:17:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):167 -> b
+    18:18:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:102 -> b
+    18:18:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):168 -> b
+    19:22:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):168:171 -> b
+    23:30:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):170:177 -> b
+    31:31:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):102:102 -> b
+    31:31:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):178 -> b
+    32:35:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):178:181 -> b
+    36:38:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):180:182 -> b
+    1:6:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):237:242 -> c
+    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):152:152 -> d
+    2:2:com.android.tools.r8.graph.DexField internalGetNextFieldSignature(com.android.tools.r8.graph.DexField):251:251 -> d
+    3:3:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):305:305 -> d
+    1:1:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):256:256 -> e
+    2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> e
+    2:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):256 -> e
+    3:3:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):256:256 -> e
     1:1:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):113:113 -> f
-    2:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):249:249 -> f
-    3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> f
-    3:3:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):249 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):249:249 -> f
-    5:5:boolean isContextFreeForMethods():303:303 -> f
-    1:1:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):253:253 -> g
-    2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):29:29 -> g
-    2:2:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):253 -> g
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):253:253 -> g
-    boolean isLegitimateToHaveEmptyMappings() -> k
-    1:19:java.lang.String toString():314:332 -> toString
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.graph.d3:
+    2:2:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):260:260 -> f
+    3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):29:29 -> f
+    3:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):260 -> f
+    4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):260:260 -> f
+    1:1:boolean isContextFreeForMethods():300:300 -> g
+    boolean isLegitimateToHaveEmptyMappings() -> m
+    1:19:java.lang.String toString():311:329 -> toString
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.graph.N2:
     java.util.Map classesWithAllocationSiteTracking -> a
     java.util.Set annotationsWithUnknownSubtypeHierarchy -> c
     java.util.Set interfacesWithUnknownSubtypeHierarchy -> d
@@ -34331,8 +33987,7 @@
     1:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):85:92 -> c
     9:9:boolean lambda$removeAllocationsForPrunedItems$7(java.util.Set,com.android.tools.r8.graph.DexProgramClass):259:259 -> c
     1:1:boolean isInterfaceWithUnknownSubtypeHierarchy(com.android.tools.r8.graph.DexProgramClass):119:119 -> d
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.graph.a3:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.graph.c3:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.graph.M2:
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data data -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():286:286 -> <clinit>
@@ -34341,9 +33996,9 @@
     1:1:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType,java.util.List):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":515,"2":516,"3":517}}
     515:515:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType,java.util.List):507:507 -> a
-    516:516:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    516:516:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     516:516:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType,java.util.List):507 -> a
-    517:517:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    517:517:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     517:517:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType,java.util.List):507 -> a
     509:514:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType,java.util.List):508:513 -> a
     518:523:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl build(com.android.tools.r8.graph.DexDefinitionSupplier):307:312 -> a
@@ -34352,93 +34007,91 @@
     531:538:boolean shouldTrackAllocationSitesForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiationReason):325:332 -> a
     531:538:boolean recordDirectAllocationSite(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.AppInfo):355 -> a
     539:548:boolean recordDirectAllocationSite(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.AppInfo):356:365 -> a
-    549:549:boolean recordInstantiatedAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):372:372 -> a
-    550:550:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    550:550:boolean recordInstantiatedAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):373 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    551:553:boolean recordInstantiatedAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):373:375 -> a
-    554:554:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):393:393 -> a
-    555:557:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):412:414 -> a
-    555:557:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):394 -> a
-    558:558:void lambda$repopulateInstantiatedHierarchy$2(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):401:401 -> a
-    559:561:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):412:414 -> a
-    559:561:void lambda$repopulateInstantiatedHierarchy$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):408 -> a
-    562:563:void injectInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):420:421 -> a
-    564:568:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClass):426:430 -> a
-    569:580:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):436:447 -> a
-    581:583:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):412:414 -> a
-    581:583:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):448 -> a
-    584:618:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):461:495 -> a
-    619:619:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1125,"2":1126,"3":1127}}
-    1125:1125:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):495:495 -> a
-    1126:1126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    1126:1126:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):495 -> a
-    1127:1127:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    549:550:boolean recordInstantiatedAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):372:373 -> a
+    551:551:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    551:551:boolean recordInstantiatedAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):373 -> a
+    552:554:boolean recordInstantiatedAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):373:375 -> a
+    555:555:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):393:393 -> a
+    556:558:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):412:414 -> a
+    556:558:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):394 -> a
+    559:559:void lambda$repopulateInstantiatedHierarchy$2(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):401:401 -> a
+    560:562:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):412:414 -> a
+    560:562:void lambda$repopulateInstantiatedHierarchy$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):408 -> a
+    563:564:void injectInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):420:421 -> a
+    565:569:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClass):426:430 -> a
+    570:581:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):436:447 -> a
+    582:584:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):412:414 -> a
+    582:584:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):448 -> a
+    585:619:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):461:495 -> a
+    620:620:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1126,"2":1127,"3":1128}}
+    1126:1126:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):495:495 -> a
+    1127:1127:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     1127:1127:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):495 -> a
-    1115:1124:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):496:505 -> a
-    1128:1128:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):464:464 -> a
-    1129:1129:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1601,"2":1602,"3":1603}}
-    1601:1601:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):464:464 -> a
-    1602:1602:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    1602:1602:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):464 -> a
-    1603:1603:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    1128:1128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    1128:1128:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):495 -> a
+    1116:1125:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):496:505 -> a
+    1129:1129:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):464:464 -> a
+    1130:1130:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1602,"2":1603,"3":1604}}
+    1602:1602:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):464:464 -> a
+    1603:1603:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     1603:1603:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):464 -> a
-    1594:1600:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):465:471 -> a
-    1604:1604:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):475:475 -> a
-    1605:1605:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2098,"2":2099,"3":2100}}
-    2098:2098:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):475:475 -> a
-    2099:2099:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    2099:2099:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):475 -> a
-    2100:2100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    1604:1604:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    1604:1604:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):464 -> a
+    1595:1601:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):465:471 -> a
+    1605:1605:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):475:475 -> a
+    1606:1606:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2099,"2":2100,"3":2101}}
+    2099:2099:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):475:475 -> a
+    2100:2100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     2100:2100:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):475 -> a
-    2081:2093:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):476:488 -> a
-    2094:2096:java.util.Set com.android.tools.r8.utils.LensUtils.rewrittenWithRenamedSignature(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):19:21 -> a
-    2094:2096:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):490 -> a
-    2097:2097:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):489:489 -> a
-    2101:2103:void lambda$validate$10(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):522:524 -> a
-    2104:2109:void lambda$validate$12(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,java.util.List):534:539 -> a
-    2110:2110:void lambda$validate$12(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,java.util.List):538:538 -> a
-    2111:2113:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):547:549 -> a
-    2114:2114:boolean isImmediateSuperType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):570:570 -> a
-    2114:2114:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):549 -> a
-    2115:2115:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):549:549 -> a
-    2116:2117:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):557:558 -> a
-    2118:2119:boolean typeIsInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):565:566 -> a
-    2118:2119:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558 -> a
-    2120:2120:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558:558 -> a
-    2121:2121:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2680,"2":2681,"3":2682,"4":2683,"5":2684}}
-    2680:2680:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558:558 -> a
+    2101:2101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    2101:2101:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):475 -> a
+    2082:2094:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):476:488 -> a
+    2095:2097:java.util.Set com.android.tools.r8.utils.LensUtils.rewrittenWithRenamedSignature(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):19:21 -> a
+    2095:2097:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):490 -> a
+    2098:2098:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):489:489 -> a
+    2102:2104:void lambda$validate$10(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):522:524 -> a
+    2105:2110:void lambda$validate$12(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,java.util.List):534:539 -> a
+    2111:2111:void lambda$validate$12(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,java.util.List):538:538 -> a
+    2112:2114:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):547:549 -> a
+    2115:2115:boolean isImmediateSuperType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):570:570 -> a
+    2115:2115:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):549 -> a
+    2116:2116:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):549:549 -> a
+    2117:2118:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):557:558 -> a
+    2119:2120:boolean typeIsInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):565:566 -> a
+    2119:2120:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558 -> a
+    2121:2121:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558:558 -> a
+    2122:2122:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2681,"2":2682,"3":2683,"4":2684,"5":2685}}
     2681:2681:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558:558 -> a
     2682:2682:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558:558 -> a
     2683:2683:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558:558 -> a
     2684:2684:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558:558 -> a
-    2679:2679:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558:558 -> a
-    1:1:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):382:382 -> b
-    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> b
-    2:2:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):383 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:5:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):383:385 -> b
-    6:6:java.util.List lambda$recordInstantiatedLambdaInterface$1(com.android.tools.r8.graph.DexType):393:393 -> b
-    7:17:void repopulateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier):398:408 -> b
-    18:18:void lambda$repopulateInstantiatedHierarchy$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):403:403 -> b
+    2685:2685:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558:558 -> a
+    2680:2680:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):558:558 -> a
+    1:2:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):382:383 -> b
+    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> b
+    3:3:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):383 -> b
+    4:6:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):383:385 -> b
+    7:7:java.util.List lambda$recordInstantiatedLambdaInterface$1(com.android.tools.r8.graph.DexType):393:393 -> b
+    8:18:void repopulateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier):398:408 -> b
+    19:19:void lambda$repopulateInstantiatedHierarchy$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):403:403 -> b
     1:1:void lambda$repopulateInstantiatedHierarchy$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):405:405 -> c
     2:27:boolean validate(com.android.tools.r8.graph.DexDefinitionSupplier):520:545 -> c
     1:3:void lambda$validate$11(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):528:530 -> d
     1:1:java.util.Set lambda$recordDirectAllocationSite$0(com.android.tools.r8.graph.DexProgramClass):359:359 -> e
     1:1:java.util.Set lambda$rewrittenWithLens$7(com.android.tools.r8.graph.DexProgramClass):488:488 -> f
     1:3:void markNoLongerInstantiated(com.android.tools.r8.graph.DexProgramClass):452:454 -> g
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.graph.b3:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.graph.L2:
     com.android.tools.r8.shaking.GraphReporter reporter -> b
     boolean trackAllocationSites -> a
     1:1:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1):288:288 -> <init>
     2:4:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter):293:295 -> <init>
     1:1:boolean access$300(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):288:288 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):288:288 -> b
-com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.IK:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.EJ:
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils lensCodeRewriter -> e
     boolean $assertionsDisabled -> p
     com.android.tools.r8.graph.AppView appView -> b
@@ -34514,40 +34167,30 @@
     1:1:java.util.Collection getStrings():306:306 -> m
     1:1:java.util.Collection getTypes():294:294 -> n
     1:1:boolean hasJumboStrings():318:318 -> o
-com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.GK:
+com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.CJ:
     com.android.tools.r8.graph.ObjectToOffsetMapping val$mapping -> e
     1:1:void <init>(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction,java.util.function.ToIntFunction,com.android.tools.r8.graph.ObjectToOffsetMapping):121:121 -> <init>
     1:1:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):125:125 -> a
     2:4:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):130:130 -> a
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.HK:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.DJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap depthOfClasses -> b
     com.android.tools.r8.graph.AppInfo appInfo -> a
     1:1:void <init>(com.android.tools.r8.graph.AppInfo):214:214 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppInfo):212:216 -> <init>
     1:12:int getDepth(com.android.tools.r8.graph.DexProgramClass):220:231 -> a
-    13:13:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
+    13:13:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
     13:13:int getDepth(com.android.tools.r8.graph.DexProgramClass):231 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    14:14:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    14:14:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     14:14:int getDepth(com.android.tools.r8.graph.DexProgramClass):231 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    15:15:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    15:15:int getDepth(com.android.tools.r8.graph.DexProgramClass):231 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:20:int getDepth(com.android.tools.r8.graph.DexProgramClass):233:237 -> a
+    15:19:int getDepth(com.android.tools.r8.graph.DexProgramClass):233:237 -> a
+    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
+    20:20:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    20:20:int getDepth(com.android.tools.r8.graph.DexProgramClass):237 -> a
     21:21:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     21:21:int getDepth(com.android.tools.r8.graph.DexProgramClass):237 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    22:22:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
-    22:22:int getDepth(com.android.tools.r8.graph.DexProgramClass):237 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    23:23:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    23:23:int getDepth(com.android.tools.r8.graph.DexProgramClass):237 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:27:int getDepth(com.android.tools.r8.graph.DexProgramClass):238:241 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.RK:
+    22:25:int getDepth(com.android.tools.r8.graph.DexProgramClass):238:241 -> a
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.NJ:
     com.android.tools.r8.graph.DexProto[] protos -> c
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
     boolean $assertionsDisabled -> i
@@ -34587,7 +34230,7 @@
     1:2:void initializeProtos(int):28:29 -> l
     1:2:void initializeStrings(int):43:44 -> m
     1:2:void initializeTypes(int):38:39 -> n
-com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.e3:
+com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.O2:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexAnnotationSet[] values -> b
@@ -34605,25 +34248,18 @@
     8:8:com.android.tools.r8.graph.ParameterAnnotationsList empty():55:55 -> a
     8:8:com.android.tools.r8.graph.ParameterAnnotationsList create(com.android.tools.r8.graph.DexAnnotationSet[],int):78 -> a
     9:10:boolean isAllEmpty(com.android.tools.r8.graph.DexAnnotationSet[]):83:84 -> a
-    11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):123:123 -> a
-    12:12:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> a
-    12:12:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):124 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
-    13:13:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
-    13:13:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):124 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    14:15:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):131:132 -> a
-    16:18:void forEachAnnotation(java.util.function.Consumer):141:143 -> a
-    19:20:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):226:227 -> a
-    21:21:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.keepIf(java.util.function.Predicate):200:200 -> a
-    21:21:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):227 -> a
-    22:28:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):228:234 -> a
-    29:29:com.android.tools.r8.graph.ParameterAnnotationsList empty():55:55 -> a
-    29:29:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):242 -> a
-    30:30:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):244:244 -> a
-    31:38:com.android.tools.r8.graph.ParameterAnnotationsList rewrite(java.util.function.Function):248:255 -> a
-    39:39:com.android.tools.r8.graph.DexAnnotationSet lambda$rewrite$2(java.util.function.Function,com.android.tools.r8.graph.DexAnnotationSet):253:253 -> a
+    11:12:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):123:124 -> a
+    13:14:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):131:132 -> a
+    15:17:void forEachAnnotation(java.util.function.Consumer):141:143 -> a
+    18:19:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):226:227 -> a
+    20:20:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.keepIf(java.util.function.Predicate):200:200 -> a
+    20:20:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):227 -> a
+    21:27:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):228:234 -> a
+    28:28:com.android.tools.r8.graph.ParameterAnnotationsList empty():55:55 -> a
+    28:28:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):242 -> a
+    29:29:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):244:244 -> a
+    30:37:com.android.tools.r8.graph.ParameterAnnotationsList rewrite(java.util.function.Function):248:255 -> a
+    38:38:com.android.tools.r8.graph.DexAnnotationSet lambda$rewrite$2(java.util.function.Function,com.android.tools.r8.graph.DexAnnotationSet):253:253 -> a
     1:1:int lambda$specify$1(com.android.tools.r8.graph.ParameterAnnotationsList):51:51 -> b
     1:3:boolean equals(java.lang.Object):115:117 -> equals
     1:1:int countNonMissing():161:161 -> g0
@@ -34636,9 +34272,9 @@
     1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):193:205 -> k
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():98:98 -> n
     1:1:int size():153:153 -> size
-com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.kM:
+com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.gL:
     boolean isPinned(com.android.tools.r8.graph.DexDefinition) -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.uN:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.lM:
     com.android.tools.r8.graph.DexApplication application -> a
     java.util.Set visited -> b
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):32:32 -> <init>
@@ -34655,7 +34291,7 @@
     27:28:void accept(com.android.tools.r8.graph.DexClass):61:62 -> a
     29:30:void run(com.android.tools.r8.graph.DexProgramClass[]):66:67 -> a
     void visit(com.android.tools.r8.graph.DexClass) -> b
-com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.wN:
+com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.nM:
     1:1:void clearAllAnnotations():37:37 -> G
     com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext) -> a
     1:1:void rewriteAllAnnotations(java.util.function.BiFunction):42:42 -> a
@@ -34667,15 +34303,15 @@
     1:1:com.android.tools.r8.graph.DexClassAndField asField():11:11 -> d
     com.android.tools.r8.graph.ProgramDefinition asProgramDefinition() -> f
     boolean isProgramDefinition() -> g
-com.android.tools.r8.graph.ProgramDerivedContext -> com.android.tools.r8.internal.xN:
+com.android.tools.r8.graph.ProgramDerivedContext -> com.android.tools.r8.internal.oM:
     1:1:boolean isProgramContext():12:12 -> I
-com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.yN:
+com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.pM:
     com.android.tools.r8.graph.DexWritableCode code -> a
     com.android.tools.r8.graph.ProgramMethod method -> b
     1:3:void <init>(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.graph.ProgramMethod):12:14 -> <init>
     1:1:com.android.tools.r8.graph.DexWritableCode getCode():18:18 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod getMethod():22:22 -> b
-com.android.tools.r8.graph.ProgramField -> com.android.tools.r8.graph.f3:
+com.android.tools.r8.graph.ProgramField -> com.android.tools.r8.graph.P2:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):14:14 -> <init>
@@ -34690,12 +34326,12 @@
     com.android.tools.r8.graph.ProgramField asField() -> d
     com.android.tools.r8.graph.ProgramMember asProgramMember() -> o
     1:1:com.android.tools.r8.graph.DexClass getHolder():10:10 -> r
-com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.BN:
+com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.sM:
     1:1:void clearGenericSignature():27:27 -> A
     com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo() -> Q
     com.android.tools.r8.graph.DexProgramClass getHolder() -> a
     com.android.tools.r8.graph.DexEncodedMember getDefinition() -> h
-com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.g3:
+com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.Q2:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):25:25 -> <init>
@@ -34724,37 +34360,29 @@
     7:7:void com.android.tools.r8.graph.MethodAccessFlags.promoteToAbstract():191 -> c
     7:7:boolean convertToAbstractMethodIfPossible(com.android.tools.r8.graph.AppView):95 -> c
     8:10:boolean convertToAbstractMethodIfPossible(com.android.tools.r8.graph.AppView):96:98 -> c
-    11:32:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForAbstractMethod(com.android.tools.r8.graph.ProgramMethod):131:152 -> c
-    11:32:boolean convertToAbstractMethodIfPossible(com.android.tools.r8.graph.AppView):98 -> c
+    11:31:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForAbstractMethod(com.android.tools.r8.graph.ProgramMethod):127:147 -> c
+    11:31:boolean convertToAbstractMethodIfPossible(com.android.tools.r8.graph.AppView):98 -> c
     1:2:void convertToAbstractOrThrowNullMethod(com.android.tools.r8.graph.AppView):83:84 -> d
-    1:1:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):104:104 -> e
-    2:2:void com.android.tools.r8.graph.MethodAccessFlags.demoteFromAbstract():187:187 -> e
-    2:2:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):105 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:5:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):106:108 -> e
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):136:136 -> e
-    6:6:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):108 -> e
-    7:7:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):109:109 -> e
-    8:8:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):157:157 -> e
-    8:8:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):109 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:30:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForAbstractMethod(com.android.tools.r8.graph.ProgramMethod):131:152 -> e
-    9:30:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):157 -> e
-    9:30:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):109 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    31:33:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):158:160 -> e
-    31:33:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):109 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:36:java.util.BitSet com.android.tools.r8.utils.BitSetUtils.createFilled(boolean,int):12:14 -> e
-    34:36:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):160 -> e
-    34:36:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):109 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    37:40:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):159:162 -> e
-    37:40:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):109 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:2:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):104:105 -> e
+    3:3:void com.android.tools.r8.graph.MethodAccessFlags.demoteFromAbstract():187:187 -> e
+    3:3:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):105 -> e
+    4:6:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):106:108 -> e
+    7:7:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):136:136 -> e
+    7:7:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):108 -> e
+    8:8:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):109:109 -> e
+    9:29:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForAbstractMethod(com.android.tools.r8.graph.ProgramMethod):127:147 -> e
+    9:29:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):152 -> e
+    9:29:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):109 -> e
+    30:32:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):153:155 -> e
+    30:32:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):109 -> e
+    33:35:java.util.BitSet com.android.tools.r8.utils.BitSetUtils.createFilled(boolean,int):12:14 -> e
+    33:35:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):155 -> e
+    33:35:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):109 -> e
+    36:36:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):154:154 -> e
+    36:36:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):109 -> e
     com.android.tools.r8.graph.ProgramMember asProgramMember() -> o
     1:1:com.android.tools.r8.graph.DexClass getHolder():21:21 -> r
-com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.HN:
+com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.yM:
     java.util.Set classes -> c
     java.lang.String packageDescriptor -> b
     boolean $assertionsDisabled -> d
@@ -34762,10 +34390,10 @@
     1:3:void <init>(java.lang.String,java.util.function.Supplier):25:27 -> <init>
     1:2:boolean add(com.android.tools.r8.graph.DexProgramClass):31:32 -> a
     3:3:void forEachField(java.util.function.Consumer):60:60 -> a
-    4:4:java.util.Set classesInPackage():68:68 -> a
+    4:4:void lambda$forEachField$0(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):60:60 -> a
     5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
     5:5:void lambda$forEachField$0(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):60 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    6:6:java.util.Set classesInPackage():68:68 -> a
     1:1:boolean contains(com.android.tools.r8.graph.DexProgramClass):36:36 -> b
     2:2:java.lang.String getPackageDescriptor():48:48 -> b
     3:3:void forEachMethod(java.util.function.Consumer):64:64 -> b
@@ -34780,11 +34408,11 @@
     2:2:java.lang.String com.android.tools.r8.graph.ProgramPackage.getPackageName():52:52 -> toString
     2:2:java.lang.String toString():78 -> toString
     3:3:java.lang.String toString():78:78 -> toString
-com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.IN:
+com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.zM:
     java.util.Map packages -> b
     1:2:void <init>(java.util.Map):15:16 -> <init>
     1:1:java.util.Iterator iterator():49:49 -> iterator
-com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.lQ:
+com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.WO:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -34811,8 +34439,7 @@
     1:1:boolean hasRemovedMethods():95:95 -> k
     1:4:boolean isEmpty():48:51 -> l
     1:1:com.android.tools.r8.graph.PrunedItems$Builder toBuilder():40:40 -> m
-com.android.tools.r8.graph.PrunedItems$1 -> com.android.tools.r8.internal.jQ:
-com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.kQ:
+com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.VO:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -34832,260 +34459,275 @@
     9:9:com.android.tools.r8.graph.PrunedItems build():180:180 -> a
     1:1:com.android.tools.r8.graph.PrunedItems$Builder setRemovedClasses(java.util.Set):170:170 -> b
     1:1:com.android.tools.r8.graph.PrunedItems$Builder setRemovedMethods(java.util.Set):175:175 -> c
-com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.n3:
+com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.W2:
     java.util.List extraParameters -> a
     com.android.tools.r8.graph.RewrittenPrototypeDescription NONE -> d
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection argumentInfoCollection -> b
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenReturnInfo -> c
-    1:619:void <clinit>():40:658 -> <clinit>
-    1:4:void <init>():664:667 -> <init>
-    5:10:void <init>(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):673:678 -> <init>
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):685:685 -> a
-    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription none():696:696 -> a
-    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):686 -> a
-    3:3:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):687:687 -> a
-    4:14:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):709:719 -> a
-    15:15:java.util.List getExtraParameters():744:744 -> a
-    15:15:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):720 -> a
-    16:16:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):720:720 -> a
-    17:17:java.util.List getExtraParameters():744:744 -> a
-    17:17:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):721 -> a
-    18:21:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):721:724 -> a
-    22:22:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo getRewrittenReturnInfo():770:770 -> a
-    22:22:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):725 -> a
-    23:23:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):725:725 -> a
-    24:24:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):237:237 -> a
-    24:24:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):725 -> a
-    25:25:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo getRewrittenReturnInfo():770:770 -> a
-    25:25:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):726 -> a
-    26:27:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getArgumentInfoCollection():756:756 -> a
-    26:27:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):728 -> a
-    28:29:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):728:729 -> a
-    30:30:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getArgumentInfoCollection():756:756 -> a
-    30:30:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):701 -> a
-    31:31:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):701:701 -> a
-    32:32:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getArgumentInfoCollection():756:756 -> a
-    33:37:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):788:792 -> a
-    38:38:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    38:38:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):792 -> a
-    39:39:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):793:793 -> a
-    40:43:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):798:801 -> a
-    44:52:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):806:814 -> a
-    44:52:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):801 -> a
-    53:53:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):802:802 -> a
-    54:54:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
-    54:54:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):802 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    55:61:com.android.tools.r8.graph.RewrittenPrototypeDescription rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):819:825 -> a
-    62:65:com.android.tools.r8.graph.RewrittenPrototypeDescription withRewrittenReturnInfo(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):833:836 -> a
-    66:73:com.android.tools.r8.graph.RewrittenPrototypeDescription withExtraParameters(java.util.List):848:855 -> a
-    1:1:java.util.List getExtraParameters():744:744 -> b
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo getRewrittenReturnInfo():770:770 -> c
-    1:1:boolean hasBeenChangedToReturnVoid():752:752 -> d
-    1:1:boolean hasExtraParameters():740:740 -> e
-    1:7:boolean equals(java.lang.Object):861:867 -> equals
-    1:1:boolean hasRewrittenReturnInfo():760:760 -> f
-    1:3:boolean isEmpty():734:736 -> g
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription none():696:696 -> h
-    1:1:int hashCode():872:872 -> hashCode
-    1:1:int numberOfExtraParameters():748:748 -> i
-    1:1:boolean requiresRewritingAtCallSite():764:764 -> j
-    2:2:int numberOfExtraParameters():748:748 -> j
-    2:2:boolean requiresRewritingAtCallSite():765 -> j
-    3:4:boolean requiresRewritingAtCallSite():765:766 -> j
-com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.graph.h3:
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.graph.j3:
+    1:590:void <clinit>():41:630 -> <clinit>
+    1:4:void <init>():636:639 -> <init>
+    5:10:void <init>(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):645:650 -> <init>
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):657:657 -> a
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription none():668:668 -> a
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):658 -> a
+    3:3:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):659:659 -> a
+    4:14:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):681:691 -> a
+    15:15:java.util.List getExtraParameters():716:716 -> a
+    15:15:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):692 -> a
+    16:16:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):692:692 -> a
+    17:17:java.util.List getExtraParameters():716:716 -> a
+    17:17:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):693 -> a
+    18:21:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):693:696 -> a
+    22:22:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo getRewrittenReturnInfo():742:742 -> a
+    22:22:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):697 -> a
+    23:23:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):697:697 -> a
+    24:24:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):251:251 -> a
+    24:24:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):697 -> a
+    25:25:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo getRewrittenReturnInfo():742:742 -> a
+    25:25:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):698 -> a
+    26:27:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getArgumentInfoCollection():728:728 -> a
+    26:27:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):700 -> a
+    28:29:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):700:701 -> a
+    30:30:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getArgumentInfoCollection():728:728 -> a
+    30:30:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    31:31:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):673:673 -> a
+    32:32:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getArgumentInfoCollection():728:728 -> a
+    33:36:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):759:762 -> a
+    37:37:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    37:37:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):762 -> a
+    38:38:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):763:763 -> a
+    39:43:boolean verifyConstantReturnAccessibleInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):769:773 -> a
+    44:45:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):778:779 -> a
+    46:50:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):786:790 -> a
+    46:50:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):781 -> a
+    51:58:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):796:803 -> a
+    51:58:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):791 -> a
+    51:58:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):781 -> a
+    59:60:int com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):466:467 -> a
+    59:60:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):803 -> a
+    59:60:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):791 -> a
+    59:60:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):781 -> a
+    61:63:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):803:805 -> a
+    61:63:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):791 -> a
+    61:63:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):781 -> a
+    64:64:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():204:204 -> a
+    64:64:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):805 -> a
+    64:64:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):791 -> a
+    64:64:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):781 -> a
+    65:67:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):807:809 -> a
+    65:67:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):791 -> a
+    65:67:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):781 -> a
+    68:68:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isNone():0:0 -> a
+    68:68:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):809 -> a
+    68:68:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):791 -> a
+    68:68:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):781 -> a
+    69:69:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):810:810 -> a
+    69:69:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):791 -> a
+    69:69:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):781 -> a
+    70:70:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
+    70:70:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):811 -> a
+    70:70:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):791 -> a
+    70:70:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):781 -> a
+    71:77:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):812:818 -> a
+    71:77:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):791 -> a
+    71:77:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):781 -> a
+    78:78:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):792:792 -> a
+    78:78:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):781 -> a
+    79:79:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):782:782 -> a
+    80:80:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
+    80:80:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):782 -> a
+    81:89:com.android.tools.r8.graph.RewrittenPrototypeDescription rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):825:833 -> a
+    90:93:com.android.tools.r8.graph.RewrittenPrototypeDescription withRewrittenReturnInfo(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):841:844 -> a
+    94:101:com.android.tools.r8.graph.RewrittenPrototypeDescription withExtraParameters(java.util.List):860:867 -> a
+    1:1:java.util.List getExtraParameters():716:716 -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo getRewrittenReturnInfo():742:742 -> c
+    1:1:boolean hasBeenChangedToReturnVoid():724:724 -> d
+    1:1:boolean hasExtraParameters():712:712 -> e
+    1:7:boolean equals(java.lang.Object):873:879 -> equals
+    1:1:boolean hasRewrittenReturnInfo():732:732 -> f
+    1:3:boolean isEmpty():706:708 -> g
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription none():668:668 -> h
+    1:1:int hashCode():884:884 -> hashCode
+    1:1:int numberOfExtraParameters():720:720 -> i
+    1:1:boolean requiresRewritingAtCallSite():736:736 -> j
+    2:2:int numberOfExtraParameters():720:720 -> j
+    2:2:boolean requiresRewritingAtCallSite():737 -> j
+    3:4:boolean requiresRewritingAtCallSite():737:738 -> j
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.graph.S2:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo NO_INFO -> a
-    1:3:void <clinit>():42:44 -> <clinit>
-    1:1:void <init>():42:42 -> <init>
+    1:3:void <clinit>():43:45 -> <clinit>
+    1:1:void <init>():43:43 -> <init>
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo asRemovedArgumentInfo() -> a
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo) -> a
-    com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
+    com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo asRewrittenTypeInfo() -> b
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo$1 -> com.android.tools.r8.graph.i3:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo$1 -> com.android.tools.r8.graph.R2:
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:1:void <init>():45:45 -> <init>
-    com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):49:49 -> a
-    1:1:int hashCode():66:66 -> hashCode
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.graph.k3:
+    1:1:void <clinit>():46:46 -> <clinit>
+    1:1:void <init>():46:46 -> <init>
+    com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):50:50 -> a
+    1:1:int hashCode():72:72 -> hashCode
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.graph.T2:
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection EMPTY -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap argumentInfos -> a
-    1:3:void <clinit>():373:375 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.RewrittenPrototypeDescription$1):373:373 -> <init>
-    2:3:void <init>():380:381 -> <init>
-    4:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):384:387 -> <init>
-    1:1:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():204:204 -> a
-    1:1:void lambda$createParameterAnnotationsRemover$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):630 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:void lambda$createParameterAnnotationsRemover$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):631:631 -> a
-    3:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection access$100():373:373 -> a
-    4:5:void forEach(com.android.tools.r8.utils.IntObjConsumer):395:396 -> a
-    6:6:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo getArgumentInfo(int):464:464 -> a
-    7:22:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):473:488 -> a
-    23:36:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):573:586 -> a
-    37:39:int peekNextOrMax(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator):608:610 -> a
-    37:39:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):587 -> a
-    40:41:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):589:590 -> a
-    42:44:int peekNextOrMax(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator):608:610 -> a
-    42:44:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):591 -> a
-    45:45:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):592:592 -> a
-    46:46:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
-    46:46:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):592 -> a
-    47:48:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):598:599 -> a
-    49:56:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):73:80 -> a
-    49:56:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):598 -> a
-    57:60:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):600:603 -> a
-    61:66:boolean com.android.tools.r8.com.google.common.collect.Ordering.isOrdered(java.lang.Iterable):876:881 -> a
-    61:66:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):603 -> a
-    67:68:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):603:604 -> a
-    69:76:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):628:635 -> a
-    77:77:boolean lambda$createParameterAnnotationsRemover$0(int,int):632:632 -> a
-    78:78:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
-    78:78:boolean lambda$createParameterAnnotationsRemover$0(int,int):632 -> a
-    79:79:boolean lambda$getNewArgumentIndex$2(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):653:653 -> a
-    1:1:java.util.Iterator iterator():432:432 -> b
-    1:1:int getNewArgumentIndex(int):640 -> b
-    2:9:int getNewArgumentIndex(int):641:648 -> b
+    1:3:void <clinit>():384:386 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.RewrittenPrototypeDescription$1):384:384 -> <init>
+    2:3:void <init>():391:392 -> <init>
+    4:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):395:398 -> <init>
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection access$100():384:384 -> a
+    2:3:void forEach(com.android.tools.r8.utils.IntObjConsumer):406:407 -> a
+    4:4:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo getArgumentInfo(int):475:475 -> a
+    5:21:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):484:500 -> a
+    22:35:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):545:558 -> a
+    36:38:int peekNextOrMax(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator):580:582 -> a
+    36:38:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):559 -> a
+    39:40:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):561:562 -> a
+    41:43:int peekNextOrMax(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator):580:582 -> a
+    41:43:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):563 -> a
+    44:44:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):564:564 -> a
+    45:45:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
+    45:45:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):564 -> a
+    46:47:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):570:571 -> a
+    48:55:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):79:86 -> a
+    48:55:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):570 -> a
+    56:59:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):572:575 -> a
+    60:65:boolean com.android.tools.r8.com.google.common.collect.Ordering.isOrdered(java.lang.Iterable):876:881 -> a
+    60:65:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):575 -> a
+    66:67:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):575:576 -> a
+    68:75:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):600:607 -> a
+    76:76:void lambda$createParameterAnnotationsRemover$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):602:602 -> a
+    77:77:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():204:204 -> a
+    77:77:void lambda$createParameterAnnotationsRemover$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):602 -> a
+    78:78:void lambda$createParameterAnnotationsRemover$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):603:603 -> a
+    79:79:boolean lambda$createParameterAnnotationsRemover$0(int,int):604:604 -> a
+    80:80:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
+    80:80:boolean lambda$createParameterAnnotationsRemover$0(int,int):604 -> a
+    81:81:boolean lambda$getNewArgumentIndex$2(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):625:625 -> a
+    1:1:java.util.Iterator iterator():443:443 -> b
+    1:1:int getNewArgumentIndex(int):612 -> b
+    2:9:int getNewArgumentIndex(int):613:620 -> b
     10:10:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> b
-    10:10:int getNewArgumentIndex(int):648 -> b
-    11:11:int getNewArgumentIndex(int):652:652 -> b
-    12:12:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder builder():508:508 -> b
-    13:17:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.DexEncodedMethod):551:555 -> b
-    18:19:int numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.DexEncodedMethod):455:456 -> b
-    18:19:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.DexEncodedMethod):556 -> b
-    20:20:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.DexEncodedMethod):556:556 -> b
-    21:21:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():204:204 -> b
-    21:21:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.DexEncodedMethod):557 -> b
-    22:25:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.DexEncodedMethod):559:562 -> b
-    26:26:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> b
-    26:26:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.DexEncodedMethod):563 -> b
-    27:29:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.DexEncodedMethod):564:566 -> b
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection empty():391:391 -> c
-    2:2:boolean hasArgumentInfo(int):460:460 -> c
-    1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():405:409 -> d
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet getKeys():401:401 -> d
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():410 -> d
-    7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():412:412 -> d
-    8:8:java.util.Iterator iterator():432:432 -> d
-    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():413 -> d
-    9:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():414:416 -> d
+    10:10:int getNewArgumentIndex(int):620 -> b
+    11:11:int getNewArgumentIndex(int):624:624 -> b
+    12:12:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder builder():520:520 -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection empty():402:402 -> c
+    2:2:boolean hasArgumentInfo(int):471:471 -> c
+    1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():416:420 -> d
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet getKeys():412:412 -> d
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():421 -> d
+    7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():423:423 -> d
+    8:8:java.util.Iterator iterator():443:443 -> d
+    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():424 -> d
+    9:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():425:427 -> d
     12:12:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> d
-    12:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():416 -> d
-    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():417:417 -> d
-    14:14:boolean isArgumentRemoved(int):424:424 -> d
+    12:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():427 -> d
+    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():428:428 -> d
+    14:14:boolean isArgumentRemoved(int):435:435 -> d
     15:15:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> d
-    15:15:boolean isArgumentRemoved(int):424 -> d
-    1:2:boolean hasRemovedArguments():436:437 -> e
+    15:15:boolean isArgumentRemoved(int):435 -> d
+    1:2:boolean hasRemovedArguments():447:448 -> e
     3:3:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> e
-    3:3:boolean hasRemovedArguments():437 -> e
-    1:5:boolean equals(java.lang.Object):495:499 -> equals
-    1:1:boolean isEmpty():428:428 -> f
-    1:2:int numberOfRemovedArguments():446:447 -> g
+    3:3:boolean hasRemovedArguments():448 -> e
+    1:5:boolean equals(java.lang.Object):507:511 -> equals
+    1:1:boolean isEmpty():439:439 -> f
+    1:2:int numberOfRemovedArguments():457:458 -> g
     3:3:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> g
-    3:3:int numberOfRemovedArguments():447 -> g
-    1:1:int hashCode():504:504 -> hashCode
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.k3$a:
+    3:3:int numberOfRemovedArguments():458 -> g
+    1:1:int hashCode():516:516 -> hashCode
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.T2$a:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap argumentInfos -> a
-    1:1:void <clinit>():511:511 -> <clinit>
-    1:1:void <init>():511:511 -> <init>
-    1:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder addArgumentInfo(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):516:520 -> a
-    6:9:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():525:528 -> a
-    10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():526:526 -> a
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.l3:
-    com.android.tools.r8.graph.DexType type -> d
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> c
-    1:1:void <clinit>():112:112 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.RewrittenPrototypeDescription$1):112:112 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.graph.DexType):138:140 -> <init>
+    1:1:void <clinit>():523:523 -> <clinit>
+    1:1:void <init>():523:523 -> <init>
+    1:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder addArgumentInfo(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):528:532 -> a
+    6:9:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():537:540 -> a
+    10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():538:538 -> a
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.U2:
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> d
+    boolean checkNullOrZero -> c
+    com.android.tools.r8.graph.DexType type -> e
+    1:1:void <clinit>():122:122 -> <clinit>
+    1:1:void <init>(boolean,com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.RewrittenPrototypeDescription$1):122:122 -> <init>
+    2:5:void <init>(boolean,com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.graph.DexType):155:158 -> <init>
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo asRemovedArgumentInfo() -> a
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):175:175 -> a
-    2:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):183:184 -> a
-    2:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):112 -> a
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    4:4:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):184 -> a
-    4:4:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):112 -> a
-    5:6:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):185:186 -> a
-    5:6:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):112 -> a
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder builder():144:144 -> c
-    1:1:com.android.tools.r8.ir.analysis.value.SingleValue getSingleValue():152:152 -> d
-    1:1:com.android.tools.r8.graph.DexType getType():156:156 -> e
-    1:5:boolean equals(java.lang.Object):193:197 -> equals
-    1:1:boolean hasSingleValue():148:148 -> f
-    1:1:int hashCode():202:202 -> hashCode
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.l3$a:
-    com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> a
-    com.android.tools.r8.graph.DexType type -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():114:114 -> <clinit>
-    1:1:void <init>():114:114 -> <init>
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):120:120 -> a
-    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):125:125 -> a
-    3:4:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo build():130:131 -> a
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.graph.m3:
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):193:193 -> a
+    2:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):201:204 -> a
+    2:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):122 -> a
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder builder():162:162 -> c
+    1:1:com.android.tools.r8.ir.analysis.value.SingleValue getSingleValue():170:170 -> d
+    1:1:com.android.tools.r8.graph.DexType getType():174:174 -> e
+    1:7:boolean equals(java.lang.Object):211:217 -> equals
+    1:1:boolean hasSingleValue():166:166 -> f
+    1:1:boolean isCheckNullOrZeroSet():178:178 -> g
+    1:1:int hashCode():222:222 -> hashCode
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.U2$a:
+    com.android.tools.r8.graph.DexType type -> c
+    com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> b
+    boolean checkNullOrZero -> a
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():124:124 -> <clinit>
+    1:1:void <init>():124:124 -> <init>
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):136:136 -> a
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):141:141 -> a
+    3:4:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo build():146:147 -> a
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setCheckNullOrZero(boolean):131:131 -> b
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.graph.V2:
     com.android.tools.r8.graph.DexType oldType -> d
     com.android.tools.r8.graph.DexType castType -> c
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexType newType -> e
     com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> f
-    1:1:void <clinit>():206:206 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):224:224 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.value.SingleValue):228:233 -> <init>
+    1:1:void <clinit>():226:226 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):238:238 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.value.SingleValue):242:247 -> <init>
     1:1:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):280 -> a
-    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):283:283 -> a
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):294 -> a
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):297:297 -> a
     3:3:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
-    3:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):283 -> a
-    4:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):283:284 -> a
-    6:6:com.android.tools.r8.graph.DexType access$300(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):206:206 -> a
-    7:7:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):206:206 -> a
-    8:8:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):297:297 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    9:9:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):297 -> a
-    10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):298:298 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    11:11:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):298 -> a
-    12:12:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):300:300 -> a
-    13:13:com.android.tools.r8.ir.analysis.value.SingleValue getSingleValue():253:253 -> a
-    13:13:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):300 -> a
-    14:19:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):300:305 -> a
+    3:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):297 -> a
+    4:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):297:298 -> a
+    6:6:com.android.tools.r8.graph.DexType access$300(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):226:226 -> a
+    7:7:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):226:226 -> a
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo asRewrittenTypeInfo() -> b
-    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):206:206 -> b
-    1:1:com.android.tools.r8.graph.DexType getCastType():241:241 -> c
-    2:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):288:291 -> c
-    6:6:com.android.tools.r8.graph.DexType getCastType():241:241 -> c
-    6:6:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):291 -> c
-    7:7:com.android.tools.r8.ir.analysis.value.SingleValue getSingleValue():253:253 -> c
-    7:7:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):291 -> c
-    8:8:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):291:291 -> c
-    1:1:com.android.tools.r8.graph.DexType getNewType():245:245 -> d
-    1:1:com.android.tools.r8.graph.DexType getOldType():249:249 -> e
-    1:7:boolean equals(java.lang.Object):313:319 -> equals
-    1:1:com.android.tools.r8.ir.analysis.value.SingleValue getSingleValue():253:253 -> f
-    1:1:boolean hasBeenChangedToReturnVoid():257:257 -> g
-    1:1:boolean hasCastType():261:261 -> h
-    1:1:int hashCode():324:324 -> hashCode
-    1:1:boolean hasSingleValue():265:265 -> i
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder -> com.android.tools.r8.internal.HU:
+    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):226:226 -> b
+    2:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):312:315 -> b
+    6:6:com.android.tools.r8.ir.analysis.value.SingleValue getSingleValue():267:267 -> b
+    6:6:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):316 -> b
+    7:13:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):316:322 -> b
+    1:1:com.android.tools.r8.graph.DexType getCastType():255:255 -> c
+    2:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):302:305 -> c
+    6:6:com.android.tools.r8.graph.DexType getCastType():255:255 -> c
+    6:6:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):305 -> c
+    7:7:com.android.tools.r8.ir.analysis.value.SingleValue getSingleValue():267:267 -> c
+    7:7:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):305 -> c
+    8:8:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):305:305 -> c
+    1:1:com.android.tools.r8.graph.DexType getNewType():259:259 -> d
+    1:1:com.android.tools.r8.graph.DexType getOldType():263:263 -> e
+    1:7:boolean equals(java.lang.Object):330:336 -> equals
+    1:1:com.android.tools.r8.ir.analysis.value.SingleValue getSingleValue():267:267 -> f
+    1:1:boolean hasBeenChangedToReturnVoid():271:271 -> g
+    1:1:boolean hasCastType():275:275 -> h
+    1:1:int hashCode():341:341 -> hashCode
+    1:1:boolean hasSingleValue():279:279 -> i
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder -> com.android.tools.r8.internal.aT:
     com.android.tools.r8.graph.DexType newType -> c
     com.android.tools.r8.graph.DexType oldType -> b
     com.android.tools.r8.graph.DexType castType -> a
     com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> d
-    1:1:void <init>():333:333 -> <init>
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder applyIf(boolean,java.util.function.Consumer):342:342 -> a
-    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder setCastType(com.android.tools.r8.graph.DexType):348:348 -> a
-    3:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder setSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):363:363 -> a
-    4:4:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo build():368:368 -> a
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder setNewType(com.android.tools.r8.graph.DexType):358:358 -> b
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder setOldType(com.android.tools.r8.graph.DexType):353:353 -> c
-com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer -> com.android.tools.r8.internal.IU:
+    1:1:void <init>():344:344 -> <init>
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder applyIf(boolean,java.util.function.Consumer):353:353 -> a
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder setCastType(com.android.tools.r8.graph.DexType):359:359 -> a
+    3:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder setSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):374:374 -> a
+    4:4:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo build():379:379 -> a
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder setNewType(com.android.tools.r8.graph.DexType):369:369 -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder setOldType(com.android.tools.r8.graph.DexType):364:364 -> c
+com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer -> com.android.tools.r8.internal.bT:
     com.android.tools.r8.graph.RewrittenPrototypeDescription prototypeChanges -> a
     1:1:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer.<init>():18:18 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.RewrittenPrototypeDescription):28 -> <init>
@@ -35143,7 +34785,7 @@
     1:1:java.util.BitSet fixupNonNullParamOnNormalExits(java.util.BitSet):110:110 -> b
     1:1:java.util.BitSet fixupNonNullParamOrThrow(java.util.BitSet):119:119 -> c
     1:1:java.util.BitSet fixupUnusedArguments(java.util.BitSet):157:157 -> d
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.aW:
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.zU:
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):21:21 -> <init>
     void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
     1:10:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):26:35 -> a
@@ -35152,90 +34794,100 @@
     19:21:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):71:73 -> a
     1:3:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):64:66 -> b
     1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):45:57 -> c
-com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.jW:
+com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.IU:
     1:1:void <init>(java.lang.String):12:12 -> <init>
     1:1:int lambda$new$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):12:12 -> a
     1:1:java.util.Set lambda$new$1():12:12 -> d
-com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.kW:
+com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.JU:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     1:4:com.android.tools.r8.graph.SortedProgramPackageCollection createWithAllProgramClasses(com.android.tools.r8.graph.AppView):16:19 -> a
     5:7:boolean addProgramClass(com.android.tools.r8.graph.DexProgramClass):26:28 -> a
-com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.wY:
+com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.OW:
+    java.util.Map subtypeMap -> a
     java.util.Map typeInfo -> b
-    java.util.Map subtypeMap -> c
-    java.util.Set NO_DIRECT_SUBTYPE -> d
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.graph.DexItemFactory factory -> a
-    1:8:void <clinit>():24:31 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):41:41 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):45:45 -> <init>
-    3:3:void <init>(java.util.Collection,com.android.tools.r8.graph.DexDefinitionSupplier):48:48 -> <init>
-    4:20:void <init>(java.util.Collection,com.android.tools.r8.graph.DexDefinitionSupplier):35:51 -> <init>
-    1:1:java.util.Set access$000():24:24 -> a
-    2:10:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):82:90 -> a
-    11:11:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.SubtypingInfo.dexItemFactory():69:69 -> a
-    11:11:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):90 -> a
-    12:19:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):90:97 -> a
-    20:20:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.SubtypingInfo.dexItemFactory():69:69 -> a
-    20:20:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):101 -> a
-    21:22:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):101:102 -> a
-    23:31:void populateSubtypeMap(java.util.Collection,java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):111:119 -> a
-    32:66:boolean com.android.tools.r8.graph.SubtypingInfo.validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):124:158 -> a
-    32:66:void populateSubtypeMap(java.util.Collection,java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):119 -> a
-    67:67:void forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):189:189 -> a
-    68:76:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):193:201 -> a
-    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):60:63 -> b
-    5:9:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):217:221 -> b
-    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):314:314 -> c
-    1:4:com.android.tools.r8.graph.DexType getSingleDirectSubtype(com.android.tools.r8.graph.DexType):172:175 -> d
+    java.util.Set NO_DIRECT_SUBTYPE -> c
+    boolean $assertionsDisabled -> d
+    1:8:void <clinit>():23:30 -> <clinit>
+    1:3:void <init>(java.util.Map,java.util.Map):36:38 -> <init>
+    1:1:java.util.Set access$000():23:23 -> a
+    2:2:com.android.tools.r8.graph.SubtypingInfo create(com.android.tools.r8.graph.AppView):42:42 -> a
+    3:3:com.android.tools.r8.graph.SubtypingInfo create(com.android.tools.r8.graph.AppInfoWithClassHierarchy):46:46 -> a
+    4:7:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.graph.SubtypingInfo.create(java.util.Collection,com.android.tools.r8.graph.DexDefinitionSupplier):51:54 -> a
+    4:7:com.android.tools.r8.graph.SubtypingInfo create(com.android.tools.r8.graph.AppInfoWithClassHierarchy):46 -> a
+    8:8:com.android.tools.r8.graph.SubtypingInfo$TypeInfo com.android.tools.r8.graph.SubtypingInfo.getTypeInfo(com.android.tools.r8.graph.DexType):73:73 -> a
+    8:8:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):197 -> a
+    9:16:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):198:205 -> a
+    17:18:com.android.tools.r8.graph.SubtypingInfo$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType,java.util.Map):77:78 -> a
+    19:40:void populateAllSuperTypes(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):87:108 -> a
+    41:46:void lambda$populateAllSuperTypes$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.SubtypingInfo$TypeInfo,com.android.tools.r8.graph.DexType,java.lang.Boolean):93:98 -> a
+    47:52:void populateSubtypeMap(java.util.Collection,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier):118:123 -> a
+    53:87:boolean com.android.tools.r8.graph.SubtypingInfo.validateLevelsAreCorrect(java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier):128:162 -> a
+    53:87:void populateSubtypeMap(java.util.Collection,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier):123 -> a
+    88:88:java.util.Set lambda$populateSubtypeMap$2(com.android.tools.r8.graph.DexType,java.util.Set):122:122 -> a
+    89:89:void forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):193:193 -> a
+    1:4:void populateSuperType(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):64:67 -> b
+    5:5:com.android.tools.r8.graph.SubtypingInfo$TypeInfo com.android.tools.r8.graph.SubtypingInfo.getTypeInfo(com.android.tools.r8.graph.DexType):73:73 -> b
+    5:5:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):221 -> b
+    6:9:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):222:225 -> b
+    1:1:com.android.tools.r8.graph.SubtypingInfo$TypeInfo com.android.tools.r8.graph.SubtypingInfo.getTypeInfo(com.android.tools.r8.graph.DexType):73:73 -> c
+    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):318 -> c
+    2:2:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):318:318 -> c
+    1:1:com.android.tools.r8.graph.SubtypingInfo$TypeInfo com.android.tools.r8.graph.SubtypingInfo.getTypeInfo(com.android.tools.r8.graph.DexType):73:73 -> d
+    1:1:com.android.tools.r8.graph.DexType getSingleDirectSubtype(com.android.tools.r8.graph.DexType):176 -> d
+    2:4:com.android.tools.r8.graph.DexType getSingleDirectSubtype(com.android.tools.r8.graph.DexType):177:179 -> d
     5:5:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):779:779 -> d
-    5:5:com.android.tools.r8.graph.DexType getSingleDirectSubtype(com.android.tools.r8.graph.DexType):175 -> d
+    5:5:com.android.tools.r8.graph.DexType getSingleDirectSubtype(com.android.tools.r8.graph.DexType):179 -> d
     6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):845:845 -> d
     6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):779 -> d
-    6:6:com.android.tools.r8.graph.DexType getSingleDirectSubtype(com.android.tools.r8.graph.DexType):175 -> d
-    7:7:com.android.tools.r8.graph.DexType getSingleDirectSubtype(com.android.tools.r8.graph.DexType):175:175 -> d
-    1:2:com.android.tools.r8.graph.SubtypingInfo$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):73:74 -> e
-    1:1:boolean lambda$allImmediateExtendsSubtypes$1(com.android.tools.r8.graph.DexType):196:196 -> f
-    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):199:199 -> g
-    1:1:boolean lambda$allImmediateImplementsSubtypes$3(com.android.tools.r8.graph.DexType):219:219 -> h
-    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):60:60 -> i
-    1:3:java.util.Set subtypes(com.android.tools.r8.graph.DexType):166:168 -> j
-com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.vY:
+    6:6:com.android.tools.r8.graph.DexType getSingleDirectSubtype(com.android.tools.r8.graph.DexType):179 -> d
+    7:7:com.android.tools.r8.graph.DexType getSingleDirectSubtype(com.android.tools.r8.graph.DexType):179:179 -> d
+    1:1:com.android.tools.r8.graph.SubtypingInfo$TypeInfo com.android.tools.r8.graph.SubtypingInfo.getTypeInfo(com.android.tools.r8.graph.DexType):73:73 -> e
+    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):200 -> e
+    2:2:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):200:200 -> e
+    1:1:com.android.tools.r8.graph.SubtypingInfo$TypeInfo com.android.tools.r8.graph.SubtypingInfo.getTypeInfo(com.android.tools.r8.graph.DexType):73:73 -> f
+    1:1:boolean lambda$allImmediateExtendsSubtypes$4(com.android.tools.r8.graph.DexType):203 -> f
+    2:2:boolean lambda$allImmediateExtendsSubtypes$4(com.android.tools.r8.graph.DexType):203:203 -> f
+    1:1:com.android.tools.r8.graph.SubtypingInfo$TypeInfo com.android.tools.r8.graph.SubtypingInfo.getTypeInfo(com.android.tools.r8.graph.DexType):73:73 -> g
+    1:1:boolean lambda$allImmediateImplementsSubtypes$5(com.android.tools.r8.graph.DexType):223 -> g
+    2:2:boolean lambda$allImmediateImplementsSubtypes$5(com.android.tools.r8.graph.DexType):223:223 -> g
+    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):64:64 -> h
+    1:3:java.util.Set subtypes(com.android.tools.r8.graph.DexType):170:172 -> i
+com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.NW:
     java.util.Set directSubtypes -> c
     com.android.tools.r8.graph.DexType type -> a
     int hierarchyLevel -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():224:224 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType):235:235 -> <init>
-    2:10:void <init>(com.android.tools.r8.graph.DexType):228:236 -> <init>
-    1:2:void ensureDirectSubTypeSet():259:260 -> a
-    3:13:void setLevel(int):265:275 -> a
-    14:17:void addDirectSubtype(com.android.tools.r8.graph.SubtypingInfo$TypeInfo):280:283 -> a
-    18:20:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):307:309 -> a
-    1:3:boolean isInterface():295:297 -> b
-    1:1:void tagAsInterface():291:291 -> c
-    1:1:void tagAsSubtypeRoot():287:287 -> d
-    1:5:boolean equals(java.lang.Object):246:250 -> equals
-    1:1:int hashCode():241:241 -> hashCode
+    1:1:void <clinit>():228:228 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType):239:239 -> <init>
+    2:10:void <init>(com.android.tools.r8.graph.DexType):232:240 -> <init>
+    1:2:void ensureDirectSubTypeSet():263:264 -> a
+    3:13:void setLevel(int):269:279 -> a
+    14:17:void addDirectSubtype(com.android.tools.r8.graph.SubtypingInfo$TypeInfo):284:287 -> a
+    18:20:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):311:313 -> a
+    1:3:boolean isInterface():299:301 -> b
+    1:1:void tagAsInterface():295:295 -> c
+    1:1:void tagAsSubtypeRoot():291:291 -> d
+    1:5:boolean equals(java.lang.Object):250:254 -> equals
+    1:1:int hashCode():245:245 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":258,"2":259,"3":260}}
-    258:258:java.lang.String toString():255:255 -> toString
-    259:259:java.lang.String toString():255:255 -> toString
-    260:260:java.lang.String toString():255:255 -> toString
-    256:256:java.lang.String toString():255:255 -> toString
-    257:257:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":258,"2":259,"3":260}}
-    258:258:java.lang.String toString():255:255 -> toString
-    259:259:java.lang.String toString():255:255 -> toString
-    260:260:java.lang.String toString():255:255 -> toString
-com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.xY:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":262,"2":263,"3":264}}
+    262:262:java.lang.String toString():259:259 -> toString
+    263:263:java.lang.String toString():259:259 -> toString
+    264:264:java.lang.String toString():259:259 -> toString
+    260:260:java.lang.String toString():259:259 -> toString
+    261:261:java.lang.String toString():0:0 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":262,"2":263,"3":264}}
+    262:262:java.lang.String toString():259:259 -> toString
+    263:263:java.lang.String toString():259:259 -> toString
+    264:264:java.lang.String toString():259:259 -> toString
+com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.PW:
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     com.android.tools.r8.graph.DexEncodedMember getResolvedMember() -> b
     com.android.tools.r8.graph.DexClassAndMember getResolutionPair() -> c
     com.android.tools.r8.graph.DexClass getResolvedHolder() -> d
-com.android.tools.r8.graph.ThrowExceptionCode -> com.android.tools.r8.graph.o3:
+com.android.tools.r8.graph.ThrowExceptionCode -> com.android.tools.r8.graph.X2:
     com.android.tools.r8.graph.DexType exceptionType -> d
     1:2:void <init>(com.android.tools.r8.graph.DexType):30:31 -> <init>
     com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting() -> B
@@ -35248,27 +34900,24 @@
     2:3:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):45:46 -> a
     4:4:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):51:51 -> a
     5:5:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):64:64 -> a
-    6:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79:80 -> a
-    8:8:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
-    8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
-    9:9:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    6:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79:81 -> a
+    9:9:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
     9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    10:10:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    10:10:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
+    10:10:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     10:10:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    11:11:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):183:183 -> a
-    12:12:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):188:188 -> a
-    13:20:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):213:220 -> a
-    21:21:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):235:235 -> a
+    11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    11:11:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
+    11:11:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81 -> a
+    12:12:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):183:183 -> a
+    13:13:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):188:188 -> a
+    14:21:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):213:220 -> a
+    22:22:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):235:235 -> a
     int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod) -> b
     void setCallSiteContexts(com.android.tools.r8.graph.ProgramMethod) -> c
-    1:5:boolean computeEquals(java.lang.Object):99:103 -> g
     1:1:int computeHashCode():91:91 -> g0
+    1:5:boolean computeEquals(java.lang.Object):99:103 -> h
     com.android.tools.r8.graph.DexWritableCode asDexWritableCode() -> i0
     int estimatedDexCodeSizeUpperBoundInBytes() -> k0
     1:1:com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind getDexWritableCodeKind():113:113 -> m
@@ -35281,7 +34930,7 @@
     1:1:com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers():123:123 -> v
     com.android.tools.r8.graph.DexString getHighestSortingString() -> x
     int getOutgoingRegisterSize() -> z
-com.android.tools.r8.graph.ThrowNullCode -> com.android.tools.r8.graph.q3:
+com.android.tools.r8.graph.ThrowNullCode -> com.android.tools.r8.graph.Z2:
     com.android.tools.r8.graph.ThrowNullCode INSTANCE -> d
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>():37:37 -> <init>
@@ -35313,8 +34962,8 @@
     1:3:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):136 -> b
     com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> b0
     void setCallSiteContexts(com.android.tools.r8.graph.ProgramMethod) -> c
-    boolean computeEquals(java.lang.Object) -> g
     1:1:int computeHashCode():96:96 -> g0
+    boolean computeEquals(java.lang.Object) -> h
     com.android.tools.r8.graph.CfWritableCode asCfWritableCode() -> h0
     com.android.tools.r8.graph.DexWritableCode asDexWritableCode() -> i0
     int estimatedDexCodeSizeUpperBoundInBytes() -> k0
@@ -35329,15 +34978,15 @@
     1:1:com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers():126:126 -> v
     com.android.tools.r8.graph.DexString getHighestSortingString() -> x
     int getOutgoingRegisterSize() -> z
-com.android.tools.r8.graph.ThrowNullCode$ThrowNullSourceCode -> com.android.tools.r8.graph.p3:
+com.android.tools.r8.graph.ThrowNullCode$ThrowNullSourceCode -> com.android.tools.r8.graph.Y2:
     1:6:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):274:279 -> <init>
     7:7:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):273:273 -> <init>
     1:1:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):283:283 -> d
-    2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):1260:1260 -> d
+    2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):1216:1216 -> d
     2:2:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):283 -> d
     1:1:void lambda$getInstructionBuilders$1(com.android.tools.r8.ir.conversion.IRBuilder):283:283 -> e
     1:1:java.util.List getInstructionBuilders():283:283 -> f
-com.android.tools.r8.graph.ThrowingInitClassLens -> com.android.tools.r8.internal.qZ:
+com.android.tools.r8.graph.ThrowingInitClassLens -> com.android.tools.r8.internal.GX:
     com.android.tools.r8.graph.ThrowingInitClassLens INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -35356,7 +35005,7 @@
     31:31:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):21:21 -> a
     24:24:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):21:21 -> a
     1:1:com.android.tools.r8.graph.ThrowingInitClassLens getInstance():16:16 -> c
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.KZ:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.aY:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView):23:23 -> a
     2:3:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:61 -> a
@@ -35365,28 +35014,21 @@
     4:12:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):61:69 -> a
     13:27:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass):25:39 -> a
     13:27:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     28:28:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass):36:36 -> a
     28:28:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:29:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass):33:33 -> a
     29:29:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:30:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     30:30:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass):33 -> a
     30:30:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     31:31:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
     31:31:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass):33 -> a
     31:31:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     32:32:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass):30:30 -> a
     32:32:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:33:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     33:33:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass):30 -> a
     33:33:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     34:39:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):72:77 -> a
     40:49:boolean com.android.tools.r8.graph.TopDownClassHierarchyTraversal.shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):95:104 -> a
     40:49:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):78 -> a
@@ -35400,124 +35042,130 @@
     70:70:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):88:88 -> a
     com.android.tools.r8.graph.ClassHierarchyTraversal self() -> b
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):50:50 -> b
-com.android.tools.r8.graph.TreeFixerBase -> com.android.tools.r8.graph.r3:
+com.android.tools.r8.graph.TreeFixerBase -> com.android.tools.r8.graph.a3:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map programClassCache -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map protoFixupCache -> d
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):24:24 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView):20:26 -> <init>
+    1:1:void <clinit>():17:17 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):26:26 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView):22:28 -> <init>
     void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField) -> a
     void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod) -> a
-    1:16:void recordFailedResolutionChanges():55:70 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):81:81 -> a
-    18:21:java.util.List fixupClasses(java.util.Collection):87:90 -> a
-    22:22:java.util.List fixupClasses(java.util.Collection):89:89 -> a
-    23:26:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):97:100 -> a
-    23:26:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
+    1:16:void recordFailedResolutionChanges():57:72 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):83:83 -> a
+    18:21:java.util.List fixupClasses(java.util.Collection):89:92 -> a
+    22:22:java.util.List fixupClasses(java.util.Collection):91:91 -> a
+    23:26:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):99:102 -> a
+    23:26:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
     27:27:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    27:27:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):101 -> a
-    27:27:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    28:29:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):102:103 -> a
-    28:29:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    30:30:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):353:353 -> a
-    30:30:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):104 -> a
-    30:30:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    31:35:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):342:346 -> a
-    31:35:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):353 -> a
-    31:35:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):104 -> a
-    31:35:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    36:36:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):354:354 -> a
-    36:36:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):104 -> a
-    36:36:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    37:38:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):105:106 -> a
-    37:38:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    39:39:com.android.tools.r8.graph.NestHostClassAttribute fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):264:264 -> a
-    39:39:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):106 -> a
-    39:39:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    40:40:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):107:107 -> a
-    40:40:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    41:50:java.util.List fixupNestMemberAttributes(java.util.List):270:279 -> a
-    41:50:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):107 -> a
-    41:50:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    51:66:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):108:123 -> a
-    51:66:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    67:69:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):240:242 -> a
-    67:69:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):121 -> a
-    67:69:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    70:70:void com.android.tools.r8.graph.DexClass.setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):253:253 -> a
-    70:70:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):120 -> a
-    70:70:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    71:72:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):126:127 -> a
-    71:72:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    73:78:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):237:242 -> a
-    73:78:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):125 -> a
-    73:78:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    79:79:void com.android.tools.r8.graph.DexClass.setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):273:273 -> a
-    79:79:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):124 -> a
-    79:79:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    80:90:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):129:139 -> a
-    80:90:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    91:91:com.android.tools.r8.graph.DexProgramClass recordClassChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42:42 -> a
-    91:91:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):140 -> a
-    91:91:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):90 -> a
-    92:104:com.android.tools.r8.graph.EnclosingMethodAttribute fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):150:162 -> a
-    105:107:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):189:191 -> a
-    108:111:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):248:251 -> a
-    112:113:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):258:259 -> a
-    114:117:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):287:290 -> a
-    114:117:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):259 -> a
-    118:122:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):342:346 -> a
-    118:122:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):290 -> a
-    118:122:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):259 -> a
-    123:124:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):291:292 -> a
-    123:124:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):259 -> a
-    125:125:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):259:259 -> a
-    126:126:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):258:258 -> a
-    127:136:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):326:335 -> a
-    137:137:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):359:359 -> a
-    138:141:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):287:290 -> a
-    138:141:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):359 -> a
-    142:146:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):342:346 -> a
-    142:146:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):290 -> a
-    142:146:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):359 -> a
-    147:148:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):291:292 -> a
-    147:148:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):359 -> a
-    149:149:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.withProto(com.android.tools.r8.graph.DexProto):54:54 -> a
-    149:149:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):359 -> a
-    150:150:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):21:21 -> a
-    150:150:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.withProto(com.android.tools.r8.graph.DexProto):54 -> a
-    150:150:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):359 -> a
+    27:27:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):103 -> a
+    27:27:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    28:29:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):104:105 -> a
+    28:29:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    30:30:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):362:362 -> a
+    30:30:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):106 -> a
+    30:30:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    31:35:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):351:355 -> a
+    31:35:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):362 -> a
+    31:35:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):106 -> a
+    31:35:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    36:36:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):363:363 -> a
+    36:36:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):106 -> a
+    36:36:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    37:38:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):107:108 -> a
+    37:38:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    39:39:com.android.tools.r8.graph.NestHostClassAttribute fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):273:273 -> a
+    39:39:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):108 -> a
+    39:39:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    40:40:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):109:109 -> a
+    40:40:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    41:50:java.util.List fixupNestMemberAttributes(java.util.List):279:288 -> a
+    41:50:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):109 -> a
+    41:50:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    51:61:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):110:120 -> a
+    51:61:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    62:62:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):170:170 -> a
+    62:62:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):120 -> a
+    62:62:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    63:64:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):120:121 -> a
+    63:64:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    65:65:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):170:170 -> a
+    65:65:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):121 -> a
+    65:65:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    66:70:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):121:125 -> a
+    66:70:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    71:73:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):249:251 -> a
+    71:73:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):123 -> a
+    71:73:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    74:74:void com.android.tools.r8.graph.DexClass.setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):253:253 -> a
+    74:74:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):122 -> a
+    74:74:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    75:76:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):128:129 -> a
+    75:76:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    77:82:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):246:251 -> a
+    77:82:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):127 -> a
+    77:82:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    83:83:void com.android.tools.r8.graph.DexClass.setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):273:273 -> a
+    83:83:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):126 -> a
+    83:83:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    84:94:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):131:141 -> a
+    84:94:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    95:95:com.android.tools.r8.graph.DexProgramClass recordClassChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):44:44 -> a
+    95:95:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):142 -> a
+    95:95:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92 -> a
+    96:108:com.android.tools.r8.graph.EnclosingMethodAttribute fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):152:164 -> a
+    109:113:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):176:180 -> a
+    114:118:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField,java.util.function.Consumer):187:191 -> a
+    114:118:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):180 -> a
+    119:119:com.android.tools.r8.graph.DexEncodedField recordFieldChange(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):49:49 -> a
+    119:119:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField,java.util.function.Consumer):190 -> a
+    119:119:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):180 -> a
+    120:120:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):180:180 -> a
+    121:123:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):198:200 -> a
+    124:127:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):257:260 -> a
+    128:129:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):267:268 -> a
+    130:133:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):296:299 -> a
+    130:133:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):268 -> a
+    134:138:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):351:355 -> a
+    134:138:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):299 -> a
+    134:138:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):268 -> a
+    139:140:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):300:301 -> a
+    139:140:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):268 -> a
+    141:141:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):268:268 -> a
+    142:142:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):267:267 -> a
+    143:152:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):335:344 -> a
+    153:153:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):368:368 -> a
+    154:157:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):296:299 -> a
+    154:157:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):368 -> a
+    158:162:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):351:355 -> a
+    158:162:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):299 -> a
+    158:162:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):368 -> a
+    163:164:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):300:301 -> a
+    163:164:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):368 -> a
+    165:165:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.withProto(com.android.tools.r8.graph.DexProto):54:54 -> a
+    165:165:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):368 -> a
+    166:166:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):21:21 -> a
+    166:166:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.withProto(com.android.tools.r8.graph.DexProto):54 -> a
+    166:166:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):368 -> a
     com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType) -> b
-    1:3:void lambda$recordFailedResolutionChanges$0(com.android.tools.r8.graph.DexField):63:65 -> b
-    4:6:void lambda$recordFailedResolutionChanges$1(com.android.tools.r8.graph.DexMethod):72:74 -> b
-    7:11:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):169:173 -> b
-    12:15:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):179:182 -> b
-    12:15:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):173 -> b
-    16:16:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> b
-    16:16:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):182 -> b
-    16:16:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):173 -> b
-    17:17:com.android.tools.r8.graph.DexEncodedField recordFieldChange(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):47:47 -> b
-    17:17:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):182 -> b
-    17:17:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):173 -> b
-    18:18:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):173:173 -> b
-    1:7:java.util.List fixupInnerClassAttributes(java.util.List):196:202 -> c
-    8:8:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):321:321 -> c
-    8:8:java.util.List fixupInnerClassAttributes(java.util.List):203 -> c
-    9:9:java.util.List fixupInnerClassAttributes(java.util.List):204:204 -> c
-    10:10:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):321:321 -> c
-    10:10:java.util.List fixupInnerClassAttributes(java.util.List):205 -> c
-    11:22:java.util.List fixupInnerClassAttributes(java.util.List):206:217 -> c
-    23:30:java.util.List fixupInnerClassAttributes(java.util.List):216:223 -> c
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():607:607 -> c
-    31:31:java.util.List fixupInnerClassAttributes(java.util.List):223 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:38:java.util.List fixupInnerClassAttributes(java.util.List):223:229 -> c
-    39:39:java.util.List fixupInnerClassAttributes(java.util.List):227:227 -> c
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.s3:
+    1:3:void lambda$recordFailedResolutionChanges$0(com.android.tools.r8.graph.DexField):65:67 -> b
+    4:6:void lambda$recordFailedResolutionChanges$1(com.android.tools.r8.graph.DexMethod):74:76 -> b
+    7:13:java.util.List fixupInnerClassAttributes(java.util.List):205:211 -> b
+    14:14:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):330:330 -> b
+    14:14:java.util.List fixupInnerClassAttributes(java.util.List):212 -> b
+    15:15:java.util.List fixupInnerClassAttributes(java.util.List):213:213 -> b
+    16:16:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):330:330 -> b
+    16:16:java.util.List fixupInnerClassAttributes(java.util.List):214 -> b
+    17:28:java.util.List fixupInnerClassAttributes(java.util.List):215:226 -> b
+    29:36:java.util.List fixupInnerClassAttributes(java.util.List):225:232 -> b
+    37:37:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():608:608 -> b
+    37:37:java.util.List fixupInnerClassAttributes(java.util.List):232 -> b
+    38:44:java.util.List fixupInnerClassAttributes(java.util.List):232:238 -> b
+    45:45:java.util.List fixupInnerClassAttributes(java.util.List):236:236 -> b
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.b3:
     com.android.tools.r8.graph.Definition context -> b
     com.android.tools.r8.utils.TraversalContinuation continuation -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -35543,13 +35191,13 @@
     68:69:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):214:215 -> a
     70:70:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):906:906 -> a
     70:70:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):215 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     71:95:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):218:242 -> a
     96:96:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):238:238 -> a
     97:97:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):235:235 -> a
     98:106:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):224:232 -> a
-    107:108:void registerCallSite(com.android.tools.r8.graph.DexCallSite):248:249 -> a
-    109:111:void registerProto(com.android.tools.r8.graph.DexProto):253:255 -> a
+    107:109:void registerProto(com.android.tools.r8.graph.DexProto):253:255 -> a
+    107:109:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):232 -> a
+    110:111:void registerCallSite(com.android.tools.r8.graph.DexCallSite):248:249 -> a
     void registerInitClass(com.android.tools.r8.graph.DexType) -> b
     void registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():35:35 -> b
@@ -35557,7 +35205,6 @@
     2:2:void registerCallSiteExceptBootstrapArgs(com.android.tools.r8.graph.DexCallSite):201:201 -> b
     3:3:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):906:906 -> b
     3:3:void registerCallSiteExceptBootstrapArgs(com.android.tools.r8.graph.DexCallSite):201 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:10:void registerCallSiteExceptBootstrapArgs(com.android.tools.r8.graph.DexCallSite):204:210 -> b
     11:12:void doBreak():39:40 -> b
     13:13:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):98:98 -> b
@@ -35587,16 +35234,16 @@
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
     1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):132:132 -> h
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.internal.c20:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.internal.s00:
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse ARGUMENT_TO_LAMBDA_METAFACTORY -> b
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse NOT_ARGUMENT_TO_LAMBDA_METAFACTORY -> c
     1:2:void <clinit>():21:22 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
-com.android.tools.r8.graph.UseRegistryWithResult -> com.android.tools.r8.internal.d20:
+com.android.tools.r8.graph.UseRegistryWithResult -> com.android.tools.r8.internal.t00:
     java.lang.Object result -> e
-    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.Definition,java.lang.Object):16:17 -> <init>
+    1:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.Definition,java.lang.Object):0:17 -> <init>
     1:1:java.lang.Object getResult():21:21 -> f
-    1:2:void setResult(java.lang.Object):25:26 -> g
+    1:27:void setResult(java.lang.Object):0:26 -> g
 com.android.tools.r8.graph.analysis.ApiModelAnalysis -> com.android.tools.r8.internal.h2:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.androidapi.ComputedApiLevel minApiLevel -> c
@@ -35617,7 +35264,7 @@
     24:24:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.androidapi.AndroidApiLevelCompute.computeApiLevelForDefinition(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.androidapi.ComputedApiLevel):44:44 -> a
     24:24:void computeAndSetApiLevelForDefinition(com.android.tools.r8.graph.DexClassAndMember):83 -> a
     25:25:void computeAndSetApiLevelForDefinition(com.android.tools.r8.graph.DexClassAndMember):82:82 -> a
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.aa:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.P9:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     com.android.tools.r8.graph.DexString kotlinAssertionsEnabled -> c
     java.util.List jacocoInstructionSequence -> f
@@ -35686,7 +35333,7 @@
     78:100:boolean com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis.hasKotlincClinitAssertionCode(com.android.tools.r8.graph.ProgramMethod):148:170 -> a
     78:100:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):47 -> a
     101:101:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):48:48 -> a
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.ci:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.Nh:
     1:1:void <init>():18:18 -> <init>
     void done(com.android.tools.r8.shaking.Enqueuer) -> a
     void notifyFailedMethodResolutionTarget(com.android.tools.r8.graph.DexEncodedMethod) -> a
@@ -35699,8 +35346,8 @@
     void processNewlyLiveField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition) -> a
     void processTracedCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry) -> a
-com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis -> com.android.tools.r8.internal.ii:
-com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround -> com.android.tools.r8.internal.bm:
+com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis -> com.android.tools.r8.internal.Th:
+com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround -> com.android.tools.r8.internal.El:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> b
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
@@ -35714,7 +35361,7 @@
     1:15:boolean com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround.isUnsafeToUseFieldOnDalvik(com.android.tools.r8.graph.DexField):79:93 -> b
     1:15:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):73 -> b
     16:16:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):74:74 -> b
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.op:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.Qo:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
@@ -35722,8 +35369,7 @@
     1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):67:83 -> a
     18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):81:81 -> a
     19:19:void done(com.android.tools.r8.shaking.Enqueuer):89:89 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.internal.mp:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.np:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.Po:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -35731,7 +35377,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):20:20 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):26:28 -> <init>
     1:18:boolean isClassDefinitelyLoadedInInstanceMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):33:50 -> a
-com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround -> com.android.tools.r8.internal.Zu:
+com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround -> com.android.tools.r8.internal.tu:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> b
     com.android.tools.r8.utils.InternalOptions options -> c
     com.android.tools.r8.graph.DexType androidHardwareCamera2CameraDeviceType -> a
@@ -35740,15 +35386,15 @@
     1:1:void register(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):45 -> a
     2:2:void register(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):46:46 -> a
     3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    4:4:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):65:65 -> a
-    4:4:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    5:5:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):66 -> a
-    5:5:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
-    6:6:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):67:67 -> a
+    4:5:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):65:66 -> a
+    4:5:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    6:6:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):66 -> a
     6:6:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
-    7:7:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata -> com.android.tools.r8.internal.g6:
+    7:8:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):66:67 -> a
+    7:8:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
+    9:9:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata -> com.android.tools.r8.internal.c6:
     java.util.Set isReadForInvokeReceiver -> a
     boolean isReadForWrite -> b
     1:1:void <init>(java.util.Set,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$1):16:16 -> <init>
@@ -35757,8 +35403,7 @@
     1:1:java.util.Set getReadForInvokeReceiver():56:56 -> b
     1:1:boolean isReadForInvokeReceiver():52:52 -> c
     1:1:boolean isReadForWrite():60:60 -> d
-com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$1 -> com.android.tools.r8.internal.e6:
-com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder -> com.android.tools.r8.internal.f6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder -> com.android.tools.r8.internal.b6:
     java.util.Set isReadForInvokeReceiver -> a
     boolean isReadForWrite -> b
     boolean $assertionsDisabled -> c
@@ -35770,7 +35415,7 @@
     5:5:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata build():85 -> a
     6:7:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata build():85:86 -> a
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder setIsReadForWrite():80:80 -> b
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata -> com.android.tools.r8.internal.i6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata -> com.android.tools.r8.internal.e6:
     java.util.Map backing -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -35779,14 +35424,14 @@
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder builder(com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):29:29 -> a
     2:2:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata empty():34:34 -> a
     3:3:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(java.lang.Object):38:38 -> a
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder -> com.android.tools.r8.internal.h6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder -> com.android.tools.r8.internal.d6:
     java.util.Map backing -> b
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider bytecodeMetadataProvider -> a
     1:1:void <init>(com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):47:47 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):45:48 -> <init>
     1:4:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder setMetadata(com.android.tools.r8.ir.code.Instruction,java.lang.Object):52:55 -> a
     5:5:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata build():61:61 -> a
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider -> com.android.tools.r8.internal.j6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider -> com.android.tools.r8.internal.f6:
     java.util.Map backing -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider EMPTY -> b
     1:2:void <clinit>():21:22 -> <clinit>
@@ -35794,7 +35439,7 @@
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder builder():31:31 -> a
     2:2:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.ir.code.Instruction):43:43 -> a
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider empty():35:35 -> b
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder -> com.android.tools.r8.internal.j6$a:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder -> com.android.tools.r8.internal.f6$a:
     java.util.Map builders -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():46:46 -> <clinit>
@@ -35802,10 +35447,10 @@
     1:4:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder addMetadata(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):57:60 -> a
     5:11:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider build():65:71 -> a
     12:12:void lambda$build$0(java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):70:70 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.wE:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.BD:
     boolean hasBeenMergedIntoDifferentType(com.android.tools.r8.graph.DexType) -> a
     boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.xE:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.CD:
     java.util.List collection -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -35813,7 +35458,7 @@
     1:1:void add(com.android.tools.r8.graph.classmerging.MergedClasses):20:20 -> a
     2:3:boolean hasBeenMergedIntoDifferentType(com.android.tools.r8.graph.DexType):32:33 -> a
     4:5:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):52:53 -> a
-com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.W20:
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.j10:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedInterfaces -> b
     boolean $assertionsDisabled -> c
@@ -35844,7 +35489,7 @@
     1:1:java.util.Collection com.android.tools.r8.graph.classmerging.VerticallyMergedClasses.getSourcesFor(com.android.tools.r8.graph.DexType):45:45 -> f
     1:1:boolean isMergeTarget(com.android.tools.r8.graph.DexType):71 -> f
     2:2:boolean isMergeTarget(com.android.tools.r8.graph.DexType):71:71 -> f
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.sa:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.ga:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> c
@@ -35859,54 +35504,53 @@
     45:47:java.util.Map getAvailableFieldsByRelaxedInfo(com.android.tools.r8.graph.AppView,java.util.Map):109:111 -> a
     48:48:void lambda$getAvailableFieldsByRelaxedInfo$2(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo,java.util.LinkedList):115:115 -> a
     49:52:void lambda$getAvailableFieldsByRelaxedInfo$2(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo,java.util.LinkedList):114:117 -> a
-    53:63:com.android.tools.r8.graph.DexEncodedField[] merge():135:145 -> a
-    64:64:void lambda$merge$5(java.util.List,java.util.Set,com.android.tools.r8.graph.DexEncodedField):144:144 -> a
-    65:73:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):150:158 -> a
-    74:74:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    74:74:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):158 -> a
-    75:75:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):158:158 -> a
-    76:76:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):157:157 -> a
-    77:84:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):155:162 -> a
-    85:85:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):213:213 -> a
-    85:85:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):162 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    86:86:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> a
-    86:86:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):161 -> a
-    87:87:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):167:167 -> a
-    88:88:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.append(java.lang.Iterable,java.lang.Object):52:52 -> a
-    88:88:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):169 -> a
-    89:89:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    89:89:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.append(java.lang.Iterable,java.lang.Object):52 -> a
-    89:89:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):169 -> a
-    90:90:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):169:169 -> a
-    91:94:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):168:171 -> a
-    95:95:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):167:167 -> a
-    96:96:boolean needsRelaxedType(com.android.tools.r8.graph.DexEncodedField,java.lang.Iterable):178:178 -> a
-    97:97:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    97:97:boolean needsRelaxedType(com.android.tools.r8.graph.DexEncodedField,java.lang.Iterable):178 -> a
-    98:98:boolean lambda$needsRelaxedType$6(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):179:179 -> a
-    99:99:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():234:234 -> a
-    99:99:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):122 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    100:100:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):122:122 -> a
-    101:101:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    101:101:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):122 -> a
-    102:102:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):123:123 -> a
-    103:103:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
-    103:103:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):125 -> a
-    104:104:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):125:125 -> a
-    105:105:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    105:105:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):125 -> a
-    106:106:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):126:126 -> a
-    107:107:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():234:234 -> a
-    107:107:boolean lambda$fixAccessFlags$3(com.android.tools.r8.graph.DexEncodedField):122 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    53:53:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):122:122 -> a
+    54:54:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():234:234 -> a
+    54:54:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):122 -> a
+    55:55:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):122:122 -> a
+    56:56:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
+    56:56:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):122 -> a
+    57:57:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):123:123 -> a
+    58:58:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
+    58:58:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):125 -> a
+    59:59:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):125:125 -> a
+    60:60:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
+    60:60:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):125 -> a
+    61:61:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):126:126 -> a
+    62:62:boolean lambda$fixAccessFlags$3(com.android.tools.r8.graph.DexEncodedField):122:122 -> a
+    63:63:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():234:234 -> a
+    63:63:boolean lambda$fixAccessFlags$3(com.android.tools.r8.graph.DexEncodedField):122 -> a
+    64:74:com.android.tools.r8.graph.DexEncodedField[] merge():135:145 -> a
+    75:75:void lambda$merge$5(java.util.List,java.util.Set,com.android.tools.r8.graph.DexEncodedField):144:144 -> a
+    76:84:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):150:158 -> a
+    85:85:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
+    85:85:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):158 -> a
+    86:86:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):158:158 -> a
+    87:87:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):157:157 -> a
+    88:95:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):155:162 -> a
+    96:96:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):213:213 -> a
+    96:96:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):162 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):161 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):167:167 -> a
+    99:99:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.append(java.lang.Iterable,java.lang.Object):52:52 -> a
+    99:99:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):169 -> a
+    100:100:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
+    100:100:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.append(java.lang.Iterable,java.lang.Object):52 -> a
+    100:100:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):169 -> a
+    101:101:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):169:169 -> a
+    102:105:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):168:171 -> a
+    106:106:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):167:167 -> a
+    107:107:boolean needsRelaxedType(com.android.tools.r8.graph.DexEncodedField,java.lang.Iterable):178:178 -> a
+    108:108:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
+    108:108:boolean needsRelaxedType(com.android.tools.r8.graph.DexEncodedField,java.lang.Iterable):178 -> a
+    109:109:boolean lambda$needsRelaxedType$6(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):179:179 -> a
     1:1:java.util.LinkedList lambda$getAvailableFieldsByRelaxedInfo$1(com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo):116:116 -> b
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> b
-    2:2:boolean lambda$fixAccessFlags$4(com.android.tools.r8.graph.DexEncodedField):125 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2:2:boolean lambda$fixAccessFlags$4(com.android.tools.r8.graph.DexEncodedField):125:125 -> b
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> b
+    3:3:boolean lambda$fixAccessFlags$4(com.android.tools.r8.graph.DexEncodedField):125 -> b
     1:1:void setClassIdField(com.android.tools.r8.graph.DexEncodedField):131:131 -> c
-com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.za:
+com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.la:
     com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder classMethodsBuilder -> f
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
@@ -35932,7 +35576,6 @@
     5:11:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     12:12:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2383:2383 -> a
     12:12:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):123 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:12:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     13:14:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):124:125 -> a
     13:14:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
@@ -35954,7 +35597,6 @@
     39:43:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):152:156 -> a
     44:44:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2383:2383 -> a
     44:44:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):156 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     45:56:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):154:165 -> a
     57:57:void lambda$mergeInstanceInitializers$2(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger):192:192 -> a
     58:58:void lambda$mergeVirtualMethods$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):206:206 -> a
@@ -35991,26 +35633,24 @@
     105:107:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):327 -> a
     108:110:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):328:330 -> a
     111:111:void lambda$mergeGroup$12(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass):330:330 -> a
-    1:2:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):179:180 -> b
-    3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> b
-    3:3:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):181 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:6:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):181:183 -> b
-    7:7:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):180:180 -> b
-    8:8:void mergeInstanceInitializers(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):190:190 -> b
-    9:9:void lambda$mergeVirtualMethods$4(com.android.tools.r8.graph.DexProgramClass):207:207 -> b
-    10:10:void fixAccessFlags():235:235 -> b
-    11:11:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> b
-    11:11:void fixAccessFlags():235 -> b
-    12:14:void fixAccessFlags():236:238 -> b
-    15:15:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> b
-    15:15:void fixAccessFlags():238 -> b
-    16:16:void fixAccessFlags():239:239 -> b
-    17:19:void lambda$mergeInstanceFields$11(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass):305:307 -> b
+    1:3:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):179:181 -> b
+    4:4:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> b
+    4:4:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):181 -> b
+    5:7:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):181:183 -> b
+    8:8:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):180:180 -> b
+    9:9:void mergeInstanceInitializers(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):190:190 -> b
+    10:10:void lambda$mergeVirtualMethods$4(com.android.tools.r8.graph.DexProgramClass):207:207 -> b
+    11:11:void fixAccessFlags():235:235 -> b
+    12:12:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> b
+    12:12:void fixAccessFlags():235 -> b
+    13:15:void fixAccessFlags():236:238 -> b
+    16:16:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> b
+    16:16:void fixAccessFlags():238 -> b
+    17:17:void fixAccessFlags():239:239 -> b
+    18:20:void lambda$mergeInstanceFields$11(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass):305:307 -> b
     1:1:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):150:150 -> c
     2:2:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):256:256 -> c
     2:2:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):150 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):170:170 -> c
     4:12:void fixNestMemberAttributes():244:252 -> c
     1:4:void mergeAnnotations():262:265 -> d
@@ -36022,13 +35662,12 @@
     22:22:void com.android.tools.r8.graph.DexTypeList.<init>(java.util.Collection):47:47 -> e
     22:22:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.create(java.util.Collection):55 -> e
     22:22:void mergeInterfaces():291 -> e
-    23:23:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):173:173 -> e
-    23:23:void mergeInterfaces():291 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    23:23:void mergeInterfaces():291:291 -> e
+    24:24:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):173:173 -> e
+    24:24:void mergeInterfaces():291 -> e
     1:3:void mergeStaticFields():313:315 -> f
     1:3:void mergeVirtualMethods():205:207 -> g
-com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.xa:
-com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.ya:
+com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.ka:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
     boolean $assertionsDisabled -> e
@@ -36040,7 +35679,6 @@
     16:16:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):355:355 -> a
     17:17:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
     17:17:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):355 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:18:void lambda$createVirtualMethodMergers$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):359:359 -> a
     19:22:void lambda$createVirtualMethodMergers$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):358:361 -> a
     23:23:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$createVirtualMethodMergers$0(com.android.tools.r8.graph.DexMethodSignature):360:360 -> a
@@ -36053,7 +35691,7 @@
     36:36:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):387 -> a
     37:37:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):390:390 -> a
     38:38:boolean lambda$build$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):384:384 -> a
-com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.Aa:
+com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.ma:
     java.util.List virtualMethods -> b
     java.util.List directMethods -> c
     java.util.Set reservedMethods -> a
@@ -36066,7 +35704,7 @@
     6:11:void setClassMethods(com.android.tools.r8.graph.DexProgramClass):37:42 -> a
     1:3:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):21:23 -> b
     4:4:boolean lambda$setClassMethods$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):39:39 -> b
-com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.Xa:
+com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.Ha:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
@@ -36082,7 +35720,7 @@
     20:22:void addField(com.android.tools.r8.graph.DexEncodedField):56:58 -> a
     23:23:void addFields(com.android.tools.r8.graph.DexProgramClass):62:62 -> a
     24:24:void merge():66:66 -> a
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.ee:
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.Gd:
     boolean $assertionsDisabled -> o
     com.android.tools.r8.graph.DexField classIdField -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> n
@@ -36096,7 +35734,7 @@
     13:16:boolean lambda$prepareMultiConstructorInstructions$4(int,com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):101 -> a
     1:1:void lambda$addRegisterClassIdAssignment$1(int,com.android.tools.r8.ir.conversion.IRBuilder):74:74 -> b
     2:2:void lambda$addConstantRegisterClassIdAssignment$2(int,int,com.android.tools.r8.ir.conversion.IRBuilder):81:81 -> b
-    3:3:void com.android.tools.r8.ir.conversion.IRBuilder.addIntConst(int,long):1252:1252 -> b
+    3:3:void com.android.tools.r8.ir.conversion.IRBuilder.addIntConst(int,long):1208:1208 -> b
     3:3:void lambda$addConstantRegisterClassIdAssignment$2(int,int,com.android.tools.r8.ir.conversion.IRBuilder):81 -> b
     1:1:void addConstantRegisterClassIdAssignment(int):79:79 -> i
     2:2:boolean com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint.hasClassIdField():53:53 -> i
@@ -36115,7 +35753,7 @@
     2:2:boolean com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint.hasClassIdField():53:53 -> k
     2:2:void prepareSingleConstructorInstructions():126 -> k
     3:6:void prepareSingleConstructorInstructions():127:130 -> k
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.Vm:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.xm:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> b
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> c
@@ -36128,7 +35766,6 @@
     17:19:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):99 -> a
     20:20:boolean com.android.tools.r8.horizontalclassmerging.MergeGroup.isNonTrivial():202:202 -> a
     20:20:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):207 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):99 -> a
     21:25:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):207:211 -> a
     21:25:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):99 -> a
@@ -36157,7 +35794,6 @@
     66:73:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):137:144 -> a
     74:74:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.AppView.app():220:220 -> a
     74:74:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):144 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     75:75:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):144:144 -> a
     76:76:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):143:143 -> a
     77:77:void lambda$run$0(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):129:129 -> a
@@ -36185,23 +35821,23 @@
     81:81:boolean lambda$createFieldAccessInfoCollectionModifier$3(com.android.tools.r8.graph.DexEncodedMethod):160:160 -> b
     82:82:void lambda$createFieldAccessInfoCollectionModifier$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):161:161 -> b
     83:90:boolean verifyNoCyclesInInterfaceHierarchies(java.util.Collection):243:250 -> b
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode -> com.android.tools.r8.internal.Um:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode -> com.android.tools.r8.internal.wm:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode INITIAL -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode FINAL -> c
     1:2:void <clinit>():30:31 -> <clinit>
     1:1:void <init>(java.lang.String,int):29:29 -> <init>
     1:1:boolean isFinal():38:38 -> a
     1:1:boolean isInitial():34:34 -> b
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerCfCode -> com.android.tools.r8.internal.Wm:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerCfCode -> com.android.tools.r8.internal.ym:
     1:1:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):26:26 -> <init>
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.Zm:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.Am:
     java.util.Map methodExtraParameters -> n
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> o
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1):30:30 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):42:44 -> <init>
     1:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):59:68 -> a
     1:10:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):73:82 -> b
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> b
     11:11:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):82 -> b
     12:17:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):80:85 -> b
     1:1:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):49:49 -> f
@@ -36210,8 +35846,7 @@
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> f
     3:3:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):136 -> f
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):49 -> f
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1 -> com.android.tools.r8.internal.Xm:
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.Ym:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.zm:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newMethodSignatures -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newFieldSignatures -> a
     java.util.Map methodExtraParameters -> d
@@ -36261,7 +35896,7 @@
     2:2:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):167 -> c
     3:3:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):172:172 -> c
     3:3:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):167 -> c
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerUtils -> com.android.tools.r8.internal.an:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerUtils -> com.android.tools.r8.internal.Bm:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:boolean isClassIdField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):14:17 -> a
@@ -36271,7 +35906,7 @@
     7:7:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexField):181:181 -> a
     7:7:boolean isClassIdField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):19 -> a
     8:8:boolean isClassIdField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):19:19 -> a
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.cn:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.Dm:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
@@ -36286,7 +35921,6 @@
     8:8:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses extend(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):36 -> a
     9:9:boolean com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.isEmpty():80:80 -> a
     9:9:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses extend(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):39 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.builder():28:28 -> a
     10:10:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses extend(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):42 -> a
     11:18:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses extend(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):43:50 -> a
@@ -36312,7 +35946,7 @@
     2:2:boolean hasBeenMergedOrIsMergeTarget(com.android.tools.r8.graph.DexType):89:89 -> d
     1:1:boolean isEmpty():80:80 -> e
     2:2:boolean isMergeTarget(com.android.tools.r8.graph.DexType):85:85 -> e
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.bn:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.Cm:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():107:107 -> <clinit>
@@ -36322,33 +35956,32 @@
     4:4:void lambda$addMergeGroup$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.DexProgramClass):118:118 -> a
     5:5:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder addMergeGroups(java.lang.Iterable):122:122 -> a
     6:6:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses build():127:127 -> a
-com.android.tools.r8.horizontalclassmerging.IRCodeProvider -> com.android.tools.r8.internal.wn:
+com.android.tools.r8.horizontalclassmerging.IRCodeProvider -> com.android.tools.r8.internal.bn:
     com.android.tools.r8.graph.AppView appViewForConversion -> a
     1:10:void <init>(com.android.tools.r8.graph.AppView):17:26 -> <init>
     1:3:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod):31:33 -> a
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis -> com.android.tools.r8.internal.Xp:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis -> com.android.tools.r8.internal.zp:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():36:36 -> <clinit>
     1:1:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):83:83 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):44 -> a
     2:73:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):45:116 -> a
-    74:74:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405:405 -> a
+    74:74:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409:409 -> a
     74:74:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):116 -> a
-    75:75:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    75:75:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405 -> a
+    75:75:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    75:75:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409 -> a
     75:75:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):116 -> a
     76:96:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):117:137 -> a
     97:107:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):68:78 -> a
-    108:108:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
+    108:108:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
     108:108:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):78 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     109:129:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):79:99 -> a
     130:219:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):61:150 -> a
     220:234:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):155:169 -> a
     235:235:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     235:235:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):171 -> a
     236:237:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):173:174 -> a
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription -> com.android.tools.r8.internal.Zp:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription -> com.android.tools.r8.internal.Bp:
     java.util.Map instanceFieldAssignmentsPre -> a
     java.util.Map instanceFieldAssignmentsPost -> b
     com.android.tools.r8.graph.DexTypeList relaxedParameters -> e
@@ -36370,33 +36003,32 @@
     86:88:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):188:190 -> a
     89:89:void com.android.tools.r8.cf.code.CfInstanceFieldWrite.<init>(com.android.tools.r8.graph.DexField):16:16 -> a
     89:89:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):190 -> a
-    90:90:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):190:190 -> a
-    91:92:void com.android.tools.r8.utils.IntBox.setMax(int):61:62 -> a
-    91:92:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):191 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    93:96:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):200:203 -> a
-    97:106:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):202:211 -> a
-    107:107:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
-    107:107:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):211 -> a
-    108:109:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):212:213 -> a
-    110:110:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
-    110:110:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):213 -> a
-    111:111:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):212:212 -> a
-    112:112:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleDexItemBasedStringValue():0:0 -> a
-    112:112:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):215 -> a
-    113:116:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):217:220 -> a
-    117:117:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):218:218 -> a
-    118:118:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    118:118:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):222 -> a
-    119:119:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):223:223 -> a
-    120:120:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():42:42 -> a
-    120:120:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):224 -> a
-    121:127:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):224:230 -> a
-    128:136:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):228:236 -> a
-    137:137:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):235:235 -> a
+    90:91:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):190:191 -> a
+    92:93:void com.android.tools.r8.utils.IntBox.setMax(int):61:62 -> a
+    92:93:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):191 -> a
+    94:97:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):200:203 -> a
+    98:107:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):202:211 -> a
+    108:108:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
+    108:108:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):211 -> a
+    109:110:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):212:213 -> a
+    111:111:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
+    111:111:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):213 -> a
+    112:112:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):212:212 -> a
+    113:113:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleDexItemBasedStringValue():0:0 -> a
+    113:113:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):215 -> a
+    114:117:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):217:220 -> a
+    118:118:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):218:218 -> a
+    119:119:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    119:119:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):222 -> a
+    120:120:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):223:223 -> a
+    121:121:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():42:42 -> a
+    121:121:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):224 -> a
+    122:128:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):224:230 -> a
+    129:137:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):228:236 -> a
+    138:138:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):235:235 -> a
     1:8:boolean equals(java.lang.Object):243:250 -> equals
     1:1:int hashCode():255:255 -> hashCode
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder -> com.android.tools.r8.internal.Yp:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder -> com.android.tools.r8.internal.Ap:
     java.util.Map instanceFieldAssignmentsPre -> c
     java.util.Map instanceFieldAssignmentsPost -> d
     java.util.List parentConstructorArguments -> f
@@ -36412,7 +36044,7 @@
     21:23:boolean addInvokeConstructor(com.android.tools.r8.graph.DexMethod,java.util.List):308:310 -> a
     24:25:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription build():317:318 -> a
     1:1:boolean isValid():327:327 -> b
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger -> com.android.tools.r8.internal.dq:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger -> com.android.tools.r8.internal.Fp:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> g
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -36449,78 +36081,80 @@
     61:62:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):329:330 -> a
     63:64:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):171:172 -> a
     63:64:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):330 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     65:70:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):332:337 -> a
-    71:71:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):187:187 -> a
-    71:71:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):336 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    72:72:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):343:343 -> a
-    73:73:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.isSingleton():297:297 -> a
-    73:73:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):344 -> a
-    74:87:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):344:357 -> a
-    88:95:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):356:363 -> a
-    96:96:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewAccessFlags():268:268 -> a
-    96:96:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):364 -> a
-    97:97:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):364:364 -> a
-    98:98:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():241:241 -> a
-    98:98:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):277 -> a
-    98:98:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    99:99:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131:131 -> a
-    99:99:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280 -> a
-    99:99:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    100:100:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():135:135 -> a
-    100:100:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131 -> a
-    100:100:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280 -> a
-    100:100:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    101:101:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131:131 -> a
-    101:101:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280 -> a
+    71:71:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):336:336 -> a
+    72:72:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):187:187 -> a
+    72:72:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):336 -> a
+    73:73:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):343:343 -> a
+    74:74:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.isSingleton():297:297 -> a
+    74:74:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):344 -> a
+    75:86:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):344:355 -> a
+    87:87:void com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter.<init>():20:20 -> a
+    87:87:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):355 -> a
+    88:90:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):355:357 -> a
+    91:98:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):356:363 -> a
+    99:99:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewAccessFlags():268:268 -> a
+    99:99:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):364 -> a
+    100:100:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):364:364 -> a
+    101:101:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():241:241 -> a
+    101:101:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):277 -> a
     101:101:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    102:102:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    102:102:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131 -> a
+    102:102:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131:131 -> a
     102:102:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280 -> a
     102:102:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    103:103:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280:280 -> a
+    103:103:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():135:135 -> a
+    103:103:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131 -> a
+    103:103:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280 -> a
     103:103:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    104:104:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):278:278 -> a
+    104:104:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131:131 -> a
+    104:104:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280 -> a
     104:104:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    105:105:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.isSingleton():297:297 -> a
-    105:105:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):286 -> a
+    105:105:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    105:105:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131 -> a
+    105:105:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280 -> a
     105:105:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    106:106:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):286:286 -> a
+    106:106:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280:280 -> a
     106:106:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    107:107:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():135:135 -> a
-    107:107:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):287 -> a
+    107:107:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):278:278 -> a
     107:107:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    108:110:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):287:289 -> a
-    108:110:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    111:111:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():155:155 -> a
-    111:111:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290 -> a
-    111:111:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    112:112:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():241:241 -> a
-    112:112:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():155 -> a
-    112:112:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290 -> a
-    112:112:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    113:118:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():155:160 -> a
-    113:118:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290 -> a
-    113:118:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    119:119:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():158:158 -> a
-    119:119:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290 -> a
-    119:119:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    120:120:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):292:292 -> a
-    120:120:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
-    121:121:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):365:365 -> a
-    122:126:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():95:99 -> a
-    122:126:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367 -> a
-    127:127:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():98:98 -> a
-    127:127:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367 -> a
-    128:137:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367:376 -> a
-    138:142:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):375:379 -> a
-    143:143:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):378:378 -> a
+    108:108:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.isSingleton():297:297 -> a
+    108:108:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):286 -> a
+    108:108:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    109:109:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):286:286 -> a
+    109:109:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    110:110:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():135:135 -> a
+    110:110:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):287 -> a
+    110:110:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    111:113:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):287:289 -> a
+    111:113:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    114:114:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():155:155 -> a
+    114:114:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290 -> a
+    114:114:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    115:115:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():241:241 -> a
+    115:115:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():155 -> a
+    115:115:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290 -> a
+    115:115:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    116:121:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():155:160 -> a
+    116:121:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290 -> a
+    116:121:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    122:122:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():158:158 -> a
+    122:122:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290 -> a
+    122:122:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    123:123:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):292:292 -> a
+    123:123:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    124:124:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):365:365 -> a
+    125:129:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():95:99 -> a
+    125:129:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367 -> a
+    130:130:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():98:98 -> a
+    130:130:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367 -> a
+    131:140:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367:376 -> a
+    141:145:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):375:379 -> a
+    146:146:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):378:378 -> a
     1:1:java.util.List getInstanceInitializers():90:90 -> b
     2:7:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):246:251 -> b
     8:22:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):247:261 -> b
     1:1:int size():166:166 -> c
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder -> com.android.tools.r8.internal.cq:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder -> com.android.tools.r8.internal.Ep:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> f
     java.util.List instanceInitializerGroups -> d
@@ -36533,9 +36167,8 @@
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):174:187 -> <init>
     1:2:void createNewGroup():191:192 -> a
     3:6:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):197:200 -> a
-    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():312:312 -> a
+    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():313:313 -> a
     7:7:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):200 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:14:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):200:206 -> a
     15:16:java.util.List build(com.android.tools.r8.horizontalclassmerging.MergeGroup):216:217 -> a
     17:17:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):220:220 -> a
@@ -36543,7 +36176,7 @@
     18:18:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):220 -> a
     19:22:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger buildSingle(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription):226:229 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder addEquivalent(com.android.tools.r8.graph.ProgramMethod):211:211 -> b
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection -> com.android.tools.r8.internal.eq:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection -> com.android.tools.r8.internal.Gp:
     java.util.List instanceInitializerMergers -> a
     java.util.Map equivalentInstanceInitializerMergers -> b
     1:3:void <init>(java.util.List,java.util.Map):34:36 -> <init>
@@ -36558,7 +36191,7 @@
     99:104:void lambda$create$5(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.graph.ProgramMethod):94:99 -> a
     105:105:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder lambda$create$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.graph.DexProto):97:97 -> a
     106:107:void forEach(java.util.function.Consumer):122:123 -> a
-com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.vE:
+com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.AD:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap instanceFieldMap -> e
     com.android.tools.r8.graph.DexProgramClass target -> d
     boolean $assertionsDisabled -> f
@@ -36573,7 +36206,6 @@
     2:2:boolean add(com.android.tools.r8.horizontalclassmerging.MergeGroup):68:68 -> a
     3:3:java.util.LinkedList com.android.tools.r8.horizontalclassmerging.MergeGroup.getClasses():101:101 -> a
     3:3:boolean add(com.android.tools.r8.horizontalclassmerging.MergeGroup):68 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean add(com.android.tools.r8.horizontalclassmerging.MergeGroup):68:68 -> a
     5:8:void forEachSource(java.util.function.Consumer):92:95 -> a
     9:10:com.android.tools.r8.graph.DexField getClassIdField():109:110 -> a
@@ -36606,15 +36238,13 @@
     8:17:void selectTarget(com.android.tools.r8.graph.AppView):176:185 -> b
     18:18:int com.android.tools.r8.graph.DexString.size():44:44 -> b
     18:18:void selectTarget(com.android.tools.r8.graph.AppView):185 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:void selectTarget(com.android.tools.r8.graph.AppView):185:185 -> b
-    20:20:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> b
-    20:20:void selectTarget(com.android.tools.r8.graph.AppView):189 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:21:void selectTarget(com.android.tools.r8.graph.AppView):189:189 -> b
-    22:23:void com.android.tools.r8.horizontalclassmerging.MergeGroup.setTarget(com.android.tools.r8.graph.DexProgramClass):193:194 -> b
-    22:23:void selectTarget(com.android.tools.r8.graph.AppView):189 -> b
-    24:24:boolean lambda$getSources$1(com.android.tools.r8.graph.DexProgramClass):144:144 -> b
+    19:23:void selectTarget(com.android.tools.r8.graph.AppView):185:189 -> b
+    24:24:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> b
+    24:24:void selectTarget(com.android.tools.r8.graph.AppView):189 -> b
+    25:25:void selectTarget(com.android.tools.r8.graph.AppView):189:189 -> b
+    26:27:void com.android.tools.r8.horizontalclassmerging.MergeGroup.setTarget(com.android.tools.r8.graph.DexProgramClass):193:194 -> b
+    26:27:void selectTarget(com.android.tools.r8.graph.AppView):189 -> b
+    28:28:boolean lambda$getSources$1(com.android.tools.r8.graph.DexProgramClass):144:144 -> b
     1:2:com.android.tools.r8.utils.collections.BidirectionalManyToOneMap getInstanceFieldMap():122:123 -> c
     1:1:void clear():78:78 -> clear
     1:1:boolean contains(java.lang.Object):83:83 -> contains
@@ -36651,23 +36281,23 @@
     1:1:int size():227:227 -> size
     1:1:java.lang.Object[] toArray():260:260 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):265:265 -> toArray
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.oG:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.lF:
     1:1:void <init>():9:9 -> <init>
     java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup) -> a
     com.android.tools.r8.horizontalclassmerging.MultiClassPolicy asMultiClassPolicy() -> a
     boolean isMultiClassPolicy() -> g
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing -> com.android.tools.r8.internal.pG:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing -> com.android.tools.r8.internal.mF:
     1:1:void <init>():11:11 -> <init>
     java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.lang.Object) -> a
     java.lang.Object preprocess(java.util.Collection,java.util.concurrent.ExecutorService) -> a
     com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing asMultiClassPolicyWithPreprocessing() -> b
     boolean isMultiClassPolicyWithPreprocessing() -> h
-com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.qG:
+com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.nF:
     1:1:void <init>():12:12 -> <init>
     java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass) -> a
     1:9:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):16:24 -> a
     10:10:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$0(java.lang.Object):20:20 -> a
-com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.qM:
+com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.lL:
     int numberOfRemovedInterfaces -> b
     boolean $assertionsDisabled -> c
     int numberOfRemovedClasses -> a
@@ -36675,11 +36305,10 @@
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.horizontalclassmerging.MultiClassPolicy asMultiClassPolicy() -> a
     1:2:java.util.Collection removeTrivialGroups(java.util.Collection):61:62 -> a
-    3:6:boolean recordRemovedClassesForDebugging(boolean,int,java.util.Collection):68:71 -> a
-    7:7:boolean com.android.tools.r8.horizontalclassmerging.MergeGroup.isNonTrivial():202:202 -> a
-    7:7:boolean recordRemovedClassesForDebugging(boolean,int,java.util.Collection):72 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:16:boolean recordRemovedClassesForDebugging(boolean,int,java.util.Collection):73:81 -> a
+    3:7:boolean recordRemovedClassesForDebugging(boolean,int,java.util.Collection):68:72 -> a
+    8:8:boolean com.android.tools.r8.horizontalclassmerging.MergeGroup.isNonTrivial():202:202 -> a
+    8:8:boolean recordRemovedClassesForDebugging(boolean,int,java.util.Collection):72 -> a
+    9:17:boolean recordRemovedClassesForDebugging(boolean,int,java.util.Collection):73:81 -> a
     com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing asMultiClassPolicyWithPreprocessing() -> b
     com.android.tools.r8.horizontalclassmerging.SingleClassPolicy asSingleClassPolicy() -> c
     void clear() -> d
@@ -36689,10 +36318,9 @@
     boolean isMultiClassPolicyWithPreprocessing() -> h
     boolean isSingleClassPolicy() -> i
     boolean shouldSkipPolicy() -> j
-com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.rM:
+com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.mL:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
-    1:1:void <init>():20:20 -> <init>
     1:8:void applySingleClassPolicy(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,java.util.LinkedList):23:30 -> a
     9:12:void applySingleClassPolicy(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,java.util.LinkedList):29:32 -> a
     13:13:boolean lambda$applySingleClassPolicy$0(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,com.android.tools.r8.graph.DexProgramClass):28:28 -> a
@@ -36709,7 +36337,7 @@
     1:1:void lambda$applyMultiClassPolicyWithPreprocessing$3(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.MergeGroup):67:67 -> b
     2:2:void com.android.tools.r8.horizontalclassmerging.MergeGroup.applyMetadataFrom(com.android.tools.r8.horizontalclassmerging.MergeGroup):58:58 -> b
     2:2:void lambda$applyMultiClassPolicyWithPreprocessing$3(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.MergeGroup):67 -> b
-com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools.r8.internal.sM:
+com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools.r8.internal.nL:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():63:63 -> <clinit>
     1:1:java.util.List getPolicies(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):71:71 -> a
@@ -36750,12 +36378,12 @@
     52:63:boolean verifySingleClassPoliciesIrrelevantForMergingSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):140:151 -> a
     64:70:boolean verifyPolicyOrderingConstraints(java.util.List):242:248 -> a
     71:71:boolean lambda$verifyPolicyOrderingConstraints$0(com.android.tools.r8.horizontalclassmerging.Policy):244:244 -> a
-com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.KV:
+com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.jU:
     1:1:void <init>():9:9 -> <init>
     boolean canMerge(com.android.tools.r8.graph.DexProgramClass) -> a
     com.android.tools.r8.horizontalclassmerging.SingleClassPolicy asSingleClassPolicy() -> c
     boolean isSingleClassPolicy() -> i
-com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.uY:
+com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.MW:
     java.util.Map subtypeMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Collection roots -> b
@@ -36765,31 +36393,27 @@
     2:2:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):52:52 -> a
     3:3:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.superClass(com.android.tools.r8.graph.DexProgramClass):44:44 -> a
     3:3:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):55 -> a
-    4:4:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
+    4:4:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
     4:4:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.superClass(com.android.tools.r8.graph.DexProgramClass):44 -> a
     4:4:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):55 -> a
-    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    5:5:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    5:5:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     5:5:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.superClass(com.android.tools.r8.graph.DexProgramClass):44 -> a
     5:5:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):55 -> a
-    6:6:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    6:6:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.superClass(com.android.tools.r8.graph.DexProgramClass):44 -> a
-    6:6:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):55 -> a
-    7:9:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):57:59 -> a
-    10:10:java.util.Collection getProgramRoots():64:64 -> a
-    11:11:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):73:73 -> a
-    12:12:java.util.Collection com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.getSubtypesFor(com.android.tools.r8.graph.DexProgramClass):68:68 -> a
-    12:12:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74 -> a
-    13:13:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74:74 -> a
-    14:14:void lambda$traverseNodeDepthFirst$1(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
+    6:8:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):57:59 -> a
+    9:9:java.util.Collection getProgramRoots():64:64 -> a
+    10:10:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):73:73 -> a
+    11:11:java.util.Collection com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.getSubtypesFor(com.android.tools.r8.graph.DexProgramClass):68:68 -> a
+    11:11:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74 -> a
+    12:12:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74:74 -> a
+    13:13:void lambda$traverseNodeDepthFirst$1(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
     1:1:java.util.List lambda$calculateSubtyping$0(com.android.tools.r8.graph.DexProgramClass):59:59 -> b
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.QY:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.hX:
     java.util.List syntheticClassTypes -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1):33:33 -> <init>
     2:3:void <init>(java.util.List):37:38 -> <init>
     1:1:java.util.List getArgumentClasses():42:42 -> a
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1 -> com.android.tools.r8.internal.OY:
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.PY:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.gX:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():45:45 -> <clinit>
@@ -36802,7 +36426,7 @@
     10:13:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.util.Collection):62:65 -> a
     14:17:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.util.Collection):64:67 -> a
     18:20:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.util.Collection):66:68 -> a
-com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.ZZ:
+com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.pY:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> g
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> i
@@ -36817,10 +36441,10 @@
     2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):54:70 -> <init>
     1:4:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):142:145 -> a
     5:13:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):144:152 -> a
-    14:14:com.android.tools.r8.graph.NestHostClassAttribute com.android.tools.r8.graph.TreeFixerBase.fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):264:264 -> a
+    14:14:com.android.tools.r8.graph.NestHostClassAttribute com.android.tools.r8.graph.TreeFixerBase.fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):273:273 -> a
     14:14:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):152 -> a
     15:16:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):152:153 -> a
-    17:26:java.util.List com.android.tools.r8.graph.TreeFixerBase.fixupNestMemberAttributes(java.util.List):270:279 -> a
+    17:26:java.util.List com.android.tools.r8.graph.TreeFixerBase.fixupNestMemberAttributes(java.util.List):279:288 -> a
     17:26:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):153 -> a
     27:27:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):153:153 -> a
     28:34:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):167:173 -> a
@@ -36829,7 +36453,10 @@
     36:49:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):177:190 -> a
     50:51:com.android.tools.r8.graph.DexTypeList fixupInterfaces(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexTypeList):249:250 -> a
     52:66:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):280:294 -> a
-    67:74:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):292:299 -> a
+    67:72:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):292:297 -> a
+    73:73:void com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter.<init>():20:20 -> a
+    73:73:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):297 -> a
+    74:74:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):299:299 -> a
     75:81:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):297:303 -> a
     82:99:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):302:319 -> a
     100:100:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
@@ -36857,30 +36484,28 @@
     219:219:boolean com.android.tools.r8.utils.ArrayUtils.isEmpty(java.lang.Object[]):51:51 -> a
     219:219:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):408 -> a
     220:234:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):412:426 -> a
-    235:235:java.lang.Object com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2196:2196 -> a
-    235:235:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):2227 -> a
-    235:235:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):422 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    236:236:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):2227:2227 -> a
+    235:235:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):422:422 -> a
+    236:236:java.lang.Object com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2196:2196 -> a
+    236:236:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):2227 -> a
     236:236:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):422 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    237:248:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):422:433 -> a
-    249:249:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> a
-    249:249:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):433 -> a
-    250:252:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):433:435 -> a
-    253:253:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):409:409 -> a
-    254:254:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):424:424 -> a
-    255:255:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):209:209 -> a
-    255:255:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):424 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    256:257:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):424:425 -> a
-    258:258:boolean lambda$fixupFields$7(java.util.Set,com.android.tools.r8.graph.DexField):425:425 -> a
-    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.TreeFixer.mapClassType(com.android.tools.r8.graph.DexType):444:444 -> a
-    259:259:com.android.tools.r8.graph.DexType lambda$fixupInterfaces$3(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexType):252 -> a
-    260:261:com.android.tools.r8.graph.DexType lambda$fixupInterfaces$3(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexType):253:254 -> a
-    262:262:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):450:450 -> a
-    263:263:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):456:456 -> a
-    264:264:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):462:462 -> a
+    237:237:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):2227:2227 -> a
+    237:237:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):422 -> a
+    238:249:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):422:433 -> a
+    250:250:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> a
+    250:250:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):433 -> a
+    251:253:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):433:435 -> a
+    254:254:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):409:409 -> a
+    255:255:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):424:424 -> a
+    256:256:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):209:209 -> a
+    256:256:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):424 -> a
+    257:258:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):424:425 -> a
+    259:259:boolean lambda$fixupFields$7(java.util.Set,com.android.tools.r8.graph.DexField):425:425 -> a
+    260:260:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.TreeFixer.mapClassType(com.android.tools.r8.graph.DexType):444:444 -> a
+    260:260:com.android.tools.r8.graph.DexType lambda$fixupInterfaces$3(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexType):252 -> a
+    261:262:com.android.tools.r8.graph.DexType lambda$fixupInterfaces$3(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexType):253:254 -> a
+    263:263:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):450:450 -> a
+    264:264:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):456:456 -> a
+    265:265:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):462:462 -> a
     1:11:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens fixupTypeReferences():127:137 -> b
     12:12:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$0(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):179:179 -> b
     13:18:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):196:201 -> b
@@ -36888,31 +36513,43 @@
     19:19:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):200 -> b
     20:31:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):207:218 -> b
     32:32:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):217:217 -> b
-    33:42:java.lang.String com.android.tools.r8.graph.DexItemFactory.createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2182:2191 -> b
-    33:42:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2238 -> b
-    33:42:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):2251 -> b
-    33:42:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):217 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    43:45:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2239:2241 -> b
-    43:45:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):2251 -> b
-    43:45:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):217 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    46:53:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):219:226 -> b
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexMember.getContextType():37:37 -> b
-    54:54:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):62 -> b
-    54:54:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):227 -> b
-    55:55:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):62:62 -> b
-    55:55:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):227 -> b
-    56:57:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):228:229 -> b
-    58:70:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):233:245 -> b
-    71:71:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$2(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):236:236 -> b
-    72:73:boolean lambda$fixupDirectMethod$5(java.util.Set,com.android.tools.r8.graph.DexMethod):307:308 -> b
-    74:74:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):444:444 -> b
+    33:33:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":53,"2":54,"3":55}}
+    53:53:java.lang.String com.android.tools.r8.graph.DexItemFactory.createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2182:2182 -> b
+    53:53:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2238 -> b
+    53:53:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):2251 -> b
+    53:53:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):217 -> b
+    54:54:java.lang.String com.android.tools.r8.graph.DexItemFactory.createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2182:2182 -> b
+    54:54:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2238 -> b
+    54:54:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):2251 -> b
+    54:54:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):217 -> b
+    55:55:java.lang.String com.android.tools.r8.graph.DexItemFactory.createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2182:2182 -> b
+    55:55:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2238 -> b
+    55:55:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):2251 -> b
+    55:55:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):217 -> b
+    34:37:java.lang.String com.android.tools.r8.graph.DexItemFactory.createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2188:2191 -> b
+    34:37:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2238 -> b
+    34:37:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):2251 -> b
+    34:37:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):217 -> b
+    38:40:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2239:2241 -> b
+    38:40:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):2251 -> b
+    38:40:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):217 -> b
+    41:48:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):219:226 -> b
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexMember.getContextType():37:37 -> b
+    49:49:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):62 -> b
+    49:49:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):227 -> b
+    50:50:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):62:62 -> b
+    50:50:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):227 -> b
+    51:52:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):228:229 -> b
+    56:68:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):233:245 -> b
+    69:69:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$2(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):236:236 -> b
+    70:71:boolean lambda$fixupDirectMethod$5(java.util.Set,com.android.tools.r8.graph.DexMethod):307:308 -> b
+    72:72:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):444:444 -> b
     1:6:void fixupProgramClassSuperTypes(com.android.tools.r8.graph.DexProgramClass):157:162 -> c
     7:7:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):173:173 -> c
     7:7:void fixupProgramClassSuperTypes(com.android.tools.r8.graph.DexProgramClass):162 -> c
     8:8:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$1(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:182 -> c
-com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.l30:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.x10:
     com.android.tools.r8.graph.DexMethod superMethod -> o
     boolean $assertionsDisabled -> p
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> m
@@ -36932,7 +36569,7 @@
     1:5:void handleReturn(int):101:105 -> i
     6:55:void prepareInstructions():111:160 -> i
     1:3:void addInvokeSuper():87:89 -> j
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.o30:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.A10:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
@@ -36965,34 +36602,32 @@
     54:54:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):309:309 -> a
     54:54:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.getNewMethodReference():148 -> a
     54:54:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):187 -> a
-    55:86:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):190:221 -> a
-    87:87:boolean lambda$isNop$6(com.android.tools.r8.graph.ProgramMethod):157:157 -> a
-    88:88:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):216:216 -> a
-    89:89:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1460:1460 -> a
-    89:89:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):216 -> a
-    90:90:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1453:1453 -> a
-    90:90:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1459 -> a
-    90:90:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):216 -> a
-    91:112:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):228:249 -> a
-    113:113:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):187:187 -> a
-    113:113:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):249 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    114:124:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):250:260 -> a
-    125:125:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    125:125:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):260 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    126:130:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):261:265 -> a
-    131:136:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):262:267 -> a
-    137:137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.getNewMethodReference():148:148 -> a
-    137:137:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):268 -> a
-    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):309:309 -> a
-    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.getNewMethodReference():148 -> a
-    138:138:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):268 -> a
-    139:162:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):269:292 -> a
-    163:163:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):187:187 -> a
-    163:163:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):296 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    164:164:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):298:298 -> a
+    55:91:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):190:226 -> a
+    92:92:boolean lambda$isNop$6(com.android.tools.r8.graph.ProgramMethod):157:157 -> a
+    93:93:void lambda$mergeTrivial$9(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):197:197 -> a
+    94:94:void lambda$mergeTrivial$10(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):221:221 -> a
+    95:95:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1460:1460 -> a
+    95:95:void lambda$mergeTrivial$10(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):221 -> a
+    96:96:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1453:1453 -> a
+    96:96:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1459 -> a
+    96:96:void lambda$mergeTrivial$10(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):221 -> a
+    97:118:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):233:254 -> a
+    119:119:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):187:187 -> a
+    119:119:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):254 -> a
+    120:130:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):255:265 -> a
+    131:131:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    131:131:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):265 -> a
+    132:136:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):266:270 -> a
+    137:142:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):267:272 -> a
+    143:143:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.getNewMethodReference():148:148 -> a
+    143:143:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):273 -> a
+    144:144:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):309:309 -> a
+    144:144:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.getNewMethodReference():148 -> a
+    144:144:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):273 -> a
+    145:172:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):274:301 -> a
+    173:173:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):187:187 -> a
+    173:173:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):301 -> a
+    174:174:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):303:303 -> a
     1:1:boolean lambda$getAccessFlags$1(com.android.tools.r8.graph.MethodAccessFlags):126:126 -> b
     2:3:boolean isNop():156:157 -> b
     4:4:boolean lambda$isTrivial$7(com.android.tools.r8.graph.ProgramMethod):173:173 -> b
@@ -37008,7 +36643,7 @@
     13:17:boolean isTrivial():173 -> d
     1:1:boolean lambda$getAccessFlags$4(com.android.tools.r8.graph.MethodAccessFlags):137:137 -> e
     1:1:boolean lambda$getAccessFlags$5(com.android.tools.r8.graph.MethodAccessFlags):140:140 -> f
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.n30:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.z10:
     java.util.List methods -> a
     1:2:void <init>():50:51 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
@@ -37016,7 +36651,7 @@
     3:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):61:79 -> a
     3:21:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):86 -> a
     22:22:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):87:87 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.android.tools.r8.internal.ia:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.android.tools.r8.internal.W9:
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():53:53 -> <clinit>
@@ -37035,15 +36670,14 @@
     39:39:com.android.tools.r8.androidapi.ComputedApiLevel lambda$getApiReferenceLevel$3(com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.ProgramMethod):107:107 -> a
     1:1:boolean isEmpty():73:73 -> b
     2:2:java.lang.Boolean lambda$getCode$1(com.android.tools.r8.graph.ProgramMethod):82:82 -> b
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$1 -> com.android.tools.r8.internal.ea:
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.fa:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.T9:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder classInitializers -> a
     1:1:void <clinit>():110:110 -> <clinit>
     1:3:void <init>():110:112 -> <init>
     1:3:void add(com.android.tools.r8.graph.ProgramMethod):115:117 -> a
     4:4:com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger build():121:121 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder -> com.android.tools.r8.internal.ga:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder -> com.android.tools.r8.internal.U9:
     com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger this$0 -> c
     int maxLocals -> b
     int maxStack -> a
@@ -37060,7 +36694,7 @@
     18:22:void lambda$buildInstructions$0(java.util.List,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):144 -> a
     23:38:void com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder.addCfCode(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):160:175 -> a
     23:38:void lambda$buildInstructions$0(java.util.List,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):144 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.ha:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.V9:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod syntheticMethodReference -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> d
@@ -37079,11 +36713,11 @@
     88:88:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):293:293 -> a
     89:89:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):298:298 -> a
     90:90:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):308:308 -> a
-    1:1:boolean computeEquals(java.lang.Object):278:278 -> g
     1:1:int computeHashCode():273:273 -> g0
+    1:1:boolean computeEquals(java.lang.Object):278:278 -> h
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():283:283 -> k0
     1:1:java.lang.String toString():303:303 -> toString
-com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.fe:
+com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.Hd:
     com.android.tools.r8.graph.DexField classIdField -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> g
     com.android.tools.r8.graph.DexMethod originalMethod -> e
@@ -37096,7 +36730,7 @@
     3:6:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):46:49 -> a
     boolean isHorizontalClassMergingCode() -> q0
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():35:35 -> t0
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.XY:
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.nX:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List methods -> c
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
@@ -37104,14 +36738,13 @@
     2:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,java.util.List):35:38 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider):43:43 -> a
     2:7:void convert(java.util.concurrent.ExecutorService):52:57 -> a
-    8:8:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):322:322 -> a
+    8:8:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):315:315 -> a
     8:8:void convert(java.util.concurrent.ExecutorService):57 -> a
     9:9:void convert(java.util.concurrent.ExecutorService):58:58 -> a
     10:12:void lambda$convert$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):61:63 -> a
     13:13:void lambda$convert$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):62:62 -> a
     14:14:boolean isEmpty():69:69 -> a
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$1 -> com.android.tools.r8.internal.VY:
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder -> com.android.tools.r8.internal.WY:
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder -> com.android.tools.r8.internal.mX:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List methods -> c
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
@@ -37120,7 +36753,7 @@
     3:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider):76:81 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder add(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
     2:2:com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter build():90:90 -> a
-com.android.tools.r8.horizontalclassmerging.code.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.m30:
+com.android.tools.r8.horizontalclassmerging.code.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.y10:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> f
     com.android.tools.r8.graph.DexMethod superMethod -> g
@@ -37148,19 +36781,19 @@
     1:1:java.lang.Boolean com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstantiated.getMergeKey(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():32:32 -> e
-com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses -> com.android.tools.r8.internal.q9:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses -> com.android.tools.r8.internal.g9:
     com.android.tools.r8.utils.InternalOptions options -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
     1:3:com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses.getMergeKey(com.android.tools.r8.graph.DexProgramClass):41:43 -> a
     1:3:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):14 -> a
     1:1:java.lang.String getName():29:29 -> e
     1:1:boolean shouldSkipPolicy():36:36 -> j
-com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.p9:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.f9:
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification NOT_ABSTRACT -> c
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification ABSTRACT -> b
     1:2:void <clinit>():17:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.CheckSyntheticClasses -> com.android.tools.r8.internal.G9:
+com.android.tools.r8.horizontalclassmerging.policies.CheckSyntheticClasses -> com.android.tools.r8.internal.w9:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> e
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> d
     1:3:void <init>(com.android.tools.r8.graph.AppView):19:21 -> <init>
@@ -37177,7 +36810,7 @@
     6:6:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
     6:6:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):29 -> a
     1:1:java.lang.String getName():37:37 -> e
-com.android.tools.r8.horizontalclassmerging.policies.FinalizeMergeGroup -> com.android.tools.r8.internal.wk:
+com.android.tools.r8.horizontalclassmerging.policies.FinalizeMergeGroup -> com.android.tools.r8.internal.bk:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> e
@@ -37190,7 +36823,7 @@
     18:19:void lambda$verifyAlreadyFinalized$2(java.util.Set,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):70:71 -> a
     1:9:boolean verifyAlreadyFinalized(com.android.tools.r8.horizontalclassmerging.MergeGroup):60:68 -> b
     1:1:java.lang.String getName():51:51 -> e
-com.android.tools.r8.horizontalclassmerging.policies.LimitClassGroups -> com.android.tools.r8.internal.SB:
+com.android.tools.r8.horizontalclassmerging.policies.LimitClassGroups -> com.android.tools.r8.internal.cB:
     boolean $assertionsDisabled -> e
     int maxGroupSize -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -37205,7 +36838,7 @@
     20:20:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):28:28 -> a
     1:1:java.lang.String getName():58:58 -> e
     boolean isIdentityForInterfaceGroups() -> f
-com.android.tools.r8.horizontalclassmerging.policies.LimitInterfaceGroups -> com.android.tools.r8.internal.TB:
+com.android.tools.r8.horizontalclassmerging.policies.LimitInterfaceGroups -> com.android.tools.r8.internal.dB:
     int maxGroupSize -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):22:23 -> <init>
     1:6:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):29:34 -> a
@@ -37218,7 +36851,7 @@
     25:25:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):35 -> a
     26:26:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):37:37 -> a
     1:1:java.lang.String getName():61:61 -> e
-com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts -> com.android.tools.r8.internal.tF:
+com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts -> com.android.tools.r8.internal.vE:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -37230,19 +36863,19 @@
     40:42:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63 -> a
     43:43:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63:63 -> a
     1:1:java.lang.String getName():76:76 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.fH:
+com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.cG:
     1:1:void <init>():10:10 -> <init>
-    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
+    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():18:18 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoCheckDiscard -> com.android.tools.r8.internal.gH:
+com.android.tools.r8.horizontalclassmerging.policies.NoCheckDiscard -> com.android.tools.r8.internal.dG:
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> d
     com.android.tools.r8.utils.InternalOptions options -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView):19:21 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26:26 -> a
     1:1:java.lang.String getName():31:31 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.hH:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.eG:
     1:1:void com.android.tools.r8.horizontalclassmerging.policies.AtMostOneClassThatMatchesPolicy.<init>():18:18 -> <init>
     1:1:void <init>():9 -> <init>
     1:2:java.util.Collection com.android.tools.r8.horizontalclassmerging.policies.AtMostOneClassThatMatchesPolicy.apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):23:24 -> a
@@ -37270,7 +36903,7 @@
     21:24:java.util.Collection com.android.tools.r8.horizontalclassmerging.policies.AtMostOneClassThatMatchesPolicy.apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.lang.String getName():18:18 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles -> com.android.tools.r8.internal.kH:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles -> com.android.tools.r8.internal.hG:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> g
     java.util.Map allGroups -> e
@@ -37317,7 +36950,7 @@
     1:1:void clear():263:263 -> d
     1:1:java.lang.String getName():268:268 -> e
     1:2:boolean shouldSkipPolicy():286:287 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer -> com.android.tools.r8.internal.jH:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer -> com.android.tools.r8.internal.gG:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles this$0 -> h
     java.util.Set seenClassInitializers -> c
@@ -37349,7 +36982,7 @@
     5:6:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer.clearSeen():316:317 -> c
     5:6:void trace():393 -> c
     1:4:void recordClassInitializerReachableFromTracingRoots(com.android.tools.r8.graph.DexProgramClass):343:346 -> d
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry -> com.android.tools.r8.internal.iH:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry -> com.android.tools.r8.internal.fG:
     com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer this$1 -> e
     1:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer,com.android.tools.r8.graph.ProgramMethod):409:410 -> <init>
     void registerCheckCast(com.android.tools.r8.graph.DexType,boolean) -> a
@@ -37369,10 +37002,10 @@
     26:26:void triggerClassInitializer(com.android.tools.r8.graph.DexProgramClass):469 -> a
     27:30:void triggerClassInitializer(com.android.tools.r8.graph.DexProgramClass):471:474 -> a
     31:32:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):487:488 -> a
-    33:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405:405 -> a
+    33:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409:409 -> a
     33:33:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):488 -> a
-    34:34:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    34:34:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405 -> a
+    34:34:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    34:34:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409 -> a
     34:34:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):488 -> a
     35:40:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):488:493 -> a
     41:41:void registerCallSite(com.android.tools.r8.graph.DexCallSite):575:575 -> a
@@ -37387,9 +37020,9 @@
     2:2:void registerInitClass(com.android.tools.r8.graph.DexType):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7,"2":8,"3":9}}
     7:7:void registerInitClass(com.android.tools.r8.graph.DexType):481:481 -> b
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> b
     8:8:void registerInitClass(com.android.tools.r8.graph.DexType):481 -> b
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> b
     9:9:void registerInitClass(com.android.tools.r8.graph.DexType):481 -> b
     3:3:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):421:421 -> b
     3:3:void registerInitClass(com.android.tools.r8.graph.DexType):482 -> b
@@ -37404,10 +37037,10 @@
     6:6:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):423 -> b
     6:6:void registerInitClass(com.android.tools.r8.graph.DexType):482 -> b
     10:11:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):499:500 -> b
-    12:12:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409:409 -> b
+    12:12:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):413:413 -> b
     12:12:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):500 -> b
-    13:13:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> b
-    13:13:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409 -> b
+    13:13:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> b
+    13:13:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):413 -> b
     13:13:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):500 -> b
     14:16:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):500:502 -> b
     17:19:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.fail():415:417 -> b
@@ -37415,10 +37048,10 @@
     void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField) -> c
     void registerInstanceOf(com.android.tools.r8.graph.DexType) -> c
     1:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):510:511 -> d
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):413:413 -> d
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):417:417 -> d
     3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):511 -> d
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> d
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):413 -> d
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> d
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):417 -> d
     4:4:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):511 -> d
     5:12:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):511:518 -> d
     13:13:boolean com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.isClassAlreadyInitializedInCurrentContext(com.android.tools.r8.graph.DexProgramClass):434:434 -> d
@@ -37431,9 +37064,9 @@
     17:17:void registerNewInstance(com.android.tools.r8.graph.DexType):0:0 -> d
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":22,"2":23,"3":24}}
     22:22:void registerNewInstance(com.android.tools.r8.graph.DexType):552:552 -> d
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> d
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> d
     23:23:void registerNewInstance(com.android.tools.r8.graph.DexType):552 -> d
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> d
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> d
     24:24:void registerNewInstance(com.android.tools.r8.graph.DexType):552 -> d
     18:18:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):421:421 -> d
     18:18:void registerNewInstance(com.android.tools.r8.graph.DexType):553 -> d
@@ -37448,9 +37081,8 @@
     21:21:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):423 -> d
     21:21:void registerNewInstance(com.android.tools.r8.graph.DexType):553 -> d
     1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):558:558 -> e
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> e
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> e
     2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):558 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):559:559 -> e
     4:4:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):421:421 -> e
     4:4:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):559 -> e
@@ -37466,20 +37098,20 @@
     7:7:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):559 -> e
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     1:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):525:526 -> f
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):417:417 -> f
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):421:421 -> f
     3:3:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):526 -> f
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> f
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):417 -> f
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> f
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):421 -> f
     4:4:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):526 -> f
     5:8:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):526:529 -> f
     9:9:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):626:626 -> f
     9:9:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):529 -> f
     10:13:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):528:531 -> f
     1:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):537:538 -> g
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):421:421 -> g
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):425:425 -> g
     3:3:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):538 -> g
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> g
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):421 -> g
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> g
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):425 -> g
     4:4:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):538 -> g
     5:9:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):538:542 -> g
     10:12:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.fail():415:417 -> g
@@ -37488,9 +37120,8 @@
     13:13:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):544 -> g
     14:14:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):545:545 -> g
     15:15:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):564:564 -> g
-    16:16:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> g
+    16:16:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> g
     16:16:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):564 -> g
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):565:565 -> g
     18:18:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):421:421 -> g
     18:18:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):565 -> g
@@ -37504,13 +37135,13 @@
     21:21:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexProgramClass):429:429 -> g
     21:21:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):423 -> g
     21:21:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):565 -> g
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.lH:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.iG:
     1:1:void <init>():16:16 -> <init>
     1:5:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):20:24 -> a
     6:7:boolean com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects.isKotlinLambda(com.android.tools.r8.graph.DexProgramClass):28:29 -> a
     6:7:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):24 -> a
     1:1:java.lang.String getName():34:34 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoConstructorCollisions -> com.android.tools.r8.internal.mH:
+com.android.tools.r8.horizontalclassmerging.policies.NoConstructorCollisions -> com.android.tools.r8.internal.jG:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> f
@@ -37520,22 +37151,22 @@
     2:2:java.lang.Object preprocess(java.util.Collection,java.util.concurrent.ExecutorService):42:42 -> a
     3:6:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Set):59:62 -> a
     7:7:boolean lambda$apply$0(java.util.Set,com.android.tools.r8.graph.DexProgramClass):61:61 -> a
-    8:8:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
-    8:8:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):115 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):115:115 -> a
-    10:14:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):114:118 -> a
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProto.getReturnType():62:62 -> a
-    15:15:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):118 -> a
-    16:16:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):118:118 -> a
-    17:17:com.android.tools.r8.graph.DexType lambda$rewriteProto$1(java.util.Map,com.android.tools.r8.graph.DexType):116:116 -> a
-    18:32:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.DexType,java.util.Map):129:143 -> a
+    8:8:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):115:115 -> a
+    9:9:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
+    9:9:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):115 -> a
+    10:10:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):115:115 -> a
+    11:15:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):114:118 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProto.getReturnType():62:62 -> a
+    16:16:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):118 -> a
+    17:17:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):118:118 -> a
+    18:18:com.android.tools.r8.graph.DexType lambda$rewriteProto$1(java.util.Map,com.android.tools.r8.graph.DexType):116:116 -> a
+    19:33:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.DexType,java.util.Map):129:143 -> a
     1:25:java.util.Set preprocess(java.util.Collection,java.util.concurrent.ExecutorService):72:96 -> b
     26:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.policies.NoConstructorCollisions.rewriteReference(com.android.tools.r8.graph.DexMethod,java.util.Map):122:122 -> b
     26:30:java.util.Set preprocess(java.util.Collection,java.util.concurrent.ExecutorService):96 -> b
     31:41:java.util.Set preprocess(java.util.Collection,java.util.concurrent.ExecutorService):97:107 -> b
     1:1:java.lang.String getName():149:149 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDeadEnumLiteMaps -> com.android.tools.r8.internal.nH:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadEnumLiteMaps -> com.android.tools.r8.internal.kG:
     java.util.Set deadEnumLiteMaps -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():17:17 -> <clinit>
@@ -37543,22 +37174,22 @@
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):26:26 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):32:32 -> a
     1:1:java.lang.String getName():37:37 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks -> com.android.tools.r8.internal.oH:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks -> com.android.tools.r8.internal.lG:
     com.android.tools.r8.graph.AppView appView -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):20:21 -> <init>
     1:1:boolean com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks.isSynchronizationClass(com.android.tools.r8.graph.DexProgramClass):25:25 -> a
     1:1:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):34 -> a
-    2:3:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1204:1205 -> a
+    2:3:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1213:1214 -> a
     2:3:boolean com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks.isSynchronizationClass(com.android.tools.r8.graph.DexProgramClass):25 -> a
     2:3:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):34 -> a
     4:4:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
-    4:4:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1205 -> a
+    4:4:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1214 -> a
     4:4:boolean com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks.isSynchronizationClass(com.android.tools.r8.graph.DexProgramClass):25 -> a
     4:4:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):34 -> a
     5:7:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):36:38 -> a
     8:32:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):31:55 -> a
     1:1:java.lang.String getName():62:62 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions -> com.android.tools.r8.internal.qH:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions -> com.android.tools.r8.internal.nG:
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):79:81 -> <init>
@@ -37613,13 +37244,13 @@
     1:1:boolean lambda$computeInheritedDefaultMethodsPerProgramType$6(com.android.tools.r8.graph.DexType):265:265 -> d
     1:1:java.lang.String getName():349:349 -> e
     1:1:boolean shouldSkipPolicy():354:354 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions$InterfaceInfo -> com.android.tools.r8.internal.pH:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions$InterfaceInfo -> com.android.tools.r8.internal.mG:
     java.util.Map inheritedDefaultMethods -> a
     java.util.Map defaultMethodsInheritedBySubclasses -> b
     1:3:void <init>(java.util.Map,java.util.Map):369:371 -> <init>
     1:1:java.util.Map getDefaultMethodsInheritedBySubclasses():379:379 -> a
     1:1:java.util.Map getInheritedDefaultMethods():375:375 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging -> com.android.tools.r8.internal.rH:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging -> com.android.tools.r8.internal.oG:
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> d
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):35:37 -> <init>
@@ -37636,7 +37267,7 @@
     33:33:void addClassToGroup(com.android.tools.r8.graph.DexProgramClass,java.util.Map):72:72 -> a
     1:1:java.lang.String getName():77:77 -> e
     1:1:boolean shouldSkipPolicy():82:82 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel -> com.android.tools.r8.internal.sH:
+com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel -> com.android.tools.r8.internal.pG:
     com.android.tools.r8.graph.AppView appView -> e
     boolean enableApiCallerIdentification -> f
     boolean $assertionsDisabled -> g
@@ -37657,7 +37288,7 @@
     5:9:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
     1:1:java.lang.String getName():36:36 -> e
     1:1:boolean shouldSkipPolicy():31:31 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.tH:
+com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.qG:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> f
     com.android.tools.r8.utils.InternalOptions options -> d
     boolean $assertionsDisabled -> g
@@ -37679,7 +37310,7 @@
     43:46:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):37:40 -> a
     1:1:java.lang.String getName():45:45 -> e
     1:1:boolean shouldSkipPolicy():50:50 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.uH:
+com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.rG:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> e
     com.android.tools.r8.graph.AppView appView -> d
     1:1:void <init>(com.android.tools.r8.graph.AppView):20:20 -> <init>
@@ -37688,12 +37319,12 @@
     5:17:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):46:58 -> a
     1:1:void clear():26:26 -> d
     1:1:java.lang.String getName():31:31 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoFailedResolutionTargets -> com.android.tools.r8.internal.vH:
+com.android.tools.r8.horizontalclassmerging.policies.NoFailedResolutionTargets -> com.android.tools.r8.internal.sG:
     java.util.Set failedResolutionHolders -> d
     1:4:void <init>(com.android.tools.r8.graph.AppView):21:24 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):35:35 -> a
     1:1:java.lang.String getName():30:30 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining -> com.android.tools.r8.internal.wH:
+com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining -> com.android.tools.r8.internal.tG:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -37708,7 +37339,7 @@
     20:20:boolean com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining.disallowInlining(com.android.tools.r8.graph.ProgramMethod):46 -> a
     20:20:boolean lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):57 -> a
     1:1:java.lang.String getName():62:62 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.xH:
+com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.uG:
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.shaking.RuntimeTypeCheckInfo runtimeTypeCheckInfo -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> f
@@ -37718,27 +37349,25 @@
     2:22:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):44:64 -> a
     23:23:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):59:59 -> a
     24:24:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):49:49 -> a
-    1:1:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):38:38 -> b
-    2:3:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.keepIf(java.util.function.Predicate):67:68 -> b
-    2:3:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):39 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.create(com.android.tools.r8.graph.DexType[]):51:51 -> b
-    4:4:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.keepIf(java.util.function.Predicate):69 -> b
-    4:4:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):39 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    5:11:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:168 -> b
-    5:11:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):40 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:2:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):38:39 -> b
+    3:4:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.keepIf(java.util.function.Predicate):67:68 -> b
+    3:4:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):39 -> b
+    5:5:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.create(com.android.tools.r8.graph.DexType[]):51:51 -> b
+    5:5:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.keepIf(java.util.function.Predicate):69 -> b
+    5:5:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):39 -> b
+    6:6:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):40:40 -> b
+    7:13:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:168 -> b
+    7:13:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):40 -> b
     1:1:java.lang.String getName():73:73 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.yH:
+com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.vG:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     1:1:java.lang.String getName():20:20 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.zH:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.wG:
     1:1:void <init>():11:11 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:16 -> a
     1:1:java.lang.String getName():25:25 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoInstanceInitializerMerging -> com.android.tools.r8.internal.AH:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceInitializerMerging -> com.android.tools.r8.internal.xG:
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> e
     boolean $assertionsDisabled -> f
@@ -37774,14 +37403,14 @@
     158:162:void lambda$setInstanceFieldMaps$4(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Map,com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap,com.android.tools.r8.graph.ProgramField):245:249 -> a
     1:1:java.lang.String getName():257:257 -> e
     boolean isIdentityForInterfaceGroups() -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.BH:
+com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.yG:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> d
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):19:21 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26:26 -> a
     1:1:java.lang.String getName():36:36 -> e
     1:1:boolean shouldSkipPolicy():31:31 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.CH:
+com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.zG:
     java.util.Set dontMergeTypes -> g
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> e
     com.android.tools.r8.graph.AppView appView -> d
@@ -37793,7 +37422,7 @@
     10:10:void processClass(com.android.tools.r8.graph.DexProgramClass):42:42 -> b
     11:19:void processClass(com.android.tools.r8.graph.DexProgramClass):40:48 -> b
     1:1:java.lang.String getName():59:59 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.DH:
+com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.AG:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -37803,26 +37432,26 @@
     4:4:boolean lambda$verifyNoUnexpectedKotlinMemberInfo$0(com.android.tools.r8.graph.DexEncodedMember):29:29 -> a
     1:3:boolean verifyNoUnexpectedKotlinMemberInfo(com.android.tools.r8.graph.DexProgramClass):28:28 -> b
     1:1:java.lang.String getName():35:35 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.EH:
+com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.BG:
     1:1:void <init>():12:12 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     2:2:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
     2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15 -> a
     1:1:java.lang.String getName():20:20 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.FH:
+com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.CG:
     com.android.tools.r8.graph.AppView appView -> d
     java.util.Set allServiceImplementations -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView):18:20 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25:26 -> a
     1:1:java.lang.String getName():31:31 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoVerticallyMergedClasses -> com.android.tools.r8.internal.GH:
+com.android.tools.r8.horizontalclassmerging.policies.NoVerticallyMergedClasses -> com.android.tools.r8.internal.DG:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():13:13 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):16:20 -> <init>
     1:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25:28 -> a
     1:1:java.lang.String getName():33:33 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoVirtualMethodMerging -> com.android.tools.r8.internal.HH:
+com.android.tools.r8.horizontalclassmerging.policies.NoVirtualMethodMerging -> com.android.tools.r8.internal.EG:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():33:33 -> <clinit>
@@ -37855,7 +37484,7 @@
     59:59:boolean hasNonAbstractDefinitionInSuperInterface(java.lang.Iterable,com.android.tools.r8.graph.ProgramMethod):118 -> a
     60:65:boolean lambda$hasNonAbstractDefinitionInSuperInterface$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):121:126 -> a
     1:1:java.lang.String getName():132:132 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoWeakerAccessPrivileges -> com.android.tools.r8.internal.IH:
+com.android.tools.r8.horizontalclassmerging.policies.NoWeakerAccessPrivileges -> com.android.tools.r8.internal.FG:
     com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph graph -> d
     java.util.Map stronglyConnectedComponentsCache -> i
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> e
@@ -37896,12 +37525,12 @@
     3:3:void lambda$getOrComputeNonPublicVirtualMethodSignaturesInComponent$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClass):161:161 -> c
     1:3:void clear():190:192 -> d
     1:1:java.lang.String getName():197:197 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.eI:
+com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.aH:
     com.android.tools.r8.graph.AppView appView -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
     1:1:java.lang.String getName():27:27 -> e
-com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces -> com.android.tools.r8.internal.WK:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces -> com.android.tools.r8.internal.SJ:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> g
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> e
@@ -37921,7 +37550,7 @@
     1:1:void clear():155:155 -> d
     1:1:java.lang.String getName():160:160 -> e
     1:1:boolean shouldSkipPolicy():170:170 -> j
-com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces$MergeGroupWithInfo -> com.android.tools.r8.internal.VK:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces$MergeGroupWithInfo -> com.android.tools.r8.internal.RJ:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     java.util.Set superInterfaces -> c
     java.util.Set subInterfaces -> d
@@ -37934,7 +37563,7 @@
     19:19:com.android.tools.r8.horizontalclassmerging.MergeGroup getGroup():208:208 -> a
     1:1:boolean lambda$add$1(com.android.tools.r8.graph.DexProgramClass):203:203 -> b
     2:19:boolean isSafeToAddSubAndSuperInterfaces(com.android.tools.r8.graph.DexProgramClass,java.util.Set,java.util.Set):216:233 -> b
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.YM:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.QL:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():30:30 -> <clinit>
@@ -37945,7 +37574,7 @@
     6:16:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):145:155 -> a
     17:17:boolean lambda$apply$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup):143:143 -> a
     1:1:java.lang.String getName():34:34 -> e
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.WM:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.OL:
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> c
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> a
     boolean isAssumeNoSideEffectsMethod -> b
@@ -37954,18 +37583,17 @@
     1:3:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):61:63 -> a
     4:4:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):794:794 -> a
     4:4:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):63 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):64:64 -> a
     1:5:boolean equals(java.lang.Object):81:85 -> equals
     1:6:int hashCode():69:69 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.XM:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.PL:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     java.util.Map methodMap -> b
     1:4:void <init>():101:104 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.MergeGroup getGroup():107:107 -> a
     2:16:boolean tryAdd(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):111:125 -> a
     17:17:boolean isSubjectToMethodMerging(com.android.tools.r8.graph.DexEncodedMethod):130:130 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions -> com.android.tools.r8.internal.hN:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions -> com.android.tools.r8.internal.YL:
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> e
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache interfaceDefaultMethodsCache -> f
@@ -37978,83 +37606,82 @@
     13:15:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions.computeReservedSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):147:149 -> a
     13:15:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):167 -> a
     16:20:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):168:172 -> a
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    21:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):58 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    21:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):58:58 -> a
     21:21:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):172 -> a
-    22:22:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):62:62 -> a
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
     22:22:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):58 -> a
     22:22:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):172 -> a
-    23:26:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):173:176 -> a
-    27:28:void com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature.addSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory):141:142 -> a
-    27:28:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):179 -> a
-    29:31:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):181:183 -> a
-    32:32:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$0(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature):181:181 -> a
+    23:23:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):62:62 -> a
+    23:23:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):58 -> a
+    23:23:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):172 -> a
+    24:27:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):173:176 -> a
+    28:29:void com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature.addSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory):141:142 -> a
+    28:29:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):179 -> a
+    30:32:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):181:183 -> a
+    33:33:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$0(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature):181:181 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache access$600(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):52:52 -> b
     1:1:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo access$700(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):52:52 -> c
     1:1:java.lang.String getName():66:66 -> e
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1 -> com.android.tools.r8.internal.ZM:
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DexClassSignaturesCache -> com.android.tools.r8.internal.aN:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DexClassSignaturesCache -> com.android.tools.r8.internal.RL:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> b
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):85:85 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):85:85 -> <init>
     1:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):88:89 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature -> com.android.tools.r8.internal.bN:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature -> com.android.tools.r8.internal.SL:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():139:139 -> <clinit>
     1:1:void <init>():139:139 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.cN:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.TL:
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):93:93 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):93:93 -> <init>
     1:2:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):97:98 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory -> com.android.tools.r8.internal.dN:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory -> com.android.tools.r8.internal.UL:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory KEEP_ABSENT -> c
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory CLASS_HIERARCHY_SAFE -> b
     1:2:void <clinit>():135:136 -> <clinit>
     1:1:void <init>(java.lang.String,int):134:134 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache -> com.android.tools.r8.internal.eN:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache -> com.android.tools.r8.internal.VL:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> c
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):102:102 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):102:102 -> <init>
     1:5:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):106:110 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.fN:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.WL:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> b
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):116:116 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):116:116 -> <init>
     1:1:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):116:116 -> a
     2:2:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):121:121 -> a
     3:6:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):120:123 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$SignaturesCache -> com.android.tools.r8.internal.gN:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$SignaturesCache -> com.android.tools.r8.internal.XL:
     java.util.Map memoizedSignatures -> a
     1:2:void <init>():69:70 -> <init>
     3:3:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):69:69 -> <init>
     void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet) -> a
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexClass):73:73 -> a
     2:3:com.android.tools.r8.utils.collections.DexMethodSignatureSet lambda$getOrComputeSignatures$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):76:77 -> a
-com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.DT:
+com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.fS:
     com.android.tools.r8.graph.AppView appView -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):28:29 -> <init>
-    1:1:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.graph.ProgramMethod):71:71 -> a
-    2:3:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):123:124 -> a
-    2:3:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.graph.ProgramMethod):72 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:9:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.graph.ProgramMethod):72:77 -> a
-    10:10:void tryFindRestrictedPackage(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Map):85:85 -> a
-    11:13:boolean lambda$tryFindRestrictedPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass):87:89 -> a
-    14:37:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):98:121 -> a
-    38:38:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$2(java.lang.String):105:105 -> a
-    39:39:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
-    39:39:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):34 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    40:41:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):43:44 -> a
-    42:42:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    42:42:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):44 -> a
-    43:45:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):49:51 -> a
-    46:46:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
-    46:46:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):52 -> a
-    47:67:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):59:79 -> a
+    1:1:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):34:34 -> a
+    2:2:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
+    2:2:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):34 -> a
+    3:4:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):43:44 -> a
+    5:5:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
+    5:5:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):44 -> a
+    6:8:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):49:51 -> a
+    9:9:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
+    9:9:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):52 -> a
+    10:30:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):59:79 -> a
+    31:32:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.graph.ProgramMethod):71:72 -> a
+    33:34:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):123:124 -> a
+    33:34:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.graph.ProgramMethod):72 -> a
+    35:40:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.graph.ProgramMethod):72:77 -> a
+    41:41:void tryFindRestrictedPackage(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Map):85:85 -> a
+    42:44:boolean lambda$tryFindRestrictedPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass):87:89 -> a
+    45:68:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):98:121 -> a
+    69:69:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$2(java.lang.String):105:105 -> a
     1:1:java.lang.String getName():127:127 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.UU:
+com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.mT:
     com.android.tools.r8.graph.AppView appView -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:4:com.android.tools.r8.FeatureSplit com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit.getMergeKey(com.android.tools.r8.graph.DexProgramClass):22:25 -> a
@@ -38063,14 +37690,14 @@
     5:5:com.android.tools.r8.FeatureSplit com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit.getMergeKey(com.android.tools.r8.graph.DexProgramClass):25 -> a
     5:5:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():30:30 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.WU:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.oT:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):26:28 -> <init>
     1:9:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields.getMergeKey(com.android.tools.r8.graph.DexProgramClass):33:41 -> a
     1:9:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):21 -> a
     1:1:java.lang.String getName():48:48 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.VU:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.nT:
     com.android.tools.r8.graph.DexType type -> b
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> a
     1:6:void <init>(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexType):56:61 -> <init>
@@ -38079,25 +37706,25 @@
     5:6:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo toInfoWithRelaxedType(com.android.tools.r8.graph.DexItemFactory):80:81 -> a
     1:5:boolean equals(java.lang.Object):86:90 -> equals
     1:1:int hashCode():95:95 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup -> com.android.tools.r8.internal.XU:
+com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup -> com.android.tools.r8.internal.pT:
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> d
     com.android.tools.r8.synthesis.SyntheticItems synthetics -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView):20:22 -> <init>
     1:2:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup.getMergeKey(com.android.tools.r8.graph.DexProgramClass):27:28 -> a
     1:2:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
     1:1:java.lang.String getName():34:34 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.YU:
+com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.qT:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):18:19 -> <init>
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.policies.SameNestHost.getMergeKey(com.android.tools.r8.graph.DexProgramClass):24:24 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):14 -> a
     1:1:java.lang.String getName():29:29 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.ZU:
+com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.rT:
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.policies.SameParentClass.getMergeKey(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):11 -> a
     1:1:java.lang.String getName():20:20 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.aZ:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.qX:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> e
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> d
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):25:27 -> <init>
@@ -38113,12 +37740,12 @@
     4:8:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy.getMergeKey(com.android.tools.r8.graph.DexProgramClass):34:38 -> a
     4:8:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
     1:1:java.lang.String getName():43:43 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.ZY:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.pX:
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind SYNTHETIC -> b
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind NOT_SYNTHETIC -> c
     1:2:void <clinit>():18:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):17:17 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.VerifyPolicyAlwaysSatisfied -> com.android.tools.r8.internal.A20:
+com.android.tools.r8.horizontalclassmerging.policies.VerifyPolicyAlwaysSatisfied -> com.android.tools.r8.internal.P00:
     com.android.tools.r8.horizontalclassmerging.SingleClassPolicy policy -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():10:10 -> <clinit>
@@ -38131,14 +37758,14 @@
     30:30:java.lang.String getName():26:26 -> e
     27:27:java.lang.String getName():26:26 -> e
     1:1:boolean shouldSkipPolicy():31:31 -> j
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation -> com.android.tools.r8.internal.JV:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation -> com.android.tools.r8.internal.iU:
     java.util.Map singleClinitCallers -> b
     com.android.tools.r8.utils.collections.ProgramMethodMap singleCallers -> a
     1:3:void <init>(com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.Map):42:44 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder builder(com.android.tools.r8.graph.AppView):48:48 -> a
     2:2:com.android.tools.r8.graph.ProgramMethod getSingleCaller(com.android.tools.r8.graph.ProgramMethod):52:52 -> a
     3:3:com.android.tools.r8.graph.ProgramMethod getSingleClassInitializerCaller(com.android.tools.r8.graph.DexProgramClass):56:56 -> a
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder -> com.android.tools.r8.internal.IV:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder -> com.android.tools.r8.internal.hU:
     java.util.Map clinitCallers -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.collections.ProgramMethodMap callers -> b
@@ -38151,7 +37778,7 @@
     13:13:void lambda$build$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):86:86 -> a
     14:14:void lambda$build$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,java.util.Optional):86:86 -> a
     15:15:void processMethod(com.android.tools.r8.graph.ProgramMethod):91:91 -> a
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor -> com.android.tools.r8.internal.HV:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor -> com.android.tools.r8.internal.gU:
     com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder this$0 -> f
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
@@ -38170,10 +37797,10 @@
     44:44:void triggerClassInitializer(com.android.tools.r8.graph.DexProgramClass):176 -> a
     45:49:java.util.Optional lambda$triggerClassInitializer$1(com.android.tools.r8.graph.DexProgramClass,java.util.Optional):168:172 -> a
     50:51:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):197:198 -> a
-    52:52:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405:405 -> a
+    52:52:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409:409 -> a
     52:52:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):198 -> a
-    53:53:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    53:53:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405 -> a
+    53:53:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    53:53:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409 -> a
     53:53:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):198 -> a
     54:55:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):198:199 -> a
     56:56:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexType.asProgramClass(com.android.tools.r8.graph.DexDefinitionSupplier):370:370 -> a
@@ -38184,9 +37811,9 @@
     2:2:void registerInitClass(com.android.tools.r8.graph.DexType):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7,"2":8,"3":9}}
     7:7:void registerInitClass(com.android.tools.r8.graph.DexType):181:181 -> b
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> b
     8:8:void registerInitClass(com.android.tools.r8.graph.DexType):181 -> b
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> b
     9:9:void registerInitClass(com.android.tools.r8.graph.DexType):181 -> b
     3:3:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):122:122 -> b
     3:3:void registerInitClass(com.android.tools.r8.graph.DexType):182 -> b
@@ -38202,10 +37829,10 @@
     6:6:void registerInitClass(com.android.tools.r8.graph.DexType):182 -> b
     void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField) -> c
     1:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):214:215 -> d
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405:405 -> d
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409:409 -> d
     3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):215 -> d
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> d
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405 -> d
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> d
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409 -> d
     4:4:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):215 -> d
     5:13:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):215:223 -> d
     14:14:boolean com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.isClassAlreadyInitializedInCurrentContext(com.android.tools.r8.graph.DexProgramClass):135:135 -> d
@@ -38217,9 +37844,9 @@
     17:17:void registerNewInstance(com.android.tools.r8.graph.DexType):0:0 -> d
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":22,"2":23,"3":24}}
     22:22:void registerNewInstance(com.android.tools.r8.graph.DexType):241:241 -> d
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> d
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> d
     23:23:void registerNewInstance(com.android.tools.r8.graph.DexType):241 -> d
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> d
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> d
     24:24:void registerNewInstance(com.android.tools.r8.graph.DexType):241 -> d
     18:18:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):122:122 -> d
     18:18:void registerNewInstance(com.android.tools.r8.graph.DexType):242 -> d
@@ -38234,9 +37861,8 @@
     21:21:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):124 -> d
     21:21:void registerNewInstance(com.android.tools.r8.graph.DexType):242 -> d
     1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):247:247 -> e
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> e
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> e
     2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):247 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):248:248 -> e
     4:4:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):122:122 -> e
     4:4:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):248 -> e
@@ -38254,9 +37880,8 @@
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):253:253 -> g
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> g
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> g
     2:2:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):253 -> g
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):254:254 -> g
     4:4:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):122:122 -> g
     4:4:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):254 -> g
@@ -38270,7 +37895,7 @@
     7:7:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexProgramClass):130:130 -> g
     7:7:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):124 -> g
     7:7:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):254 -> g
-com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.ra:
+com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.fa:
     com.android.tools.r8.graph.DexClass clazz -> a
     com.android.tools.r8.references.ClassReference reference -> b
     1:1:void <init>(com.android.tools.r8.graph.DexClass):20:20 -> <init>
@@ -38281,7 +37906,7 @@
     1:1:void forEachMethod(java.util.function.Consumer):45:45 -> forEachMethod
     1:4:com.android.tools.r8.references.ClassReference getClassReference():26:29 -> getClassReference
     1:2:java.lang.String getSourceFile():34:35 -> getSourceFile
-com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.Mj:
+com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.tj:
     com.android.tools.r8.graph.DexEncodedField field -> b
     com.android.tools.r8.inspector.internal.ClassInspectorImpl parent -> a
     com.android.tools.r8.references.FieldReference reference -> c
@@ -38292,14 +37917,14 @@
     1:4:java.util.Optional getInitialValue():47:50 -> getInitialValue
     1:1:boolean isFinal():42:42 -> isFinal
     1:1:boolean isStatic():37:37 -> isStatic
-com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.Mp:
+com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.op:
     java.util.Collection classes -> a
     1:2:void <init>(java.util.Collection):43:44 -> <init>
     1:6:java.util.List wrapInspections(java.util.Collection):20:25 -> a
     7:7:java.util.List wrapInspections(java.util.Collection):21:21 -> a
     8:13:void runInspections(java.util.List,java.util.Collection):32:37 -> a
     1:2:void forEachClass(java.util.function.Consumer):49:50 -> forEachClass
-com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.VE:
+com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.XD:
     com.android.tools.r8.inspector.internal.ClassInspectorImpl parent -> a
     com.android.tools.r8.references.MethodReference reference -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> b
@@ -38309,7 +37934,7 @@
     8:14:com.android.tools.r8.references.MethodReference getMethodReference():31:37 -> getMethodReference
     15:15:com.android.tools.r8.references.MethodReference getMethodReference():36:36 -> getMethodReference
     16:27:com.android.tools.r8.references.MethodReference getMethodReference():28:39 -> getMethodReference
-com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.s20:
+com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.H00:
     com.android.tools.r8.graph.DexValue value -> a
     com.android.tools.r8.graph.DexType type -> b
     1:3:void <init>(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType):34:36 -> <init>
@@ -38320,13 +37945,11 @@
     1:1:com.android.tools.r8.inspector.ByteValueInspector asByteValue():72 -> asByteValue
     2:2:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> asByteValue
     2:2:boolean com.android.tools.r8.inspector.internal.ValueInspectorImpl.isByteValue():67 -> asByteValue
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:com.android.tools.r8.inspector.ByteValueInspector asByteValue():72 -> asByteValue
     1:1:boolean com.android.tools.r8.inspector.internal.ValueInspectorImpl.isCharValue():83:83 -> asCharValue
     1:1:com.android.tools.r8.inspector.CharValueInspector asCharValue():88 -> asCharValue
     2:2:boolean com.android.tools.r8.graph.DexType.isCharType():288:288 -> asCharValue
     2:2:boolean com.android.tools.r8.inspector.internal.ValueInspectorImpl.isCharValue():83 -> asCharValue
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:com.android.tools.r8.inspector.CharValueInspector asCharValue():88 -> asCharValue
     1:1:boolean com.android.tools.r8.inspector.internal.ValueInspectorImpl.isDoubleValue():163:163 -> asDoubleValue
     1:1:com.android.tools.r8.inspector.DoubleValueInspector asDoubleValue():168 -> asDoubleValue
@@ -38340,7 +37963,6 @@
     1:1:com.android.tools.r8.inspector.ShortValueInspector asShortValue():104 -> asShortValue
     2:2:boolean com.android.tools.r8.graph.DexType.isShortType():292:292 -> asShortValue
     2:2:boolean com.android.tools.r8.inspector.internal.ValueInspectorImpl.isShortValue():99 -> asShortValue
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:com.android.tools.r8.inspector.ShortValueInspector asShortValue():104 -> asShortValue
     1:1:com.android.tools.r8.inspector.StringValueInspector asStringValue():184:184 -> asStringValue
     1:1:boolean com.android.tools.r8.inspector.internal.ValueInspectorImpl.isBooleanValue():51:51 -> getBooleanValue
@@ -38350,14 +37972,12 @@
     1:1:byte getByteValue():77 -> getByteValue
     2:2:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> getByteValue
     2:2:boolean com.android.tools.r8.inspector.internal.ValueInspectorImpl.isByteValue():67 -> getByteValue
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:byte getByteValue():77 -> getByteValue
     3:4:byte getByteValue():77:78 -> getByteValue
     1:1:boolean com.android.tools.r8.inspector.internal.ValueInspectorImpl.isCharValue():83:83 -> getCharValue
     1:1:char getCharValue():93 -> getCharValue
     2:2:boolean com.android.tools.r8.graph.DexType.isCharType():288:288 -> getCharValue
     2:2:boolean com.android.tools.r8.inspector.internal.ValueInspectorImpl.isCharValue():83 -> getCharValue
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:char getCharValue():93 -> getCharValue
     3:4:char getCharValue():93:94 -> getCharValue
     1:1:boolean com.android.tools.r8.inspector.internal.ValueInspectorImpl.isDoubleValue():163:163 -> getDoubleValue
@@ -38376,7 +37996,6 @@
     1:1:short getShortValue():109 -> getShortValue
     2:2:boolean com.android.tools.r8.graph.DexType.isShortType():292:292 -> getShortValue
     2:2:boolean com.android.tools.r8.inspector.internal.ValueInspectorImpl.isShortValue():99 -> getShortValue
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:short getShortValue():109 -> getShortValue
     3:4:short getShortValue():109:110 -> getShortValue
     1:2:java.lang.String getStringValue():189:190 -> getStringValue
@@ -38385,11 +38004,9 @@
     1:1:boolean isByteValue():67:67 -> isByteValue
     2:2:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> isByteValue
     2:2:boolean isByteValue():67 -> isByteValue
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean isCharValue():83:83 -> isCharValue
     2:2:boolean com.android.tools.r8.graph.DexType.isCharType():288:288 -> isCharValue
     2:2:boolean isCharValue():83 -> isCharValue
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean isDoubleValue():163:163 -> isDoubleValue
     1:1:boolean isFloatValue():147:147 -> isFloatValue
     1:1:boolean isIntValue():115:115 -> isIntValue
@@ -38398,111 +38015,110 @@
     1:1:boolean isShortValue():99:99 -> isShortValue
     2:2:boolean com.android.tools.r8.graph.DexType.isShortType():292:292 -> isShortValue
     2:2:boolean isShortValue():99 -> isShortValue
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean isStringValue():179:179 -> isStringValue
 com.android.tools.r8.internal.ApiLevelException$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.e2:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:6:java.lang.String com.android.tools.r8.ApiLevelException$$InternalSyntheticOutline$171$8070fe10555e1c79bfb7f4e2706650b727cc4dbc5f8918e1eca3a7095790ada6$0.m(java.lang.String,java.lang.String,java.lang.String):0:5 -> a
+    1:6:java.lang.String com.android.tools.r8.ApiLevelException$$InternalSyntheticOutline$131$8070fe10555e1c79bfb7f4e2706650b727cc4dbc5f8918e1eca3a7095790ada6$0.m(java.lang.String,java.lang.String,java.lang.String):0:5 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
 com.android.tools.r8.internal.ApiLevelException$$ExternalSyntheticOutline1 -> com.android.tools.r8.internal.f2:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:3:java.lang.StringBuilder com.android.tools.r8.ApiLevelException$$InternalSyntheticOutline$171$8070fe10555e1c79bfb7f4e2706650b727cc4dbc5f8918e1eca3a7095790ada6$1.m(java.lang.String):0:2 -> a
+    1:3:java.lang.StringBuilder com.android.tools.r8.ApiLevelException$$InternalSyntheticOutline$131$8070fe10555e1c79bfb7f4e2706650b727cc4dbc5f8918e1eca3a7095790ada6$1.m(java.lang.String):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
 com.android.tools.r8.internal.ApiReferenceStubber$ReferencesToApiLevelUseRegistry$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.i2:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:3:com.android.tools.r8.graph.DexType com.android.tools.r8.androidapi.ApiReferenceStubber$ReferencesToApiLevelUseRegistry$$InternalSyntheticOutline$171$fa4d2f1aaebefe56a72bd0d8d45ffdaa11db5a921b4ae78a58021043b9c16d22$0.m(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):0:2 -> a
+    1:3:com.android.tools.r8.graph.DexType com.android.tools.r8.androidapi.ApiReferenceStubber$ReferencesToApiLevelUseRegistry$$InternalSyntheticOutline$131$fa4d2f1aaebefe56a72bd0d8d45ffdaa11db5a921b4ae78a58021043b9c16d22$0.m(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.AppServices$Builder$DataResourceProviderVisitor$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.m2:
+com.android.tools.r8.internal.AppServices$Builder$DataResourceProviderVisitor$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.l2:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:3:java.lang.StringBuilder com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor$$InternalSyntheticOutline$171$1b9a9c3997290883e73a01d40bf4d3e6803f9ca951c5774170dba710a59428cb$0.m(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String):0:2 -> a
+    1:3:java.lang.StringBuilder com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor$$InternalSyntheticOutline$131$1b9a9c3997290883e73a01d40bf4d3e6803f9ca951c5774170dba710a59428cb$0.m(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.ApplicationReader$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.p2:
+com.android.tools.r8.internal.ApplicationReader$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.o2:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:4:java.lang.String com.android.tools.r8.dex.ApplicationReader$$InternalSyntheticOutline$171$9f54f232c90535949cbd79764f24cb98be32503bebdfcbf91538e9404314da22$0.m(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String):0:3 -> a
+    1:4:java.lang.String com.android.tools.r8.dex.ApplicationReader$$InternalSyntheticOutline$131$9f54f232c90535949cbd79764f24cb98be32503bebdfcbf91538e9404314da22$0.m(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String):0:3 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.ArchiveClassFileProvider$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.E2:
+com.android.tools.r8.internal.ArchiveClassFileProvider$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.D2:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:5:java.lang.String com.android.tools.r8.ArchiveClassFileProvider$$InternalSyntheticOutline$171$fcf1b6b975830033929cccf6ad2b54a77cab1d87d8c3fcbcd1f412b054bd8dde$0.m(java.lang.String,java.lang.String):0:4 -> a
+    1:5:java.lang.String com.android.tools.r8.ArchiveClassFileProvider$$InternalSyntheticOutline$131$fcf1b6b975830033929cccf6ad2b54a77cab1d87d8c3fcbcd1f412b054bd8dde$0.m(java.lang.String,java.lang.String):0:4 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.AvailableApiExceptions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.V3:
+com.android.tools.r8.internal.AvailableApiExceptions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.S3:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:6:void com.android.tools.r8.androidapi.AvailableApiExceptions$$InternalSyntheticOutline$171$20e6908fb16c2dd8ad959b1c1a6646d5062d52ffebb6111c792ca6515e114c85$0.m(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.util.Set,java.lang.String,java.lang.String):0:5 -> a
+    1:6:void com.android.tools.r8.androidapi.AvailableApiExceptions$$InternalSyntheticOutline$131$20e6908fb16c2dd8ad959b1c1a6646d5062d52ffebb6111c792ca6515e114c85$0.m(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.util.Set,java.lang.String,java.lang.String):0:5 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.BackportedMethodListCommand$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.X3:
+com.android.tools.r8.internal.BackportedMethodListCommand$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.U3:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:3:java.lang.String com.android.tools.r8.BackportedMethodListCommand$$InternalSyntheticOutline$171$7b25eb1be35d851e67f562f9da6a58cac1f92adedb289ac8c30b03bb2cd9fef7$0.m(java.lang.StringBuilder,java.lang.String,java.lang.String):0:2 -> a
+    1:3:java.lang.String com.android.tools.r8.BackportedMethodListCommand$$InternalSyntheticOutline$131$7b25eb1be35d851e67f562f9da6a58cac1f92adedb289ac8c30b03bb2cd9fef7$0.m(java.lang.StringBuilder,java.lang.String,java.lang.String):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.BackportedMethodListCommand$Builder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Y3:
+com.android.tools.r8.internal.BackportedMethodListCommand$Builder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.V3:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:5:java.lang.String com.android.tools.r8.BackportedMethodListCommand$Builder$$InternalSyntheticOutline$171$74531d99dd9e8c41302dc64bf7c1ad28bdce38f5e1cbae1669b2746d1cca7f73$0.m(java.lang.String,int):0:4 -> a
+    1:5:java.lang.String com.android.tools.r8.BackportedMethodListCommand$Builder$$InternalSyntheticOutline$131$74531d99dd9e8c41302dc64bf7c1ad28bdce38f5e1cbae1669b2746d1cca7f73$0.m(java.lang.String,int):0:4 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.BasicBlock$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.q4:
+com.android.tools.r8.internal.BasicBlock$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.n4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:3:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock$$InternalSyntheticOutline$171$b6dd67f260863294e1347834de9654f6bdbe9ba876ac452b76d49eee6a2321aa$0.m(com.android.tools.r8.ir.code.BasicBlock):0:2 -> a
+    1:3:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock$$InternalSyntheticOutline$131$b6dd67f260863294e1347834de9654f6bdbe9ba876ac452b76d49eee6a2321aa$0.m(com.android.tools.r8.ir.code.BasicBlock):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.BisectState$Range$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Z4:
+com.android.tools.r8.internal.BisectState$Range$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.W4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:3:java.lang.String com.android.tools.r8.bisect.BisectState$Range$$InternalSyntheticOutline$171$ce08529379ee2f531b289ce75fde83cc622d5b95d2bff129f3fff11db0ec6f8a$0.m(java.lang.StringBuilder,int,java.lang.String):0:2 -> a
+    1:3:java.lang.String com.android.tools.r8.bisect.BisectState$Range$$InternalSyntheticOutline$131$ce08529379ee2f531b289ce75fde83cc622d5b95d2bff129f3fff11db0ec6f8a$0.m(java.lang.StringBuilder,int,java.lang.String):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.CfConstClass$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.T6:
+com.android.tools.r8.internal.CfConstClass$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.O6:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:5:java.lang.String com.android.tools.r8.cf.code.CfConstClass$$InternalSyntheticOutline$171$37c66abd9d2a2dc03f27fba98790669ca793ab689546056e468f3d38bbb416c6$0.m(java.lang.String,com.android.tools.r8.graph.DexType):0:4 -> a
+    1:5:java.lang.String com.android.tools.r8.cf.code.CfConstClass$$InternalSyntheticOutline$131$37c66abd9d2a2dc03f27fba98790669ca793ab689546056e468f3d38bbb416c6$0.m(java.lang.String,com.android.tools.r8.graph.DexType):0:4 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.CfSourceCode$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.w8:
+com.android.tools.r8.internal.CfSourceCode$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.n8:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:6:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode$$InternalSyntheticOutline$171$438dbc8eceffdeb61d226aaaed697fac8e37ed1b14c877d9379a82f963ca1ee0$0.m(java.lang.String,int,java.lang.String):0:5 -> a
+    1:6:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode$$InternalSyntheticOutline$131$438dbc8eceffdeb61d226aaaed697fac8e37ed1b14c877d9379a82f963ca1ee0$0.m(java.lang.String,int,java.lang.String):0:5 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.CheckCast$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.s9:
+com.android.tools.r8.internal.CheckCast$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.i9:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:3:void com.android.tools.r8.code.CheckCast$$InternalSyntheticOutline$171$0cd8e795b91e7e03e2ae5dc62b9c7e88807c64648c0df57be3707207ae08afdb$0.m(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexType):0:2 -> a
+    1:3:void com.android.tools.r8.code.CheckCast$$InternalSyntheticOutline$131$0cd8e795b91e7e03e2ae5dc62b9c7e88807c64648c0df57be3707207ae08afdb$0.m(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexType):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.DexFileMergerHelper$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.yg:
+com.android.tools.r8.internal.DexFileMergerHelper$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.gg:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:3:java.lang.StringBuilder com.android.tools.r8.DexFileMergerHelper$$InternalSyntheticOutline$171$9c9cadf1489a20b6e2f21254b49c29d5709cced0f7609f978195acf1f013b7c9$0.m(java.lang.String):0:2 -> a
+    1:3:java.lang.StringBuilder com.android.tools.r8.DexFileMergerHelper$$InternalSyntheticOutline$131$9c9cadf1489a20b6e2f21254b49c29d5709cced0f7609f978195acf1f013b7c9$0.m(java.lang.String):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.DexOutputBuffer$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.bh:
+com.android.tools.r8.internal.DexOutputBuffer$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Jg:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:5:java.lang.StringBuilder com.android.tools.r8.dex.DexOutputBuffer$$InternalSyntheticOutline$171$2fa3327658a3747aa1eac19934d5e19eadcfd88a0fe905e3e2553d0deedbdab7$0.m(java.lang.String,int,java.lang.String):0:4 -> a
+    1:5:java.lang.StringBuilder com.android.tools.r8.dex.DexOutputBuffer$$InternalSyntheticOutline$131$2fa3327658a3747aa1eac19934d5e19eadcfd88a0fe905e3e2553d0deedbdab7$0.m(java.lang.String,int,java.lang.String):0:4 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.GenerateLintFiles$HTMLBuilder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Hl:
+com.android.tools.r8.internal.GenerateLintFiles$HTMLBuilder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.ll:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:3:java.lang.String com.android.tools.r8.GenerateLintFiles$HTMLBuilder$$InternalSyntheticOutline$171$ed6e21f6b1f6064d1f7d01ae8ade57a5452d19bf2d8e818564c5d5284e989760$0.m(java.lang.String,int,int):0:2 -> a
+    1:3:java.lang.String com.android.tools.r8.GenerateLintFiles$HTMLBuilder$$InternalSyntheticOutline$131$ed6e21f6b1f6064d1f7d01ae8ade57a5452d19bf2d8e818564c5d5284e989760$0.m(java.lang.String,int,int):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.Intrinsics$$ExternalSyntheticCheckNotZero0 -> com.android.tools.r8.internal.vu:
+com.android.tools.r8.internal.Intrinsics$$ExternalSyntheticCheckNotZero0 -> com.android.tools.r8.internal.Pt:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:1:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullNPE(java.lang.String):140:140 -> a
@@ -38515,18 +38131,18 @@
     14:14:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullNPE(java.lang.String):140:140 -> a
     14:14:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.checkNotNullParameter(java.lang.Object,java.lang.String):131 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.OptimizationFeedbackSimple$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.bL:
+com.android.tools.r8.internal.OptimizationFeedbackSimple$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.XJ:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple$$InternalSyntheticOutline$171$a48108f1a3c711dfb0c033791276613c3d23be8404938e273469161646a15533$0.m(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):0:2 -> a
+    1:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple$$InternalSyntheticOutline$131$a48108f1a3c711dfb0c033791276613c3d23be8404938e273469161646a15533$0.m(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.StatelessLibraryMethodModelCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.bX:
+com.android.tools.r8.internal.StatelessLibraryMethodModelCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.xV:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    void com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$$InternalSyntheticThrowCCEIfNotNull$48$a45cf4883edbf7d524f6dd82ceaf6eb6b32f4f6bf2ef1c90a926aae8bee744ee$0.m(java.lang.Object) -> a
+    void com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$$InternalSyntheticThrowCCEIfNotNull$61$a45cf4883edbf7d524f6dd82ceaf6eb6b32f4f6bf2ef1c90a926aae8bee744ee$0.m(java.lang.Object) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.Z9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.O9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis TRIVIAL -> e
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> c
@@ -38552,15 +38168,15 @@
     2:4:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.returnMarkingColor():227:229 -> b
     2:4:void notifyCodeHasChanged():218 -> b
     1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():94:94 -> c
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.internal.V9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.internal.K9:
     1:1:void <init>():67:67 -> <init>
     boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction) -> a
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.W9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.L9:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption INSTRUCTION_DOES_NOT_THROW -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption NONE -> c
     1:2:void <clinit>():57:58 -> <clinit>
     1:1:void <init>(java.lang.String,int):56:56 -> <init>
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.X9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.M9:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():233:233 -> <clinit>
     1:6:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):241:246 -> a
@@ -38602,12 +38218,12 @@
     208:208:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):521:521 -> a
     209:210:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):546:547 -> a
     211:232:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.List,java.util.Set,java.util.Deque):556:577 -> a
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.Y9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.N9:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY_OR_INDIRECTLY -> c
     1:2:void <clinit>():62:63 -> <clinit>
     1:1:void <init>(java.lang.String,int):61:61 -> <init>
-com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.Zf:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.Hf:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):22:23 -> a
@@ -38640,9 +38256,9 @@
     24:24:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67 -> a
     25:27:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):68:70 -> a
     28:28:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59:59 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.qp:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.So:
     1:15:java.util.Set computeInitializedClassesOnNormalExit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):40:54 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.pp:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.Ro:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set initializedClassesOnNormalExit -> c
     com.android.tools.r8.graph.ProgramMethod context -> b
@@ -38663,7 +38279,7 @@
     65:65:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance):160:160 -> a
     65:65:java.lang.Object visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance):57 -> a
     1:1:java.util.Set build():69:69 -> b
-com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.f10:
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.vZ:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.VerifyTypesHelper verifyTypesHelper -> b
     boolean $assertionsDisabled -> c
@@ -38686,7 +38302,7 @@
     34:36:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.Throw):117:119 -> a
     34:36:boolean check(com.android.tools.r8.ir.code.IRCode):57 -> a
     37:49:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):96:108 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.u20:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.J00:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -38736,35 +38352,34 @@
     145:145:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> a
     145:145:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):320 -> a
     146:160:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):321:335 -> a
-    161:165:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):1185:1189 -> a
+    161:165:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):1194:1198 -> a
     161:165:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):335 -> a
-    166:180:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):336:350 -> a
-    181:181:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
-    181:181:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):351 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    182:187:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):357:362 -> a
-    188:196:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):370:378 -> a
-    197:199:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock,java.util.Map):421:423 -> a
-    197:199:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):379 -> a
-    200:201:void com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.add(com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState):440:441 -> a
-    200:201:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock,java.util.Map):423 -> a
-    200:201:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):379 -> a
-    202:208:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):381:387 -> a
-    209:209:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.isTrackingValue(com.android.tools.r8.ir.code.Value):449:449 -> a
-    209:209:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):387 -> a
-    210:213:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.recordTrackedValueHasEscaped():453:456 -> a
-    210:213:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):388 -> a
-    214:214:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.hasTrackedValueEscaped():445:445 -> a
-    214:214:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):390 -> a
-    215:223:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):391:399 -> a
-    224:227:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.recordTrackedValueHasEscaped():453:456 -> a
-    224:227:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):400 -> a
-    228:228:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.hasTrackedValueEscaped():445:445 -> a
-    228:228:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):402 -> a
-    229:235:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):402:408 -> a
-    236:236:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.startTrackingValue(com.android.tools.r8.ir.code.Value):461:461 -> a
-    236:236:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):408 -> a
-    237:239:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):411:413 -> a
+    166:181:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):336:351 -> a
+    182:182:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
+    182:182:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):351 -> a
+    183:188:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):357:362 -> a
+    189:197:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):370:378 -> a
+    198:200:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock,java.util.Map):421:423 -> a
+    198:200:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):379 -> a
+    201:202:void com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.add(com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState):440:441 -> a
+    201:202:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock,java.util.Map):423 -> a
+    201:202:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):379 -> a
+    203:209:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):381:387 -> a
+    210:210:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.isTrackingValue(com.android.tools.r8.ir.code.Value):449:449 -> a
+    210:210:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):387 -> a
+    211:214:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.recordTrackedValueHasEscaped():453:456 -> a
+    211:214:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):388 -> a
+    215:215:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.hasTrackedValueEscaped():445:445 -> a
+    215:215:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):390 -> a
+    216:224:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):391:399 -> a
+    225:228:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.recordTrackedValueHasEscaped():453:456 -> a
+    225:228:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):400 -> a
+    229:229:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.hasTrackedValueEscaped():445:445 -> a
+    229:229:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):402 -> a
+    230:236:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):402:408 -> a
+    237:237:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.startTrackingValue(com.android.tools.r8.ir.code.Value):461:461 -> a
+    237:237:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):408 -> a
+    238:240:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):411:413 -> a
     1:5:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):274:278 -> b
     6:6:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):96:96 -> b
     6:6:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165 -> b
@@ -38778,7 +38393,7 @@
     8:8:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):278 -> b
     9:9:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165:165 -> b
     9:9:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):278 -> b
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.t20:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.I00:
     java.util.Set trackedValues -> b
     com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState EMPTY -> c
     boolean hasTrackedValueEscaped -> a
@@ -38786,21 +38401,21 @@
     1:6:void <init>():428:433 -> <init>
     1:1:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState empty():436:436 -> a
     2:2:boolean isTrackingValue(com.android.tools.r8.ir.code.Value):449:449 -> a
-com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.B20:
+com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.Q00:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):14:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.VerifyTypesHelper create(com.android.tools.r8.graph.AppView):19:19 -> a
     2:28:boolean isAssignable(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):23:49 -> a
-com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.internal.B5:
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.internal.y5:
     com.android.tools.r8.ir.analysis.constant.Bottom INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     1:1:com.android.tools.r8.ir.analysis.constant.Bottom getInstance():13:13 -> c
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.yd:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.ad:
     com.android.tools.r8.ir.code.ConstNumber value -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ConstNumber):11:12 -> <init>
     com.android.tools.r8.ir.analysis.constant.ConstLatticeElement asConst() -> a
@@ -38815,7 +38430,7 @@
     1:1:com.android.tools.r8.ir.code.ConstNumber getConstNumber():47:47 -> c
     1:1:int getIntValue():51:51 -> d
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.Dd:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.fd:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -38833,17 +38448,16 @@
     7:7:com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement):26:26 -> a
     8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement.getConstRange():44:44 -> a
     8:8:com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement):26 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:13:com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement):26:30 -> a
     com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement asConstRange() -> b
     1:1:com.android.tools.r8.ir.code.Value getConstRange():44:44 -> c
     1:1:java.lang.String toString():40:40 -> toString
-com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.iB:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.rA:
     1:1:void <init>():6:6 -> <init>
     com.android.tools.r8.ir.analysis.constant.ConstLatticeElement asConst() -> a
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement asConstRange() -> b
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.rW:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.QU:
     java.util.Deque ssaEdges -> d
     java.util.Map mapping -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -38976,14 +38590,14 @@
     172:177:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
     178:178:void com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation.addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):247:247 -> b
     178:178:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.IZ:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.YX:
     com.android.tools.r8.ir.analysis.constant.Top INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     1:1:com.android.tools.r8.ir.analysis.constant.Top getInstance():13:13 -> c
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.r20:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.G00:
     java.util.Map nodes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():27:27 -> <clinit>
@@ -38995,7 +38609,7 @@
     6:13:void com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph.mergeNodes(java.lang.Iterable):45:52 -> b
     6:13:void mergeStronglyConnectedComponents():62 -> b
     14:14:void mergeStronglyConnectedComponents():63:63 -> b
-com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.q20:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.F00:
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     com.android.tools.r8.ir.code.Value value -> a
@@ -39010,7 +38624,7 @@
     1:1:java.util.Set access$200(com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):68:68 -> c
     1:1:com.android.tools.r8.ir.code.Value access$300(com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):68:68 -> d
     1:12:void moveEdgesTo(com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):99:110 -> e
-com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.internal.x4:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.internal.u4:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     boolean $assertionsDisabled -> c
@@ -39069,7 +38683,7 @@
     1:7:boolean com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption.definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):180 -> b
     1:7:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):176 -> b
     8:8:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):176:176 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.bj:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.Ji:
     java.util.Deque valuesToTrack -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedValues -> c
@@ -39098,9 +38712,9 @@
     103:105:void addToWorklist(com.android.tools.r8.ir.code.Value):171:173 -> a
     1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):56:64 -> b
     10:10:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):214:214 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.cj:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.Ki:
     boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.vj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.dj:
     com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis fieldReadForInvokeReceiverAnalysis -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker -> b
@@ -39113,7 +38727,7 @@
     4:26:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):74:96 -> a
     27:32:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):95:100 -> a
     33:47:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):99:113 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.Ej:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.mj:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph fieldAccessGraph -> d
@@ -39138,126 +38752,119 @@
     8:9:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):227:228 -> a
     10:10:boolean com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.isClass():0:0 -> a
     10:10:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):231 -> a
-    11:14:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):231:234 -> a
-    15:15:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
-    15:15:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):235 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):234:234 -> a
-    17:28:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):197:208 -> a
-    29:29:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
-    29:29:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):210 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    30:31:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):210:211 -> a
-    32:36:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):208:212 -> a
-    37:39:void initialize():91:93 -> a
-    40:52:void lambda$initializeAbstractInstanceFieldValues$0(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexProgramClass,java.util.Set):110:122 -> a
-    53:53:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
-    53:53:void lambda$initializeAbstractInstanceFieldValues$0(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexProgramClass,java.util.Set):122 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    54:58:void lambda$initializeAbstractInstanceFieldValues$0(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexProgramClass,java.util.Set):123:127 -> a
-    59:59:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.ProgramField):132:132 -> a
-    60:60:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
-    60:60:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.ProgramField):132 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    61:63:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.ProgramField):133:135 -> a
-    64:64:com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.unknown():18:18 -> a
-    64:64:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.ProgramField):135 -> a
-    65:65:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.ProgramField):135:135 -> a
-    66:66:void acceptClassInitializerDefaultsResult(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):143:143 -> a
-    67:68:void lambda$acceptClassInitializerDefaultsResult$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):145:146 -> a
-    69:69:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
-    69:69:void lambda$acceptClassInitializerDefaultsResult$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):146 -> a
-    70:71:void lambda$acceptClassInitializerDefaultsResult$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):149:150 -> a
-    72:74:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):154:156 -> a
-    75:75:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleDexItemBasedStringValue():0:0 -> a
-    75:75:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):157 -> a
-    76:80:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):156:160 -> a
-    81:81:com.android.tools.r8.ir.analysis.type.NotNullDynamicType com.android.tools.r8.ir.analysis.type.DynamicType.definitelyNotNull():87:87 -> a
-    81:81:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):160 -> a
-    82:88:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):159:165 -> a
-    89:89:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    89:89:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):165 -> a
-    90:92:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):166:168 -> a
-    93:98:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):167:172 -> a
-    99:99:com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.unknown():18:18 -> a
-    99:99:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):176 -> a
-    100:101:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):182:183 -> a
-    102:102:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):192:192 -> a
-    103:103:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createZeroValue():49:49 -> a
-    103:103:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):192 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    104:104:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):192:192 -> a
-    105:105:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> a
-    105:105:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):192 -> a
-    106:108:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):193:193 -> a
-    109:116:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):240:247 -> a
-    117:117:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> a
-    117:117:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):247 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    118:160:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):250:292 -> a
-    161:166:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):289:294 -> a
-    167:167:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
-    167:167:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):294 -> a
-    168:175:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):294:301 -> a
-    176:189:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):298:311 -> a
-    190:190:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
-    190:190:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):311 -> a
-    191:215:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):311:335 -> a
-    216:216:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):340:340 -> a
-    216:216:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
-    217:217:com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.bottom():14:14 -> a
-    217:217:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):340 -> a
-    217:217:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
-    218:221:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):340:343 -> a
-    218:221:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
-    222:222:boolean com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.isClass():0:0 -> a
-    222:222:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):346 -> a
-    222:222:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
-    223:223:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
-    223:223:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):346 -> a
-    223:223:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
-    224:233:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):346:355 -> a
-    224:233:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
-    234:234:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60:60 -> a
-    234:234:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):355 -> a
-    234:234:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
-    235:235:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    235:235:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65 -> a
-    235:235:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60 -> a
-    235:235:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):355 -> a
-    235:235:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
-    236:236:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65:65 -> a
-    236:236:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60 -> a
-    236:236:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):355 -> a
-    236:236:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
-    237:245:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):356:364 -> a
-    237:245:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
-    246:246:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):370:370 -> a
-    247:247:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexClassAndField):1050:1050 -> a
-    247:247:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):370 -> a
-    248:256:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):371:379 -> a
-    257:257:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection.get(com.android.tools.r8.graph.DexClassAndField):42:42 -> a
-    257:257:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):379 -> a
-    258:263:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):380:385 -> a
-    264:264:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.AbstractValue.join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,com.android.tools.r8.graph.DexType):180:180 -> a
-    264:264:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):382 -> a
-    265:274:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):386:395 -> a
-    275:282:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):394:401 -> a
-    283:283:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
-    283:283:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):401 -> a
-    284:287:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):401:404 -> a
-    288:297:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):411:420 -> a
-    298:298:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
-    298:298:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):420 -> a
-    299:305:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):421:427 -> a
-    306:306:void lambda$recordAllAllocationsSitesProcessed$5(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):421:421 -> a
-    307:315:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):434:442 -> a
-    316:316:void lambda$waveDone$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass):439:439 -> a
+    11:15:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):231:235 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    16:16:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):235 -> a
+    17:17:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):234:234 -> a
+    18:31:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):197:210 -> a
+    32:32:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    32:32:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):210 -> a
+    33:34:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):210:211 -> a
+    35:39:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):208:212 -> a
+    40:42:void initialize():91:93 -> a
+    43:55:void lambda$initializeAbstractInstanceFieldValues$0(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexProgramClass,java.util.Set):110:122 -> a
+    56:56:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
+    56:56:void lambda$initializeAbstractInstanceFieldValues$0(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexProgramClass,java.util.Set):122 -> a
+    57:61:void lambda$initializeAbstractInstanceFieldValues$0(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexProgramClass,java.util.Set):123:127 -> a
+    62:62:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.ProgramField):132:132 -> a
+    63:63:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
+    63:63:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.ProgramField):132 -> a
+    64:66:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.ProgramField):133:135 -> a
+    67:67:com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.unknown():18:18 -> a
+    67:67:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.ProgramField):135 -> a
+    68:68:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.ProgramField):135:135 -> a
+    69:69:void acceptClassInitializerDefaultsResult(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):143:143 -> a
+    70:71:void lambda$acceptClassInitializerDefaultsResult$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):145:146 -> a
+    72:72:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
+    72:72:void lambda$acceptClassInitializerDefaultsResult$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):146 -> a
+    73:74:void lambda$acceptClassInitializerDefaultsResult$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):149:150 -> a
+    75:77:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):154:156 -> a
+    78:78:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleDexItemBasedStringValue():0:0 -> a
+    78:78:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):157 -> a
+    79:83:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):156:160 -> a
+    84:84:com.android.tools.r8.ir.analysis.type.NotNullDynamicType com.android.tools.r8.ir.analysis.type.DynamicType.definitelyNotNull():87:87 -> a
+    84:84:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):160 -> a
+    85:91:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):159:165 -> a
+    92:92:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    92:92:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):165 -> a
+    93:95:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):166:168 -> a
+    96:101:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):167:172 -> a
+    102:102:com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.unknown():18:18 -> a
+    102:102:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):176 -> a
+    103:104:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):182:183 -> a
+    105:105:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):192:192 -> a
+    106:106:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createZeroValue():49:49 -> a
+    106:106:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):192 -> a
+    107:107:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):192:192 -> a
+    108:108:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> a
+    108:108:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):192 -> a
+    109:111:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):193:193 -> a
+    112:119:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):240:247 -> a
+    120:120:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> a
+    120:120:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):247 -> a
+    121:163:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):250:292 -> a
+    164:169:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):289:294 -> a
+    170:170:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
+    170:170:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):294 -> a
+    171:178:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):294:301 -> a
+    179:192:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):298:311 -> a
+    193:193:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
+    193:193:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):311 -> a
+    194:218:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):311:335 -> a
+    219:219:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):340:340 -> a
+    219:219:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
+    220:220:com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.bottom():14:14 -> a
+    220:220:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):340 -> a
+    220:220:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
+    221:224:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):340:343 -> a
+    221:224:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
+    225:225:boolean com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.isClass():0:0 -> a
+    225:225:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):346 -> a
+    225:225:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
+    226:226:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
+    226:226:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):346 -> a
+    226:226:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
+    227:236:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):346:355 -> a
+    227:236:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
+    237:237:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60:60 -> a
+    237:237:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):355 -> a
+    237:237:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
+    238:238:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    238:238:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65 -> a
+    238:238:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60 -> a
+    238:238:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):355 -> a
+    238:238:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
+    239:239:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65:65 -> a
+    239:239:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60 -> a
+    239:239:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):355 -> a
+    239:239:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
+    240:248:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):356:364 -> a
+    240:248:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
+    249:249:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):370:370 -> a
+    250:250:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexClassAndField):1050:1050 -> a
+    250:250:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):370 -> a
+    251:259:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):371:379 -> a
+    260:260:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection.get(com.android.tools.r8.graph.DexClassAndField):42:42 -> a
+    260:260:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):379 -> a
+    261:266:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):380:385 -> a
+    267:267:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.AbstractValue.join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,com.android.tools.r8.graph.DexType):180:180 -> a
+    267:267:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):382 -> a
+    268:277:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):386:395 -> a
+    278:285:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):394:401 -> a
+    286:286:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
+    286:286:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):401 -> a
+    287:290:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):401:404 -> a
+    291:300:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):411:420 -> a
+    301:301:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
+    301:301:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):420 -> a
+    302:308:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):421:427 -> a
+    309:309:void lambda$recordAllAllocationsSitesProcessed$5(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):421:421 -> a
+    310:318:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):434:442 -> a
+    319:319:void lambda$waveDone$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass):439:439 -> a
     1:27:void initializeAbstractInstanceFieldValues():104:130 -> b
     28:28:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> b
     28:28:void initializeAbstractInstanceFieldValues():130 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.Cj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.kj:
     java.util.Map fieldWrites -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingFieldWrites -> b
     1:1:void <init>():454:454 -> <init>
@@ -39267,7 +38874,7 @@
     14:14:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):469:469 -> a
     15:16:void lambda$initialize$1(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):469:470 -> a
     17:24:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):477:484 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.Dj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.lj:
     java.util.Map objectAllocations -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingObjectAllocations -> b
     1:1:void <init>():501:501 -> <init>
@@ -39276,7 +38883,7 @@
     3:6:void lambda$initialize$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set):508:511 -> a
     7:7:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):509:509 -> a
     8:15:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):517:524 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.Fj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.nj:
     1:1:void <init>():16:16 -> <init>
     1:9:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):20:28 -> a
     10:18:int com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis.computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):34:42 -> a
@@ -39288,7 +38895,7 @@
     20:30:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29 -> a
     31:31:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29:29 -> a
     32:48:boolean isOnlyUsedToUpdateFieldValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexEncodedField):66:82 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis -> com.android.tools.r8.internal.Xj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis -> com.android.tools.r8.internal.Ej:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -39298,7 +38905,7 @@
     2:3:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):39:40 -> a
     4:4:java.util.Set com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis.getMethods(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):50:50 -> a
     4:4:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):40 -> a
-    5:8:boolean com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis.enqueueUsersForAnalysis(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):84:87 -> a
+    5:8:boolean com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis.enqueueUsersForAnalysis(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):85:88 -> a
     5:8:java.util.Set com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis.getMethods(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):51 -> a
     5:8:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):40 -> a
     9:12:java.util.Set com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis.getMethods(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):54:57 -> a
@@ -39308,7 +38915,7 @@
     13:13:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):40 -> a
     14:14:java.util.Set com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis.getMethods(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):58:58 -> a
     14:14:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):40 -> a
-    15:18:boolean com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis.enqueueUsersForAnalysis(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):84:87 -> a
+    15:18:boolean com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis.enqueueUsersForAnalysis(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):85:88 -> a
     15:18:java.util.Set com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis.getMethods(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):58 -> a
     15:18:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):40 -> a
     19:28:java.util.Set com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis.getMethods(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):62:71 -> a
@@ -39320,7 +38927,7 @@
     30:30:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):40 -> a
     31:35:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):41:45 -> a
     36:36:void lambda$recordFieldAccess$0(java.util.Set,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):46:46 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis -> com.android.tools.r8.internal.Yj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis -> com.android.tools.r8.internal.Fj:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):24:25 -> <init>
     1:7:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder):32:38 -> a
@@ -39336,7 +38943,7 @@
     29:29:boolean isValueOnlyUsedToWriteField(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramField):51:51 -> a
     30:33:boolean com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis.enqueueUsersForAnalysis(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):75:78 -> a
     30:33:boolean isValueOnlyUsedToWriteField(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramField):51 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.h00:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.xY:
     java.util.Set nonConstantFields -> g
     java.util.Map dependencies -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -39387,7 +38994,6 @@
     94:94:com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$FieldClassification classifyField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):193:193 -> a
     95:95:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
     95:95:com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$FieldClassification classifyField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):193 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     96:96:com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$FieldClassification classifyField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):195:195 -> a
     97:97:boolean com.android.tools.r8.graph.FieldAccessInfo.isAccessedFromMethodHandle():38:38 -> a
     97:97:com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$FieldClassification classifyField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):196 -> a
@@ -39401,7 +39007,6 @@
     134:135:void lambda$processFieldsNeverRead$2(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AbstractAccessContexts):236:237 -> a
     136:136:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
     136:136:void lambda$processFieldsNeverRead$2(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AbstractAccessContexts):237 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     137:139:void lambda$processFieldsNeverRead$2(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AbstractAccessContexts):237:239 -> a
     140:142:void lambda$processFieldsNeverRead$2(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AbstractAccessContexts):238:240 -> a
     143:145:void lambda$processFieldsNeverWritten$4(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AbstractAccessContexts):255:257 -> a
@@ -39409,7 +39014,6 @@
     149:151:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):266:268 -> a
     152:152:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
     152:152:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):268 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     153:159:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):270:276 -> a
     160:160:boolean com.android.tools.r8.graph.FieldAccessInfo.isAccessedFromMethodHandle():38:38 -> a
     160:160:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):277 -> a
@@ -39418,7 +39022,6 @@
     168:168:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):284 -> a
     169:169:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):74:74 -> a
     169:169:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):170 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     169:169:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):284 -> a
     170:175:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):284:289 -> a
     1:1:java.util.Map access$100(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):47:47 -> b
@@ -39435,70 +39038,75 @@
     1:1:java.util.Set access$400(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):47:47 -> e
     1:1:java.util.Set access$500(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):47:47 -> f
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$600(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):47:47 -> g
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.g00:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.wY:
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():308:308 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor,com.android.tools.r8.graph.ProgramMethod):310:311 -> <init>
     void registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
     1:12:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):319:330 -> a
-    13:27:boolean com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.isUnusedReadAfterMethodStaticizing(com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):371:385 -> a
-    13:27:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):336 -> a
-    28:33:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):338:343 -> a
-    34:34:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    34:34:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):352 -> a
-    35:40:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):352:357 -> a
-    41:44:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.destroyFieldAccessContexts(com.android.tools.r8.graph.DexEncodedField):426:429 -> a
-    41:44:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):360 -> a
-    45:47:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):364:366 -> a
-    48:48:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.recordAccessThatCannotBeOptimized(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexEncodedField):394:394 -> a
-    48:48:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):331 -> a
-    49:49:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    49:49:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.recordAccessThatCannotBeOptimized(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexEncodedField):395 -> a
-    49:49:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):331 -> a
-    50:50:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.recordAccessThatCannotBeOptimized(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexEncodedField):395:395 -> a
+    13:13:boolean com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.isUnusedReadAfterMethodStaticizing(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):372:372 -> a
+    13:13:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):336 -> a
+    14:14:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
+    14:14:boolean com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.isUnusedReadAfterMethodStaticizing(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):373 -> a
+    14:14:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):336 -> a
+    15:29:boolean com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.isUnusedReadAfterMethodStaticizing(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):373:387 -> a
+    15:29:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):336 -> a
+    30:35:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):338:343 -> a
+    36:36:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    36:36:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):352 -> a
+    37:42:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):352:357 -> a
+    43:46:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.destroyFieldAccessContexts(com.android.tools.r8.graph.DexEncodedField):428:431 -> a
+    43:46:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):360 -> a
+    47:49:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):364:366 -> a
+    50:50:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.recordAccessThatCannotBeOptimized(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexEncodedField):396:396 -> a
     50:50:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):331 -> a
-    51:54:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.destroyFieldAccessContexts(com.android.tools.r8.graph.DexEncodedField):426:429 -> a
-    51:54:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.recordAccessThatCannotBeOptimized(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexEncodedField):396 -> a
-    51:54:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):331 -> a
-    55:58:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):404:407 -> a
-    59:59:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> a
-    59:59:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):407 -> a
-    60:62:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):409:411 -> a
-    63:63:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> a
-    63:63:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):411 -> a
-    64:65:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):411:412 -> a
-    66:66:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
-    66:66:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):413 -> a
-    67:71:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):415:419 -> a
-    72:72:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
-    72:72:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):419 -> a
-    73:74:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):419:420 -> a
-    75:75:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
-    75:75:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):420 -> a
-    76:78:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):420:422 -> a
-    79:79:com.android.tools.r8.graph.AbstractAccessContexts lambda$recordFieldAccessContext$0(com.android.tools.r8.graph.DexEncodedField):410:410 -> a
-    80:80:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):434:434 -> a
-    81:82:void registerInstanceFieldReadInstruction(com.android.tools.r8.code.CfOrDexInstanceFieldRead):440:441 -> a
-    83:84:void registerStaticFieldReadInstruction(com.android.tools.r8.code.CfOrDexStaticFieldRead):457:458 -> a
+    51:51:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    51:51:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.recordAccessThatCannotBeOptimized(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexEncodedField):397 -> a
+    51:51:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):331 -> a
+    52:52:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.recordAccessThatCannotBeOptimized(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexEncodedField):397:397 -> a
+    52:52:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):331 -> a
+    53:56:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.destroyFieldAccessContexts(com.android.tools.r8.graph.DexEncodedField):428:431 -> a
+    53:56:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.recordAccessThatCannotBeOptimized(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexEncodedField):398 -> a
+    53:56:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):331 -> a
+    57:60:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):406:409 -> a
+    61:61:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> a
+    61:61:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):409 -> a
+    62:64:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):411:413 -> a
+    65:65:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> a
+    65:65:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):413 -> a
+    66:67:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):413:414 -> a
+    68:68:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
+    68:68:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):415 -> a
+    69:73:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):417:421 -> a
+    74:74:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
+    74:74:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):421 -> a
+    75:76:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):421:422 -> a
+    77:77:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
+    77:77:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):422 -> a
+    78:80:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):422:424 -> a
+    81:81:com.android.tools.r8.graph.AbstractAccessContexts lambda$recordFieldAccessContext$0(com.android.tools.r8.graph.DexEncodedField):412:412 -> a
+    82:82:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):436:436 -> a
+    83:84:void registerInstanceFieldReadInstruction(com.android.tools.r8.code.CfOrDexInstanceFieldRead):442:443 -> a
+    85:86:void registerStaticFieldReadInstruction(com.android.tools.r8.code.CfOrDexStaticFieldRead):459:460 -> a
     void registerInitClass(com.android.tools.r8.graph.DexType) -> b
     void registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
     void registerInstanceOf(com.android.tools.r8.graph.DexType) -> c
-    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):446:446 -> c
+    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):448:448 -> c
     void registerInvokeStatic(com.android.tools.r8.graph.DexMethod) -> d
     void registerNewInstance(com.android.tools.r8.graph.DexType) -> d
-    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):451:451 -> e
+    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):453:453 -> e
     void registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> f
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):463:463 -> g
-com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState -> com.android.tools.r8.internal.E5:
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):465:465 -> g
+com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState -> com.android.tools.r8.internal.B5:
     com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):23:23 -> a
     1:1:com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState getInstance():18:18 -> e
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState -> com.android.tools.r8.internal.Vc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState -> com.android.tools.r8.internal.xc:
     1:1:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):20:20 -> <init>
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState asArray() -> a
     1:1:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState create(com.android.tools.r8.ir.analysis.value.AbstractValue):24:24 -> a
@@ -39508,13 +39116,12 @@
     4:5:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):40:41 -> a
     6:6:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.AbstractValue.joinReference(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory):188:188 -> a
     6:6:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):41 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):41:41 -> a
     8:8:boolean com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState.isEffectivelyUnknown():46:46 -> a
     8:8:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):42 -> a
     9:9:com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.unknown():18:18 -> a
     9:9:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):42 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState -> com.android.tools.r8.internal.Yc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState -> com.android.tools.r8.internal.Ac:
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> b
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):20:21 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState create(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):25:25 -> a
@@ -39524,7 +39131,6 @@
     4:5:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.ProgramField):49:50 -> a
     6:6:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.AbstractValue.joinReference(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory):188:188 -> a
     6:6:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.ProgramField):50 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:12:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.ProgramField):50:55 -> a
     13:13:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.ProgramField):54:54 -> a
     14:14:boolean com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState.isEffectivelyUnknown():60:60 -> a
@@ -39533,10 +39139,10 @@
     15:15:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.ProgramField):56 -> a
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState asClass() -> b
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():31:31 -> e
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteFieldState -> com.android.tools.r8.internal.ad:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteFieldState -> com.android.tools.r8.internal.Cc:
     1:1:void <init>():8:8 -> <init>
     boolean isConcrete() -> d
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState -> com.android.tools.r8.internal.kd:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState -> com.android.tools.r8.internal.Mc:
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> a
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):15:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState create(com.android.tools.r8.ir.analysis.value.AbstractValue):20:20 -> a
@@ -39550,25 +39156,24 @@
     7:7:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory):45:45 -> a
     8:8:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.AbstractValue.joinPrimitive(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory):184:184 -> a
     8:8:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory):45 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory):45:45 -> a
     10:10:boolean com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState.isEffectivelyUnknown():50:50 -> a
     10:10:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory):46 -> a
     11:11:com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.unknown():18:18 -> a
     11:11:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory):46 -> a
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState asPrimitive() -> c
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteReferenceTypeFieldState -> com.android.tools.r8.internal.nd:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteReferenceTypeFieldState -> com.android.tools.r8.internal.Pc:
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> a
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):15:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):21:21 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState -> com.android.tools.r8.internal.hk:
+com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState -> com.android.tools.r8.internal.Nj:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState asArray() -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory) -> a
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState asClass() -> b
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState asPrimitive() -> c
     boolean isConcrete() -> d
-com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState -> com.android.tools.r8.internal.F10:
+com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState -> com.android.tools.r8.internal.VZ:
     com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -39581,11 +39186,11 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> a
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet fixupReadSetAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
-    com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
+    com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isEmpty() -> c
     boolean isKnownFieldSet() -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.fd:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.Hc:
     java.util.Set fields -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():21:21 -> <clinit>
@@ -39600,20 +39205,18 @@
     5:15:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet fixupReadSetAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):77:87 -> a
     16:16:com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet.addAll(com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet):38:38 -> a
     16:16:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet fixupReadSetAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):93:93 -> a
+    17:17:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):93:93 -> a
     18:18:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet.isEmpty():113:113 -> a
-    18:18:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):93 -> a
-    19:25:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):93:99 -> a
-    26:26:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
-    26:26:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):99 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    27:27:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):100:100 -> a
+    18:18:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):93 -> a
+    19:25:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):93:99 -> a
+    26:26:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
+    26:26:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):99 -> a
+    27:27:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):100:100 -> a
     28:28:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
-    28:28:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):100 -> a
-    29:31:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):101:103 -> a
+    28:28:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):100 -> a
+    29:31:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):101:103 -> a
     32:32:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet.add(com.android.tools.r8.graph.DexEncodedField):34:34 -> a
-    32:32:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):106 -> a
+    32:32:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):106 -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     1:1:void add(com.android.tools.r8.graph.DexEncodedField):34:34 -> b
     1:1:boolean isEmpty():113:113 -> c
@@ -39621,13 +39224,13 @@
     1:5:boolean equals(java.lang.Object):131:135 -> equals
     1:1:int hashCode():123:123 -> hashCode
     1:1:int size():118:118 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.Oh:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.yh:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:3:void <clinit>():15:17 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
-    com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
+    com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
     1:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet fixupReadSetAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):48:71 -> a
     25:25:void lambda$fixupReadSetAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet,int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):56:56 -> a
     26:26:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
@@ -39637,7 +39240,7 @@
     boolean isEmpty() -> c
     boolean isKnownFieldSet() -> d
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():22:22 -> e
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.jk:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Pj:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> e
@@ -39727,13 +39330,13 @@
     55:55:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():285 -> c
     56:80:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():286:310 -> c
     1:4:com.android.tools.r8.ir.code.DominatorTree getOrCreateDominatorTree():69:72 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.ik:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.Oj:
     com.android.tools.r8.ir.code.Instruction instruction -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo instanceFieldInitializationInfo -> b
     1:3:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):44:46 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction access$000(com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo):38:38 -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo access$100(com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo):38:38 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.Vp:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.xp:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexClassAndMethod parentConstructor -> k
     com.android.tools.r8.ir.code.InvokeDirect parentConstructorCall -> l
@@ -39762,35 +39365,37 @@
     74:74:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:119 -> a
     74:74:void analyzeForwardingConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Value):145 -> a
     75:80:void analyzeForwardingConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Value):153:158 -> a
-    81:85:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):1185:1189 -> a
+    81:85:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):1194:1198 -> a
     81:85:void analyzeForwardingConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Value):158 -> a
     86:92:void analyzeForwardingConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Value):158:164 -> a
     93:104:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):197:208 -> a
     105:105:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.code.Value.getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1154:1154 -> a
     105:105:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):208 -> a
     106:112:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):209:215 -> a
-    113:113:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
-    113:113:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):277 -> a
+    113:113:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):277:277 -> a
     113:113:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):182 -> a
-    114:114:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):280:280 -> a
+    114:114:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
+    114:114:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):277 -> a
     114:114:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):182 -> a
-    115:118:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):183:186 -> a
-    119:119:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):227:227 -> a
-    119:119:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185 -> a
-    120:120:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):226:226 -> a
+    115:115:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):280:280 -> a
+    115:115:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):182 -> a
+    116:119:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):183:186 -> a
+    120:120:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):227:227 -> a
     120:120:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185 -> a
-    121:122:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):188:189 -> a
-    123:123:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):59:59 -> a
-    123:123:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):189 -> a
+    121:121:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):226:226 -> a
+    121:121:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185 -> a
+    122:123:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):188:189 -> a
+    124:124:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):59:59 -> a
+    124:124:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):189 -> a
     1:1:boolean isSubjectToOptimizationIgnoringPinning(com.android.tools.r8.graph.DexEncodedField):128:128 -> b
     2:3:void recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):220:221 -> b
     4:4:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):59:59 -> b
     4:4:void recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):221 -> b
     1:11:void analyzeParentConstructorCall():169:179 -> e
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.ez:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.vy:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> a
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.dX:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.zV:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder -> i
     boolean $assertionsDisabled -> k
     java.util.Map computedValues -> j
@@ -39823,7 +39428,6 @@
     57:57:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):152:152 -> a
     58:58:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
     58:58:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):152 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     59:64:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):153:158 -> a
     65:71:void updateFieldOptimizationInfoWith2Values(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexValue):167:173 -> a
     72:74:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):177:179 -> a
@@ -39919,7 +39523,7 @@
     94:94:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):364:364 -> c
     94:94:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):284 -> c
     95:136:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):287:328 -> c
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.jX:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.FV:
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues asEnumStaticFieldValues() -> a
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder(com.android.tools.r8.graph.DexProgramClass):26:26 -> a
@@ -39927,25 +39531,25 @@
     2:2:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder(com.android.tools.r8.graph.DexProgramClass):26 -> a
     3:3:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues.builder():114:114 -> a
     3:3:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder(com.android.tools.r8.graph.DexProgramClass):26 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.eX:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.AV:
     1:1:void <init>():29:29 -> <init>
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build() -> a
     void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.gX:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.CV:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues INSTANCE -> a
     1:1:void <clinit>():105:105 -> <clinit>
     1:1:void <init>():107:107 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues getInstance():110:110 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.fX:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.BV:
     1:1:void <init>():117:117 -> <init>
     void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory) -> a
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():127:127 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.iX:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.EV:
     com.android.tools.r8.com.google.common.collect.ImmutableMap enumAbstractValues -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):42:43 -> <init>
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues asEnumStaticFieldValues() -> a
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectStateForPossiblyPinnedField(com.android.tools.r8.graph.DexField):100:100 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.hX:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.DV:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder enumObjectStateBuilder -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue valuesCandidateAbstractValue -> b
     boolean $assertionsDisabled -> c
@@ -39960,13 +39564,13 @@
     12:19:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):66:73 -> a
     20:20:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):72:72 -> a
     21:26:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():80:85 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.E10:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.UZ:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet fixupReadSetAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
-    com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
+    com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
     boolean isEmpty() -> c
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet getInstance():21:21 -> e
 com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState -> com.android.tools.r8.internal.o1:
@@ -39976,21 +39580,21 @@
 com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction -> com.android.tools.r8.internal.r1:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.Be:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.ge:
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult asSuccessfulAnalysisResult() -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.ze:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.ee:
     1:1:void <init>():65:65 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.Ae:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.fe:
     java.util.Map blockExitStates -> a
     1:2:void <init>(java.util.Map):41:42 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult asSuccessfulAnalysisResult() -> a
     1:2:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join():47:48 -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.sj:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.aj:
     1:1:void <init>():16:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState():20:20 -> a
     boolean isFailedTransferResult() -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.uu:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.Ot:
     java.util.Map blockExitStates -> c
     java.util.Map blockEntryStatesCache -> d
     boolean $assertionsDisabled -> e
@@ -40001,42 +39605,41 @@
     2:12:void <init>(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction):35:45 -> <init>
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.Timing):53:53 -> a
     2:20:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):57:75 -> a
-    21:21:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueSuccessorWithUniquePredecessor():212:212 -> a
+    21:21:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueSuccessorWithUniquePredecessor():213:213 -> a
     21:21:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):77 -> a
     22:28:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):78:84 -> a
     29:29:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.setBlockExitState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):114:114 -> a
     29:29:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):88 -> a
-    30:30:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueSuccessorWithUniquePredecessor():212:212 -> a
+    30:30:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueSuccessorWithUniquePredecessor():213:213 -> a
     30:30:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.setBlockExitState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):114 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:30:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):88 -> a
-    31:32:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.setBlockExitState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):114:115 -> a
-    31:32:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):88 -> a
-    33:34:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState.isGreaterThanOrEquals(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):16:17 -> a
-    33:34:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.setBlockExitState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):116 -> a
-    33:34:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):88 -> a
-    35:36:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.setBlockExitState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):116:117 -> a
-    35:36:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):88 -> a
-    37:37:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):89:89 -> a
-    38:38:void com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.updateBlockEntryStateCacheForSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):121:121 -> a
-    38:38:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):94 -> a
-    39:39:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.shouldCacheBlockEntryStateFor(com.android.tools.r8.ir.code.BasicBlock):131:131 -> a
-    39:39:void com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.updateBlockEntryStateCacheForSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):122 -> a
+    31:33:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.setBlockExitState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):114:116 -> a
+    31:33:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):88 -> a
+    34:35:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState.isGreaterThanOrEquals(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):16:17 -> a
+    34:35:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.setBlockExitState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):116 -> a
+    34:35:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):88 -> a
+    36:37:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.setBlockExitState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):116:117 -> a
+    36:37:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):88 -> a
+    38:38:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):89:89 -> a
+    39:39:void com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.updateBlockEntryStateCacheForSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):121:121 -> a
     39:39:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):94 -> a
-    40:42:void com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.updateBlockEntryStateCacheForSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):123:125 -> a
-    40:42:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):94 -> a
-    43:43:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):96:96 -> a
-    44:44:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.shouldCacheBlockEntryStateFor(com.android.tools.r8.ir.code.BasicBlock):131:131 -> a
-    44:44:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock):100 -> a
-    44:44:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState lambda$run$0(com.android.tools.r8.ir.code.BasicBlock):64 -> a
-    45:51:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock):101:107 -> a
-    45:51:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState lambda$run$0(com.android.tools.r8.ir.code.BasicBlock):64 -> a
-    52:54:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock):106:108 -> a
-    52:54:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState lambda$run$0(com.android.tools.r8.ir.code.BasicBlock):64 -> a
+    40:40:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.shouldCacheBlockEntryStateFor(com.android.tools.r8.ir.code.BasicBlock):131:131 -> a
+    40:40:void com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.updateBlockEntryStateCacheForSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):122 -> a
+    40:40:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):94 -> a
+    41:43:void com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.updateBlockEntryStateCacheForSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):123:125 -> a
+    41:43:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):94 -> a
+    44:44:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):96:96 -> a
+    45:45:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.shouldCacheBlockEntryStateFor(com.android.tools.r8.ir.code.BasicBlock):131:131 -> a
+    45:45:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock):100 -> a
+    45:45:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState lambda$run$0(com.android.tools.r8.ir.code.BasicBlock):64 -> a
+    46:52:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock):101:107 -> a
+    46:52:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState lambda$run$0(com.android.tools.r8.ir.code.BasicBlock):64 -> a
+    53:55:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock):106:108 -> a
+    53:55:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState lambda$run$0(com.android.tools.r8.ir.code.BasicBlock):64 -> a
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):49:49 -> b
     2:2:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.run(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.Timing):53:53 -> b
     2:2:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):49 -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.WZ:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.mY:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> a
     boolean isFailedTransferResult() -> b
     boolean isAbstractState() -> c
@@ -40046,7 +39649,7 @@
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
     boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod) -> a
-com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint -> com.android.tools.r8.internal.Ui:
+com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint -> com.android.tools.r8.internal.Di:
     boolean value -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -40062,10 +39665,9 @@
     24:26:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):58:60 -> a
     27:27:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():82:82 -> a
     27:27:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):60 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     28:28:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):60:60 -> a
     29:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):66:66 -> a
-com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.Vi:
+com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.Ei:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(int,long):10:10 -> <init>
@@ -40074,13 +39676,13 @@
     4:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27:27 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createEqualToNumberConstraint(int,long):94:94 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27 -> a
-com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.YG:
+com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.VF:
     com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint INSTANCE -> b
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
     boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod) -> a
-com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.dI:
+com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.ZG:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(int,long):10:10 -> <init>
@@ -40089,7 +39691,7 @@
     4:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27:27 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createNotEqualToNumberConstraint(int,long):89:89 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27 -> a
-com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.hI:
+com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.gH:
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
@@ -40102,7 +39704,6 @@
     11:14:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):47:50 -> a
     15:15:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():42:42 -> a
     15:15:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):50 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:18:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):50:52 -> a
     19:19:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
     19:19:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):53 -> a
@@ -40117,7 +39718,7 @@
     29:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):63 -> a
     30:43:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):68:81 -> a
     44:44:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):87:87 -> a
-com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.rI:
+com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.pH:
     long rawValue -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -40130,14 +39731,14 @@
     14:20:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):43:49 -> a
     21:23:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):54:56 -> a
     1:1:long getRawValue():26:26 -> i
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.AV:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.ZT:
     int argumentIndex -> b
     1:2:void <init>(int):14:15 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
     1:1:com.android.tools.r8.ir.code.Value getArgument(com.android.tools.r8.ir.code.InvokeMethod):19:19 -> b
     boolean isArgumentConstraint() -> d
     1:1:int getArgumentIndex():23:23 -> h
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.BV:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.aU:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -40186,7 +39787,7 @@
     boolean isConjunction() -> e
     boolean isDisjunction() -> f
     boolean isNever() -> g
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.DV:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.cU:
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory factory -> a
     java.util.Set seen -> d
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -40196,7 +39797,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):50:50 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):47:54 -> <init>
     1:14:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeCode(com.android.tools.r8.ir.code.IRCode):58:71 -> a
-    15:16:int com.android.tools.r8.ir.code.IRCode.getNumberOfArguments():1083:1084 -> a
+    15:16:int com.android.tools.r8.ir.code.IRCode.getNumberOfArguments():1086:1087 -> a
     15:16:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeCode(com.android.tools.r8.ir.code.IRCode):71 -> a
     17:18:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeCode(com.android.tools.r8.ir.code.IRCode):71:72 -> a
     19:28:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):82:91 -> a
@@ -40211,7 +39812,6 @@
     114:119:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):117:122 -> a
     120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):200:200 -> a
     120:120:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):122 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     121:121:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):129:129 -> a
     122:133:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):128:139 -> a
     134:144:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):138:148 -> a
@@ -40265,7 +39865,6 @@
     206:207:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.If$Type):194:195 -> a
     208:208:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createEqualToTrueConstraint(int):58:58 -> a
     208:208:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.If$Type):195 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     209:212:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.If$Type):197:200 -> a
     213:213:com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createNotEqualToNumberConstraint(int,long):89:89 -> a
     213:213:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.If$Type):200 -> a
@@ -40276,7 +39875,6 @@
     218:219:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.If$Type):178:179 -> a
     220:220:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createEqualToFalseConstraint(int):54:54 -> a
     220:220:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.If$Type):179 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     221:224:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.If$Type):181:184 -> a
     225:225:com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createEqualToNumberConstraint(int,long):94:94 -> a
     225:225:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.If$Type):184 -> a
@@ -40285,10 +39883,10 @@
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$1(com.android.tools.r8.ir.code.If,int):144:144 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis.analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int):76:76 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$1(com.android.tools.r8.ir.code.If,int):144 -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.CV:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.bU:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():172:172 -> <clinit>
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.EV:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.dU:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -40318,7 +39916,7 @@
     57:58:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):81:82 -> a
     59:59:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isAlways():0:0 -> a
     59:59:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):82 -> a
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.FV:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.eU:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -40348,7 +39946,7 @@
     57:57:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isNever():0:0 -> a
     57:57:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):82 -> a
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction asDisjunction() -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.GV:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.fU:
     com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint[] lowEqualToTrueConstraints -> b
     com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint[] lowEqualToFalseConstraints -> a
     com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint[] lowEqualToNullConstraints -> d
@@ -40367,7 +39965,7 @@
     10:10:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint lambda$createArgumentConstraint$2(java.util.function.Supplier,java.lang.Integer):101:101 -> a
     1:1:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint lambda$createEqualToBooleanConstraint$0(int,boolean):67:67 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint lambda$createNullConstraint$1(int,com.android.tools.r8.ir.analysis.type.Nullability):84:84 -> b
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.NB:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.XA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:9:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):19:27 -> a
@@ -40376,9 +39974,8 @@
     11:15:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):28:32 -> a
     16:16:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1584:1584 -> a
     16:16:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):32 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:19:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):32:34 -> a
-com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.ti:
+com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.ei:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set deadEnumLiteMaps -> c
@@ -40387,9 +39984,8 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):43:43 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):41:45 -> <init>
     1:1:void clearDeadEnumLiteMaps():59:59 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1572:1572 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1594:1594 -> a
     2:2:void clearDeadEnumLiteMaps():59 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:11:void clearDeadEnumLiteMaps():59:67 -> a
     12:12:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():74:74 -> a
     12:12:void clearDeadEnumLiteMaps():70 -> a
@@ -40435,7 +40031,7 @@
     4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
     4:4:void verifyDeadEnumLiteMapsAreDead():148 -> c
     5:5:void verifyDeadEnumLiteMapsAreDead():148:148 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.Kl:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.ol:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedExtensionFields -> d
@@ -40444,59 +40040,58 @@
     1:1:void <clinit>():76:76 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):85:85 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):82:89 -> <init>
-    1:1:void lambda$run$0(com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.graph.DexField):103:103 -> a
-    2:3:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):103:104 -> a
-    4:15:com.android.tools.r8.shaking.TreePrunerConfiguration com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.createTreePrunerConfiguration(com.android.tools.r8.shaking.Enqueuer$Mode):116:127 -> a
-    4:15:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):105 -> a
-    16:19:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):109:112 -> a
-    20:20:java.util.Map lambda$recordDeadProtoExtensionField$2(com.android.tools.r8.graph.DexType):111:111 -> a
-    21:24:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):136:139 -> a
-    25:36:void rewriteClassInitializer(com.android.tools.r8.ir.code.IRCode):144:155 -> a
-    37:39:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.wasRemoved(com.android.tools.r8.graph.DexField):160:162 -> a
-    37:39:boolean lambda$run$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):104 -> a
-    40:52:void postOptimizeGeneratedExtensionRegistry(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):168:180 -> a
-    53:53:void lambda$postOptimizeGeneratedExtensionRegistry$3(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):176:176 -> a
-    54:54:void lambda$postOptimizeGeneratedExtensionRegistry$3(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):174:174 -> a
-    55:67:void forEachClassInitializerWithRemovedExtensionFields(java.util.function.Consumer,com.android.tools.r8.shaking.Enqueuer$Mode):190:202 -> a
-    68:68:void lambda$forEachClassInitializerWithRemovedExtensionFields$5(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,java.util.Map):195:195 -> a
-    69:69:void lambda$forEachClassInitializerWithRemovedExtensionFields$4(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):199:199 -> a
-    70:70:void lambda$forEachClassInitializerWithRemovedExtensionFields$4(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):198:198 -> a
-    71:71:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():201:201 -> a
-    71:71:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):228 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    72:72:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):228:228 -> a
-    73:73:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):189:189 -> a
-    73:73:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):228 -> a
-    74:74:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):229:229 -> a
-    75:77:void lambda$forEachClassInitializerWithRemovedExtensionFields$6(java.util.function.Consumer,com.android.tools.r8.graph.DexType):204:206 -> a
-    78:78:void lambda$forEachFindLiteExtensionByNumberMethod$8(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):217:217 -> a
-    79:79:boolean lambda$forEachFindLiteExtensionByNumberMethod$7(com.android.tools.r8.graph.DexEncodedMethod):219:219 -> a
-    80:80:void lambda$forEachFindLiteExtensionByNumberMethod$9(com.android.tools.r8.ir.desugar.LambdaDescriptor):222:222 -> a
-    81:88:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):234:241 -> a
-    89:89:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):240:240 -> a
-    90:90:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):250:250 -> a
-    91:91:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> a
-    91:91:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):250 -> a
-    92:100:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):250:258 -> a
-    101:101:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
-    101:101:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):258 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    102:102:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):264:264 -> a
-    103:103:boolean lambda$isDeadProtoExtensionField$10(com.android.tools.r8.graph.ProgramMethod):265:265 -> a
-    104:104:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):189:189 -> a
-    104:104:boolean lambda$isDeadProtoExtensionField$10(com.android.tools.r8.graph.ProgramMethod):265 -> a
-    105:107:void lambda$forEachDeadProtoExtensionField$11(java.util.function.Consumer,com.android.tools.r8.graph.FieldAccessInfo):273:275 -> a
+    1:203:void forEachClassInitializerWithRemovedExtensionFields(java.util.function.Consumer,com.android.tools.r8.shaking.Enqueuer$Mode):0:202 -> a
+    204:204:void lambda$run$0(com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.graph.DexField):103:103 -> a
+    205:206:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):103:104 -> a
+    207:218:com.android.tools.r8.shaking.TreePrunerConfiguration com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.createTreePrunerConfiguration(com.android.tools.r8.shaking.Enqueuer$Mode):116:127 -> a
+    207:218:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):105 -> a
+    219:222:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):109:112 -> a
+    223:223:java.util.Map lambda$recordDeadProtoExtensionField$2(com.android.tools.r8.graph.DexType):111:111 -> a
+    224:227:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):136:139 -> a
+    228:239:void rewriteClassInitializer(com.android.tools.r8.ir.code.IRCode):144:155 -> a
+    240:242:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.wasRemoved(com.android.tools.r8.graph.DexField):160:162 -> a
+    240:242:boolean lambda$run$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):104 -> a
+    243:255:void postOptimizeGeneratedExtensionRegistry(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):168:180 -> a
+    256:256:void lambda$postOptimizeGeneratedExtensionRegistry$3(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):176:176 -> a
+    257:257:void lambda$postOptimizeGeneratedExtensionRegistry$3(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):174:174 -> a
+    258:258:void lambda$forEachClassInitializerWithRemovedExtensionFields$5(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,java.util.Map):195:195 -> a
+    259:259:void lambda$forEachClassInitializerWithRemovedExtensionFields$4(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):199:199 -> a
+    260:260:void lambda$forEachClassInitializerWithRemovedExtensionFields$4(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):198:198 -> a
+    261:263:void lambda$forEachClassInitializerWithRemovedExtensionFields$6(java.util.function.Consumer,com.android.tools.r8.graph.DexType):204:206 -> a
+    264:264:void lambda$forEachFindLiteExtensionByNumberMethod$8(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):217:217 -> a
+    265:265:boolean lambda$forEachFindLiteExtensionByNumberMethod$7(com.android.tools.r8.graph.DexEncodedMethod):219:219 -> a
+    266:266:void lambda$forEachFindLiteExtensionByNumberMethod$9(com.android.tools.r8.ir.desugar.LambdaDescriptor):222:222 -> a
+    267:267:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):228:228 -> a
+    268:268:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():201:201 -> a
+    268:268:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):228 -> a
+    269:269:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):228:228 -> a
+    270:270:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):189:189 -> a
+    270:270:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):228 -> a
+    271:271:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):229:229 -> a
+    272:279:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):234:241 -> a
+    280:280:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):240:240 -> a
+    281:281:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):250:250 -> a
+    282:282:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> a
+    282:282:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):250 -> a
+    283:291:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):250:258 -> a
+    292:292:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
+    292:292:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):258 -> a
+    293:293:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):264:264 -> a
+    294:294:boolean lambda$isDeadProtoExtensionField$10(com.android.tools.r8.graph.ProgramMethod):265:265 -> a
+    295:295:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):189:189 -> a
+    295:295:boolean lambda$isDeadProtoExtensionField$10(com.android.tools.r8.graph.ProgramMethod):265 -> a
+    296:298:void lambda$forEachDeadProtoExtensionField$11(java.util.function.Consumer,com.android.tools.r8.graph.FieldAccessInfo):273:275 -> a
     1:3:boolean wasRemoved(com.android.tools.r8.graph.DexField):160:162 -> b
     4:6:void forEachDeadProtoExtensionField(java.util.function.Consumer):269:271 -> b
     1:3:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):212:214 -> c
     1:2:void forEachMethodThatRequiresPostOptimization(java.util.function.Consumer):184:185 -> d
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.Jl:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.nl:
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> b
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):117:117 -> <init>
     1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):122:122 -> a
     2:2:boolean com.android.tools.r8.shaking.DefaultTreePrunerConfiguration.isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):22:22 -> a
     2:2:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):123 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Vl:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.yl:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map builders -> d
@@ -40530,18 +40125,18 @@
     294:294:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.function.BooleanSupplier):176 -> a
     295:297:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.function.BooleanSupplier):177:179 -> a
     298:303:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):193:198 -> a
-    304:304:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):322:322 -> a
+    304:304:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):315:315 -> a
     304:304:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):198 -> a
     305:315:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):199:209 -> a
     316:317:void lambda$rewriteDeadBuilderReferencesFromDynamicMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):202:203 -> a
     318:319:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):217:218 -> a
-    320:320:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    320:320:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     320:320:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):218 -> a
     321:337:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):220:236 -> a
-    338:338:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    338:338:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     338:338:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):236 -> a
     339:346:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):242:249 -> a
-    347:347:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    347:347:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     347:347:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):249 -> a
     348:355:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):251:258 -> a
     356:356:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
@@ -40561,35 +40156,34 @@
     391:396:void inlineCallsToDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner):304:309 -> a
     397:403:void inlineCallsToDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner):308:314 -> a
     404:405:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):348:349 -> a
-    406:406:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    406:406:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     406:406:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):349 -> a
-    407:417:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):351:361 -> a
-    418:418:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):170:170 -> a
-    418:418:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):362 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    419:421:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):365:367 -> a
-    422:424:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):389:391 -> a
-    422:424:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):367 -> a
-    425:425:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    425:425:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):391 -> a
-    425:425:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):367 -> a
-    426:427:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):391:392 -> a
-    426:427:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):367 -> a
-    428:428:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):385:385 -> a
-    428:428:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):392 -> a
-    428:428:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):367 -> a
-    429:433:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):371:375 -> a
-    434:434:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():90:90 -> a
-    434:434:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):376 -> a
-    435:442:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):376:383 -> a
-    443:443:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    443:443:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):383 -> a
-    444:444:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):383:383 -> a
+    407:418:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):351:362 -> a
+    419:419:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):170:170 -> a
+    419:419:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):362 -> a
+    420:422:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):365:367 -> a
+    423:425:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):389:391 -> a
+    423:425:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):367 -> a
+    426:426:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    426:426:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):391 -> a
+    426:426:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):367 -> a
+    427:428:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):391:392 -> a
+    427:428:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):367 -> a
+    429:429:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):385:385 -> a
+    429:429:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):392 -> a
+    429:429:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):367 -> a
+    430:434:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):371:375 -> a
+    435:435:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():90:90 -> a
+    435:435:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):376 -> a
+    436:443:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):376:383 -> a
+    444:444:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    444:444:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):383 -> a
+    445:445:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):383:383 -> a
     1:1:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):61:61 -> b
     2:2:boolean lambda$computeEnableAggressiveBuilderOptimization$1(com.android.tools.r8.graph.DexClass):112:112 -> b
     3:4:com.android.tools.r8.graph.analysis.EnqueuerAnalysis createEnqueuerAnalysis():128:129 -> b
     1:1:com.android.tools.r8.ir.analysis.proto.ProtoReferences access$200(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):61:61 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Tl:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.wl:
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker this$0 -> b
     java.util.Set val$seen -> a
     boolean $assertionsDisabled -> c
@@ -40602,7 +40196,7 @@
     29:32:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):155:158 -> a
     33:38:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):157:162 -> a
     39:39:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):161:161 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.Ul:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.xl:
     java.util.Set bypassClinitforInlining -> g
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -40636,7 +40230,7 @@
     12:13:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeClass(com.android.tools.r8.graph.DexType):475:476 -> b
     12:13:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeGeneratedMessageLiteBuilder():465 -> b
     12:13:void extend(com.android.tools.r8.graph.SubtypingInfo):427 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Wl:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.zl:
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder encoder -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> d
@@ -40670,137 +40264,139 @@
     40:42:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):278 -> a
     40:42:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
     40:42:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    43:44:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):293:294 -> a
-    43:44:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
-    43:44:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
-    43:44:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    45:45:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
-    45:45:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):295 -> a
-    45:45:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
-    45:45:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
-    45:45:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    46:55:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):296:305 -> a
-    46:55:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
-    46:55:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
-    46:55:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    56:56:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
-    56:56:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):304 -> a
-    56:56:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
-    56:56:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
-    56:56:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    57:59:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):308:310 -> a
-    57:59:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
-    57:59:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
-    57:59:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    60:60:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
-    60:60:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):311 -> a
-    60:60:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
-    60:60:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
-    60:60:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    61:63:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):312:314 -> a
-    61:63:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
-    61:63:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
-    61:63:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    64:64:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
-    64:64:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):312 -> a
-    64:64:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
-    64:64:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
-    64:64:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    65:65:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):319:319 -> a
+    43:43:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):335:335 -> a
+    43:43:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):331 -> a
+    43:43:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):284 -> a
+    43:43:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):278 -> a
+    43:43:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
+    43:43:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
+    44:45:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):293:294 -> a
+    44:45:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
+    44:45:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
+    44:45:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
+    46:46:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():39:39 -> a
+    46:46:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):295 -> a
+    46:46:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
+    46:46:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
+    46:46:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
+    47:56:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):296:305 -> a
+    47:56:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
+    47:56:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
+    47:56:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
+    57:57:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):39:39 -> a
+    57:57:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):304 -> a
+    57:57:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
+    57:57:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
+    57:57:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
+    58:60:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):308:310 -> a
+    58:60:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
+    58:60:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
+    58:60:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
+    61:61:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):39:39 -> a
+    61:61:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):311 -> a
+    61:61:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
+    61:61:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
+    61:61:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
+    62:64:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):312:314 -> a
+    62:64:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
+    62:64:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
+    62:64:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
+    65:65:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):39:39 -> a
+    65:65:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):312 -> a
     65:65:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
     65:65:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
     65:65:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    66:66:void com.android.tools.r8.ir.analysis.proto.ProtoUtils.setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):31:31 -> a
-    66:66:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):319 -> a
+    66:66:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):319:319 -> a
     66:66:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
     66:66:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
     66:66:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    67:67:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):199:199 -> a
-    67:67:void com.android.tools.r8.ir.analysis.proto.ProtoUtils.setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):31 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    67:67:void com.android.tools.r8.ir.analysis.proto.ProtoUtils.setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):31:31 -> a
     67:67:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):319 -> a
     67:67:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
     67:67:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
     67:67:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    68:70:void com.android.tools.r8.ir.analysis.proto.ProtoUtils.setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):31:33 -> a
-    68:70:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):319 -> a
-    68:70:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
-    68:70:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
-    68:70:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    71:74:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):265:268 -> a
-    71:74:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    75:75:void run(com.android.tools.r8.ir.code.IRCode):113:113 -> a
-    76:76:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
-    76:76:void run(com.android.tools.r8.ir.code.IRCode):113 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    77:77:void run(com.android.tools.r8.ir.code.IRCode):114:114 -> a
-    78:84:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):119:125 -> a
-    85:90:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):181:186 -> a
-    85:90:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
-    91:91:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):170:170 -> a
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):187 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    91:91:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
-    92:93:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):190:191 -> a
-    92:93:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
-    94:94:int com.android.tools.r8.ir.code.InvokeMethod.getFirstNonReceiverArgumentIndex():79:79 -> a
-    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InvokeMethod.getFirstNonReceiverArgument():75 -> a
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):192 -> a
-    94:94:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
-    95:95:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InvokeMethod.getFirstNonReceiverArgument():75:75 -> a
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):192 -> a
-    95:95:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):191:191 -> a
+    68:68:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):199:199 -> a
+    68:68:void com.android.tools.r8.ir.analysis.proto.ProtoUtils.setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):31 -> a
+    68:68:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):319 -> a
+    68:68:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
+    68:68:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
+    68:68:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
+    69:71:void com.android.tools.r8.ir.analysis.proto.ProtoUtils.setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):31:33 -> a
+    69:71:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):319 -> a
+    69:71:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
+    69:71:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
+    69:71:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
+    72:75:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):265:268 -> a
+    72:75:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
+    76:76:void run(com.android.tools.r8.ir.code.IRCode):113:113 -> a
+    77:77:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
+    77:77:void run(com.android.tools.r8.ir.code.IRCode):113 -> a
+    78:78:void run(com.android.tools.r8.ir.code.IRCode):114:114 -> a
+    79:85:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):119:125 -> a
+    86:92:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):181:187 -> a
+    86:92:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
+    93:93:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):170:170 -> a
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):187 -> a
+    93:93:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
+    94:95:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):190:191 -> a
+    94:95:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
+    96:96:int com.android.tools.r8.ir.code.InvokeMethod.getFirstNonReceiverArgumentIndex():79:79 -> a
+    96:96:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InvokeMethod.getFirstNonReceiverArgument():75 -> a
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):192 -> a
     96:96:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
-    97:99:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):389:391 -> a
-    97:99:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):191 -> a
-    97:99:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
-    100:100:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    100:100:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):391 -> a
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):191 -> a
-    100:100:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
-    101:102:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):391:392 -> a
-    101:102:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):191 -> a
-    101:102:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
-    103:103:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):385:385 -> a
-    103:103:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):392 -> a
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):191 -> a
-    103:103:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
-    104:109:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):195:200 -> a
-    104:109:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
-    110:115:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):132:137 -> a
-    116:123:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):136:143 -> a
-    124:124:com.android.tools.r8.ir.code.NewInstance$Builder com.android.tools.r8.ir.code.NewInstance.builder():42:42 -> a
-    124:124:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):143 -> a
-    125:127:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):144:146 -> a
-    128:128:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    128:128:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):146 -> a
-    129:129:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1646:1646 -> a
-    129:129:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):145 -> a
-    130:137:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):145:152 -> a
-    138:138:com.android.tools.r8.ir.code.InvokeDirect$Builder com.android.tools.r8.ir.code.InvokeDirect.builder():50:50 -> a
-    138:138:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):152 -> a
-    139:140:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):153:154 -> a
-    141:141:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
-    141:141:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):154 -> a
-    142:153:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):154:165 -> a
-    154:154:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
-    154:154:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):166 -> a
-    155:163:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):167:175 -> a
-    164:164:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    164:164:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):175 -> a
-    165:165:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):175:175 -> a
-    166:177:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):208:219 -> a
-    178:178:void lambda$postOptimizeDynamicMethods$2(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):215:215 -> a
-    179:179:void lambda$postOptimizeDynamicMethods$2(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):213:213 -> a
-    180:183:void forEachDynamicMethod(java.util.function.Consumer):223:226 -> a
-    184:189:void lambda$forEachDynamicMethod$3(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):229:234 -> a
-    190:190:void lambda$forEachDynamicMethod$4(com.android.tools.r8.ir.desugar.LambdaDescriptor):238:238 -> a
-    191:194:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):324:327 -> a
-    195:195:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):199:199 -> a
-    195:195:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):327 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.IP:
+    97:97:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InvokeMethod.getFirstNonReceiverArgument():75:75 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):192 -> a
+    97:97:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):191:191 -> a
+    98:98:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
+    99:101:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):389:391 -> a
+    99:101:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):191 -> a
+    99:101:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
+    102:102:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    102:102:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):391 -> a
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):191 -> a
+    102:102:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
+    103:104:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):391:392 -> a
+    103:104:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):191 -> a
+    103:104:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
+    105:105:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):385:385 -> a
+    105:105:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):392 -> a
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):191 -> a
+    105:105:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
+    106:111:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):195:200 -> a
+    106:111:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126 -> a
+    112:117:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):132:137 -> a
+    118:125:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):136:143 -> a
+    126:126:com.android.tools.r8.ir.code.NewInstance$Builder com.android.tools.r8.ir.code.NewInstance.builder():42:42 -> a
+    126:126:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):143 -> a
+    127:129:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):144:146 -> a
+    130:130:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    130:130:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):146 -> a
+    131:131:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
+    131:131:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):145 -> a
+    132:139:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):145:152 -> a
+    140:140:com.android.tools.r8.ir.code.InvokeDirect$Builder com.android.tools.r8.ir.code.InvokeDirect.builder():50:50 -> a
+    140:140:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):152 -> a
+    141:142:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):153:154 -> a
+    143:143:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
+    143:143:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):154 -> a
+    144:155:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):154:165 -> a
+    156:156:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
+    156:156:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):166 -> a
+    157:165:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):167:175 -> a
+    166:166:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    166:166:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):175 -> a
+    167:167:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):175:175 -> a
+    168:179:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):208:219 -> a
+    180:180:void lambda$postOptimizeDynamicMethods$2(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):215:215 -> a
+    181:181:void lambda$postOptimizeDynamicMethods$2(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):213:213 -> a
+    182:185:void forEachDynamicMethod(java.util.function.Consumer):223:226 -> a
+    186:191:void lambda$forEachDynamicMethod$3(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):229:234 -> a
+    192:192:void lambda$forEachDynamicMethod$4(com.android.tools.r8.ir.desugar.LambdaDescriptor):238:238 -> a
+    193:196:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):324:327 -> a
+    197:197:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):199:199 -> a
+    197:197:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):327 -> a
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.wO:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> i
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -40825,7 +40421,7 @@
     9:15:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):81 -> e
     16:19:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):82:85 -> e
     1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():39:39 -> g
-com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.JP:
+com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.xO:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     java.util.Map staticFieldValuesMap -> b
     java.util.Map staticFieldValuesMapDelayed -> c
@@ -40844,7 +40440,7 @@
     12:16:com.android.tools.r8.ir.analysis.value.SingleNumberValue getOrdinal(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):57 -> a
     17:25:com.android.tools.r8.ir.analysis.value.SingleNumberValue getOrdinal(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):60:68 -> a
     26:31:com.android.tools.r8.ir.analysis.value.SingleNumberValue getOrdinal(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):67:72 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.OP:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.CO:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> a
     boolean $assertionsDisabled -> c
@@ -40884,19 +40480,19 @@
     31:31:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     31:31:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):75 -> a
     31:31:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
-    32:36:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):76:80 -> a
-    32:36:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
-    37:37:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithSimpleBody(com.android.tools.r8.graph.DexField):396:396 -> a
-    37:37:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):81 -> a
-    37:37:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
-    38:41:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):82:85 -> a
-    38:41:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
-    42:42:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithNonSimpleBody(com.android.tools.r8.graph.DexField):404:404 -> a
-    42:42:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):86 -> a
-    42:42:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
-    43:46:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):85:88 -> a
-    43:46:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.eQ:
+    32:37:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):76:81 -> a
+    32:37:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
+    38:38:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithSimpleBody(com.android.tools.r8.graph.DexField):396:396 -> a
+    38:38:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):81 -> a
+    38:38:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
+    39:42:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):82:85 -> a
+    39:42:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
+    43:43:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithNonSimpleBody(com.android.tools.r8.graph.DexField):404:404 -> a
+    43:43:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):86 -> a
+    43:43:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
+    44:47:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):85:88 -> a
+    44:47:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.QO:
     com.android.tools.r8.graph.DexType generatedMessageLiteExtendableMessageType -> l
     com.android.tools.r8.graph.DexType generatedMessageLiteBuilderType -> j
     com.android.tools.r8.graph.DexType methodToInvokeType -> n
@@ -40936,19 +40532,15 @@
     1:1:void forEachMethodReference(java.util.function.Consumer):134:134 -> a
     2:3:void com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.forEachMethodReference(java.util.function.Consumer):236:237 -> a
     2:3:void forEachMethodReference(java.util.function.Consumer):134 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void forEachMethodReference(java.util.function.Consumer):135:135 -> a
     5:9:void com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods.forEachMethodReference(java.util.function.Consumer):299:303 -> a
     5:9:void forEachMethodReference(java.util.function.Consumer):135 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:void forEachMethodReference(java.util.function.Consumer):136:136 -> a
     11:11:void com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods.forEachMethodReference(java.util.function.Consumer):320:320 -> a
     11:11:void forEachMethodReference(java.util.function.Consumer):136 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:12:void forEachMethodReference(java.util.function.Consumer):137:137 -> a
     13:14:void com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods.forEachMethodReference(java.util.function.Consumer):344:345 -> a
     13:14:void forEachMethodReference(java.util.function.Consumer):137 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:18:void forEachMethodReference(java.util.function.Consumer):138:141 -> a
     19:19:com.android.tools.r8.graph.DexField getDefaultInstanceField(com.android.tools.r8.graph.DexProgramClass):145:145 -> a
     20:20:boolean isDynamicMethod(com.android.tools.r8.graph.DexMethod):158:158 -> a
@@ -40958,27 +40550,26 @@
     4:4:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> b
     4:4:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):184 -> b
     5:5:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):184:184 -> b
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.YP:
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.ZP:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.LO:
     com.android.tools.r8.graph.DexMethod constructorWithClass -> b
     com.android.tools.r8.graph.DexMethod constructor -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):206:206 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):211:215 -> <init>
     7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):213:225 -> <init>
     20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):223:223 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.aQ:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.MO:
     com.android.tools.r8.graph.DexMethod constructorMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):307:307 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):311:315 -> <init>
     7:7:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):313:313 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.bQ:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.NO:
     com.android.tools.r8.graph.DexMethod constructorMethod -> b
     com.android.tools.r8.graph.DexMethod buildPartialMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):324:324 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):329:333 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):331:338 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):336:336 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.cQ:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.OO:
     com.android.tools.r8.graph.DexMethod newSingularGeneratedExtension -> e
     com.android.tools.r8.graph.DexMethod newRepeatedGeneratedExtension -> d
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethodWithObject -> c
@@ -40991,7 +40582,7 @@
     23:31:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):265:273 -> <init>
     32:47:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):271:286 -> <init>
     48:48:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):284:284 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.dQ:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.PO:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -41001,7 +40592,7 @@
     com.android.tools.r8.graph.DexField getMemoizedIsInitializedField -> c
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):349:349 -> <init>
     2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):359:376 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.fQ:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.RO:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover protoEnumSwitchMapRemover -> g
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker generatedMessageLiteBuilderShrinker -> e
@@ -41019,27 +40610,25 @@
     8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
     8:8:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):66 -> a
     9:13:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):66:70 -> a
-    14:18:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1553:1557 -> a
+    14:18:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1575:1579 -> a
     14:18:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):70 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:19:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):74:74 -> a
     20:20:java.util.Set getDeadProtoTypes():78:78 -> a
     21:23:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):88:90 -> a
-    24:24:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():927:927 -> a
+    24:24:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():937:937 -> a
     24:24:void setDeadProtoTypes(java.util.Set):83 -> a
     25:25:void setDeadProtoTypes(java.util.Set):84:84 -> a
-    26:26:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():928:928 -> a
+    26:26:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():938:938 -> a
     26:26:void setDeadProtoTypes(java.util.Set):83 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.iQ:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.UO:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):17:17 -> a
     2:2:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):199:199 -> a
     2:2:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):17 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:5:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):17:19 -> a
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.tQ:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.dP:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -41049,7 +40638,6 @@
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):81:81 -> a
     2:2:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):199:199 -> a
     2:2:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):81 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:5:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):81:83 -> a
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.proto.ProtoUtils.getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):24:24 -> a
     6:6:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):83 -> a
@@ -41093,7 +40681,6 @@
     180:182:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):204:206 -> a
     183:188:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):522:527 -> a
     183:188:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):206 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     189:193:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):208:212 -> a
     194:194:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
     194:194:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):213 -> a
@@ -41119,7 +40706,7 @@
     4:19:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):309:324 -> b
     20:20:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):317:317 -> b
     21:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):306:306 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.qQ:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.aP:
     com.android.tools.r8.utils.ThrowingCharIterator charIterator -> a
     1:3:void <init>(com.android.tools.r8.graph.DexString):259:261 -> <init>
     1:1:boolean hasNext():265:265 -> a
@@ -41131,7 +40718,7 @@
     9:9:int nextInt():291:291 -> b
     10:10:int nextInt():280:280 -> b
     11:11:int nextInt():271:271 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.rQ:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.bP:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -41146,10 +40733,10 @@
     16:16:java.lang.Object next():324 -> b
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2.next():346:346 -> b
     17:17:java.lang.Object next():324 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.sQ:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.cP:
     1:1:void <init>():369:369 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):369:369 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.uQ:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.eP:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):24:25 -> <init>
     1:1:com.android.tools.r8.graph.DexString encodeInfo(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):29:29 -> a
@@ -41173,7 +40760,7 @@
     57:68:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder.encodeInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):85:96 -> a
     57:68:com.android.tools.r8.graph.DexString encodeInfo(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):77 -> a
     1:12:java.util.List encodeObjects(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):100:111 -> b
-com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.Je:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.oe:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexType holder -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):20:22 -> <init>
@@ -41190,7 +40777,7 @@
     78:78:java.lang.String toString():37:37 -> toString
     79:79:java.lang.String toString():37:37 -> toString
     76:76:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.CC:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.LB:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):23:24 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
@@ -41202,7 +40789,7 @@
     57:57:java.lang.String toString():54:54 -> toString
     58:58:java.lang.String toString():54:54 -> toString
     55:55:java.lang.String toString():54:54 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.HP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.vO:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     java.util.Set dynamicMethodsWithTracedProtoObjects -> h
     com.android.tools.r8.graph.AppView appView -> a
@@ -41217,134 +40804,132 @@
     1:1:void <clinit>():63:63 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):94:94 -> <init>
     2:30:void <init>(com.android.tools.r8.graph.AppView):71:99 -> <init>
-    1:1:boolean com.android.tools.r8.graph.DexClassAndMethod.isStructurallyEqualTo(com.android.tools.r8.graph.DexClassAndMethod):41:41 -> a
-    1:1:boolean lambda$markMapOrRequiredFieldsAsReachable$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):450 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:boolean com.android.tools.r8.graph.DexClassAndMethod.isStructurallyEqualTo(com.android.tools.r8.graph.DexClassAndMethod):41:41 -> a
-    2:2:boolean lambda$markMapOrRequiredFieldsAsReachable$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):451 -> a
-    3:5:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):104:106 -> a
-    6:16:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):113:123 -> a
-    6:16:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
-    17:23:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):119:125 -> a
-    17:23:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
-    24:24:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":28,"2":29,"3":30}}
+    1:3:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):104:106 -> a
+    4:14:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):113:123 -> a
+    4:14:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
+    15:21:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):119:125 -> a
+    15:21:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
+    22:22:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":26,"2":27,"3":28}}
+    26:26:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):125:125 -> a
+    26:26:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
+    27:27:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):125:125 -> a
+    27:27:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
     28:28:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):125:125 -> a
     28:28:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
-    29:29:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):125:125 -> a
+    23:23:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):125:125 -> a
+    23:23:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
+    24:24:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":29,"2":30,"3":31,"4":32}}
+    29:29:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):126:126 -> a
     29:29:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
-    30:30:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):125:125 -> a
+    30:30:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):126:126 -> a
     30:30:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
-    25:25:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):125:125 -> a
-    25:25:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
-    26:26:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":31,"2":32,"3":33,"4":34}}
     31:31:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):126:126 -> a
     31:31:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
     32:32:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):126:126 -> a
     32:32:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
-    33:33:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):126:126 -> a
-    33:33:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
-    34:34:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):126:126 -> a
-    34:34:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
-    27:27:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):126:126 -> a
-    27:27:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
-    35:40:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):136:141 -> a
-    41:41:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethod(com.android.tools.r8.graph.ProgramMethod):166:166 -> a
-    41:41:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):141 -> a
-    42:52:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):145:155 -> a
-    53:61:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):160:168 -> a
-    53:61:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):155 -> a
-    62:74:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):173:185 -> a
-    75:98:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):472:495 -> a
-    75:98:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):186 -> a
-    99:99:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isProtoObjectFromStaticGet():0:0 -> a
-    99:99:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):495 -> a
+    25:25:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):126:126 -> a
+    25:25:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107 -> a
+    33:38:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):136:141 -> a
+    39:39:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethod(com.android.tools.r8.graph.ProgramMethod):166:166 -> a
+    39:39:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):141 -> a
+    40:50:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):145:155 -> a
+    51:59:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):160:168 -> a
+    51:59:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):155 -> a
+    60:72:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):173:185 -> a
+    73:96:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):472:495 -> a
+    73:96:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):186 -> a
+    97:97:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isProtoObjectFromStaticGet():0:0 -> a
+    97:97:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):495 -> a
+    97:97:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):186 -> a
+    98:98:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):497:497 -> a
+    98:98:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):186 -> a
+    99:99:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):496:496 -> a
     99:99:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):186 -> a
-    100:100:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):497:497 -> a
+    100:100:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isProtoTypeObject():0:0 -> a
+    100:100:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):498 -> a
     100:100:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):186 -> a
-    101:101:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):496:496 -> a
+    101:101:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):500:500 -> a
     101:101:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):186 -> a
-    102:102:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isProtoTypeObject():0:0 -> a
-    102:102:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):498 -> a
+    102:102:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):499:499 -> a
     102:102:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):186 -> a
-    103:103:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):500:500 -> a
-    103:103:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):186 -> a
-    104:104:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):499:499 -> a
-    104:104:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):186 -> a
-    105:105:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):189:189 -> a
-    106:122:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):221:237 -> a
-    123:129:java.util.Map collectExtensionFields():250:256 -> a
-    130:130:java.util.Set lambda$collectExtensionFields$1(com.android.tools.r8.graph.DexProgramClass):261:261 -> a
-    131:132:void lambda$collectExtensionFields$2(java.util.Map,com.android.tools.r8.graph.ProgramField):261:262 -> a
-    133:149:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):270:286 -> a
-    150:150:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    150:150:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):286 -> a
-    151:153:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):287:289 -> a
-    154:154:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    154:154:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):290 -> a
-    155:155:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):294:294 -> a
-    156:165:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):291:300 -> a
-    166:166:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):299:299 -> a
-    167:167:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):298:298 -> a
-    168:176:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):309:317 -> a
-    177:177:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> a
-    177:177:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):317 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    178:195:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):319:336 -> a
-    196:196:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.isConstructor(com.android.tools.r8.graph.DexMethod):241:241 -> a
-    196:196:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):336 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    197:214:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):337:354 -> a
-    215:217:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):353:355 -> a
-    218:218:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):348:348 -> a
-    219:248:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):367:396 -> a
-    249:260:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):395:406 -> a
-    261:261:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
-    261:261:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):406 -> a
-    262:271:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):407:416 -> a
-    272:272:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
-    272:272:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):416 -> a
-    273:317:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):417:461 -> a
-    318:318:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):460:460 -> a
-    319:323:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):511:515 -> a
-    319:323:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
-    324:325:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):523:524 -> a
-    324:325:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
-    324:325:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
-    326:326:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
-    326:326:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):524 -> a
-    326:326:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
-    326:326:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
-    327:361:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):525:559 -> a
-    327:361:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
-    327:361:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
-    362:362:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
-    362:362:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):559 -> a
-    362:362:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
-    362:362:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
-    363:384:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):560:581 -> a
-    363:384:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
-    363:384:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
-    385:385:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):580:580 -> a
-    385:385:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
-    385:385:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
-    386:386:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):575:575 -> a
-    386:386:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
-    386:386:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
-    387:394:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):591:598 -> a
-    395:395:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
-    395:395:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):599 -> a
-    396:408:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):599:611 -> a
-    409:415:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):622:628 -> a
-    416:442:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):627:653 -> a
-    443:463:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):662:682 -> a
-    464:472:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):160:168 -> a
-    464:472:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):682 -> a
-    473:473:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):684:684 -> a
+    103:103:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):189:189 -> a
+    104:120:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):221:237 -> a
+    121:127:java.util.Map collectExtensionFields():250:256 -> a
+    128:128:java.util.Set lambda$collectExtensionFields$1(com.android.tools.r8.graph.DexProgramClass):261:261 -> a
+    129:130:void lambda$collectExtensionFields$2(java.util.Map,com.android.tools.r8.graph.ProgramField):261:262 -> a
+    131:147:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):270:286 -> a
+    148:148:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    148:148:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):286 -> a
+    149:151:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):287:289 -> a
+    152:152:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    152:152:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):290 -> a
+    153:153:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):294:294 -> a
+    154:163:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):291:300 -> a
+    164:164:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):299:299 -> a
+    165:165:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.function.Consumer):298:298 -> a
+    166:174:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):309:317 -> a
+    175:175:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> a
+    175:175:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):317 -> a
+    176:193:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):319:336 -> a
+    194:194:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.isConstructor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    194:194:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):336 -> a
+    195:212:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):337:354 -> a
+    213:215:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):353:355 -> a
+    216:216:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):348:348 -> a
+    217:246:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):367:396 -> a
+    247:258:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):395:406 -> a
+    259:259:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
+    259:259:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):406 -> a
+    260:269:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):407:416 -> a
+    270:270:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
+    270:270:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):416 -> a
+    271:315:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):417:461 -> a
+    316:316:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):460:460 -> a
+    317:321:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):511:515 -> a
+    317:321:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
+    322:323:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):523:524 -> a
+    322:323:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
+    322:323:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
+    324:324:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
+    324:324:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):524 -> a
+    324:324:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
+    324:324:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
+    325:359:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):525:559 -> a
+    325:359:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
+    325:359:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
+    360:360:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
+    360:360:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):559 -> a
+    360:360:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
+    360:360:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
+    361:382:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):560:581 -> a
+    361:382:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
+    361:382:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
+    383:383:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):580:580 -> a
+    383:383:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
+    383:383:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
+    384:384:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):575:575 -> a
+    384:384:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516 -> a
+    384:384:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):466 -> a
+    385:385:boolean lambda$markMapOrRequiredFieldsAsReachable$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):450:450 -> a
+    386:386:boolean com.android.tools.r8.graph.DexClassAndMethod.isStructurallyEqualTo(com.android.tools.r8.graph.DexClassAndMethod):41:41 -> a
+    386:386:boolean lambda$markMapOrRequiredFieldsAsReachable$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):450 -> a
+    387:387:boolean com.android.tools.r8.graph.DexClassAndMethod.isStructurallyEqualTo(com.android.tools.r8.graph.DexClassAndMethod):41:41 -> a
+    387:387:boolean lambda$markMapOrRequiredFieldsAsReachable$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):451 -> a
+    388:395:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):591:598 -> a
+    396:396:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
+    396:396:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):599 -> a
+    397:409:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):599:611 -> a
+    410:416:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):622:628 -> a
+    417:443:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):627:653 -> a
+    444:464:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):662:682 -> a
+    465:473:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):160:168 -> a
+    465:473:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):682 -> a
+    474:474:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):684:684 -> a
     1:25:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):218:242 -> b
     26:26:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$3(com.android.tools.r8.graph.DexType):354:354 -> b
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.KP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.yO:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
@@ -41366,7 +40951,6 @@
     11:11:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):79:79 -> a
     12:12:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType.getActualFieldType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):30:30 -> a
     12:12:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):79 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:15:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):80:82 -> a
     16:16:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isProtoTypeObject():0:0 -> a
     16:16:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):82 -> a
@@ -41409,11 +40993,11 @@
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType getType():66:66 -> d
     1:1:boolean hasAuxData():44:44 -> e
     1:15:java.lang.String toString():209:223 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.LP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.zO:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject asProtoFieldObject() -> b
     boolean isProtoFieldObject() -> f
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.MP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.AO:
     boolean isMapFieldWithProto2EnumValue -> e
     boolean hasHasBit -> f
     boolean $assertionsDisabled -> g
@@ -41441,7 +41025,7 @@
     1:1:boolean isValid():134:134 -> k
     1:1:boolean needsIsInitializedCheck():139:139 -> l
     1:14:int serialize():159:172 -> m
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.NP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.BO:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -41450,7 +41034,7 @@
     2:16:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.fromFieldIdWithExtraBits(int):56:70 -> a
     2:16:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):17 -> a
     17:18:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):18:19 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.SP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.FO:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
@@ -41471,8 +41055,7 @@
     1:1:int numberOfHasBitsObjects():245:245 -> j
     1:1:int numberOfOneOfObjects():249:249 -> k
     1:9:java.lang.String toString():254:262 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.PP:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.QP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.DO:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     boolean $assertionsDisabled -> f
@@ -41495,26 +41078,32 @@
     13:15:boolean lambda$removeDeadFields$0(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):74:76 -> b
     16:16:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isDeadProtoFieldObject():0:0 -> b
     16:16:boolean lambda$removeDeadFields$0(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):76 -> b
-    1:12:void removeUnusedSharedData():83:94 -> c
-    13:13:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> c
-    13:13:void removeUnusedSharedData():94 -> c
-    14:24:void removeUnusedSharedData():95:105 -> c
-    25:25:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> c
-    25:25:void removeUnusedSharedData():105 -> c
-    26:49:void removeUnusedSharedData():106:129 -> c
-    50:75:void removeUnusedSharedData():128:153 -> c
-    76:76:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isDeadProtoFieldObject():0:0 -> c
-    76:76:void removeUnusedSharedData():153 -> c
-    77:87:void removeUnusedSharedData():154:164 -> c
-    88:88:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> c
-    88:88:void removeUnusedSharedData():164 -> c
-    89:96:void removeUnusedSharedData():165:172 -> c
-    97:97:void removeUnusedSharedData():171:171 -> c
-    98:99:void removeUnusedSharedData():84:85 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.RP:
+    1:8:void removeUnusedSharedData():83:90 -> c
+    9:9:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> c
+    9:9:void removeUnusedSharedData():90 -> c
+    10:10:void removeUnusedSharedData():91:91 -> c
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> c
+    11:11:void removeUnusedSharedData():91 -> c
+    12:14:void removeUnusedSharedData():92:94 -> c
+    15:15:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> c
+    15:15:void removeUnusedSharedData():94 -> c
+    16:26:void removeUnusedSharedData():95:105 -> c
+    27:27:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> c
+    27:27:void removeUnusedSharedData():105 -> c
+    28:51:void removeUnusedSharedData():106:129 -> c
+    52:77:void removeUnusedSharedData():128:153 -> c
+    78:78:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isDeadProtoFieldObject():0:0 -> c
+    78:78:void removeUnusedSharedData():153 -> c
+    79:89:void removeUnusedSharedData():154:164 -> c
+    90:90:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> c
+    90:90:void removeUnusedSharedData():164 -> c
+    91:98:void removeUnusedSharedData():165:172 -> c
+    99:99:void removeUnusedSharedData():171:171 -> c
+    100:101:void removeUnusedSharedData():84:85 -> c
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.EO:
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1):180:180 -> <init>
     2:2:void <init>():181:181 -> <init>
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.TP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.GO:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
     com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
@@ -41523,18 +41112,18 @@
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> d
     boolean isDeadProtoFieldObject() -> e
     boolean isProtoFieldObject() -> f
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.UP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.HO:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):21:22 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:29 -> a
     4:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28:30 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.VP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.IO:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:32 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet asProtoObjectFromStaticGet() -> c
     1:1:com.android.tools.r8.graph.DexField getField():25:25 -> g
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.WP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.JO:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean,boolean,boolean):20:20 -> <init>
@@ -41546,7 +41135,7 @@
     boolean isRepeated() -> h
     boolean isSingular() -> j
     1:1:boolean isValid():60:60 -> k
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.XP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.KO:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject oneOfCaseObject -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject oneOfObject -> a
     1:3:void <init>(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject):15:17 -> <init>
@@ -41554,18 +41143,18 @@
     2:3:void forEach(java.util.function.Consumer):29:30 -> a
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject getOneOfObject():21:21 -> b
     1:1:java.util.stream.Stream stream():34:34 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.gQ:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.SO:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):16:17 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26:26 -> a
-    2:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1184:1185 -> a
+    2:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1208:1209 -> a
     2:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     4:4:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> a
-    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1185 -> a
+    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1209 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> d
     1:1:com.android.tools.r8.graph.DexType getType():21:21 -> g
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.ja:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.X9:
     1:13:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):43:55 -> a
     14:14:boolean com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):629:629 -> a
     14:14:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
@@ -41575,7 +41164,7 @@
     16:16:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):64 -> a
     17:47:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):65:95 -> a
     48:91:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):66:109 -> a
-com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.internal.m3:
+com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.internal.k3:
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> g
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.analysis.type.TypeElement memberTypeLattice -> f
@@ -41585,16 +41174,16 @@
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getMemberType():66:66 -> J
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getMemberTypeAsValueType():70:70 -> K
     2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBoolean():0:0 -> K
-    2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():378 -> K
+    2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():388 -> K
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement getMemberTypeAsValueType():70 -> K
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isByte():0:0 -> K
-    3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():379 -> K
+    3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():389 -> K
     3:3:com.android.tools.r8.ir.analysis.type.TypeElement getMemberTypeAsValueType():70 -> K
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isShort():0:0 -> K
-    4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():380 -> K
+    4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():390 -> K
     4:4:com.android.tools.r8.ir.analysis.type.TypeElement getMemberTypeAsValueType():70 -> K
     5:5:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isChar():0:0 -> K
-    5:5:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():381 -> K
+    5:5:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():391 -> K
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement getMemberTypeAsValueType():70 -> K
     6:6:com.android.tools.r8.ir.analysis.type.TypeElement getMemberTypeAsValueType():70:70 -> K
     1:4:int getNesting():52:55 -> L
@@ -41609,25 +41198,25 @@
     16:27:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeElement,com.android.tools.r8.graph.AppView):152:163 -> a
     28:38:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):170:180 -> a
     39:50:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):176:187 -> a
-    51:53:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):419:421 -> a
+    51:53:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):429:431 -> a
     51:53:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):190 -> a
-    54:56:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):420:422 -> a
+    54:56:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):430:432 -> a
     54:56:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):190 -> a
-    57:57:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):415:415 -> a
+    57:57:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):425:425 -> a
     57:57:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):188 -> a
     1:9:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):39:47 -> b
     1:8:boolean equals(java.lang.Object):121:128 -> equals
     1:1:int hashCode():133:133 -> hashCode
     boolean isArrayType() -> r
     1:1:java.lang.String toString():113:113 -> toString
-com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.z5:
+com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.w5:
     com.android.tools.r8.ir.analysis.type.BooleanTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeElement getInstance():11:11 -> F
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.M5:
+com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.J5:
     com.android.tools.r8.ir.analysis.type.BottomTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -41635,21 +41224,21 @@
     1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getInstance():15:15 -> E
     1:1:int hashCode():35:35 -> hashCode
     1:1:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.c6:
+com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.Z5:
     com.android.tools.r8.ir.analysis.type.ByteTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getInstance():11:11 -> F
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.n9:
+com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.d9:
     com.android.tools.r8.ir.analysis.type.CharTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.CharTypeElement getInstance():11:11 -> F
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.gb:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.Ma:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> g
@@ -41682,38 +41271,35 @@
     265:265:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):212:212 -> a
     266:276:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):222:232 -> a
     277:277:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":519,"2":520,"3":521}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":518,"2":519,"3":520}}
+    518:518:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):232:232 -> a
     519:519:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):232:232 -> a
     520:520:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):232:232 -> a
-    521:521:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):232:232 -> a
     511:511:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):234:234 -> a
     512:512:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     512:512:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):234 -> a
-    513:513:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    513:513:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    513:513:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):234 -> a
-    514:518:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):234:238 -> a
-    522:524:void lambda$fixupClassTypeReferences$6(java.util.function.Function,com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder,com.android.tools.r8.graph.DexType,java.lang.Boolean):251:253 -> a
-    525:534:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):262:271 -> a
-    535:535:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):267:267 -> a
-    536:560:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinWithClassHierarchy(com.android.tools.r8.ir.analysis.type.ClassTypeElement):277:301 -> a
-    536:560:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):273 -> a
-    561:561:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.createUnmarked():341:341 -> a
-    561:561:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker lambda$computeLeastUpperBoundOfInterfaces$9(com.android.tools.r8.graph.DexType):468 -> a
-    562:591:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):402:431 -> a
-    592:596:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):443:447 -> a
-    597:597:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
-    597:597:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):447 -> a
-    598:602:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):447:451 -> a
-    603:603:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
-    603:603:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):451 -> a
-    604:662:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):451:509 -> a
-    663:663:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):444:444 -> a
-    664:664:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):459:459 -> a
-    665:665:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.forLeft(boolean):333:333 -> a
-    665:665:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):459 -> a
-    666:666:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):459:459 -> a
-    667:668:void lambda$computeLeastUpperBoundOfInterfaces$10(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):484:485 -> a
+    513:517:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):234:238 -> a
+    521:523:void lambda$fixupClassTypeReferences$6(java.util.function.Function,com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder,com.android.tools.r8.graph.DexType,java.lang.Boolean):251:253 -> a
+    524:533:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):262:271 -> a
+    534:534:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):267:267 -> a
+    535:559:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinWithClassHierarchy(com.android.tools.r8.ir.analysis.type.ClassTypeElement):277:301 -> a
+    535:559:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):273 -> a
+    560:560:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.createUnmarked():341:341 -> a
+    560:560:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker lambda$computeLeastUpperBoundOfInterfaces$9(com.android.tools.r8.graph.DexType):468 -> a
+    561:590:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):402:431 -> a
+    591:595:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):443:447 -> a
+    596:596:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
+    596:596:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):447 -> a
+    597:601:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):447:451 -> a
+    602:602:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
+    602:602:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):451 -> a
+    603:661:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):451:509 -> a
+    662:662:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):444:444 -> a
+    663:663:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):459:459 -> a
+    664:664:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.forLeft(boolean):333:333 -> a
+    664:664:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):459 -> a
+    665:665:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):459:459 -> a
+    666:667:void lambda$computeLeastUpperBoundOfInterfaces$10(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):484:485 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeElement asClassType() -> b
     1:3:com.android.tools.r8.ir.analysis.type.ClassTypeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):58:60 -> b
     4:8:com.android.tools.r8.ir.analysis.type.ClassTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):114:118 -> b
@@ -41727,7 +41313,7 @@
     boolean isClassType() -> s
     1:16:java.lang.String toString():170:185 -> toString
     17:26:java.lang.String toString():178:187 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.eb:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.Ka:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker LEFT_KNOWN -> c
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker RIGHT_UNKNOWN -> f
     com.android.tools.r8.utils.OptionalBool left -> a
@@ -41741,7 +41327,6 @@
     2:2:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):369:369 -> a
     3:3:boolean com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.isMarked():351:351 -> a
     3:3:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):369 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:8:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):369:373 -> a
     9:10:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.knownIfAnyIsKnown(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.utils.OptionalBool):359:360 -> a
     9:10:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):373 -> a
@@ -41750,61 +41335,62 @@
     17:18:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):378 -> a
     19:21:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):378:380 -> a
     1:2:boolean knownIfBothAreKnown():364:365 -> b
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.fb:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.La:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker marker -> b
     com.android.tools.r8.graph.DexType itf -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):389:391 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.qf:
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.af:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     java.util.function.Function mapping -> b
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):27:27 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function):31:33 -> <init>
-    1:11:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):40:50 -> a
-    12:17:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):96:101 -> a
-    12:17:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):50 -> a
-    18:18:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function):76:76 -> a
-    18:18:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):101 -> a
-    18:18:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):50 -> a
-    19:19:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):102:102 -> a
-    19:19:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):50 -> a
-    20:20:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53:53 -> a
-    21:26:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):78:83 -> a
-    21:26:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    27:27:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    27:27:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):83 -> a
-    27:27:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    28:30:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):83:85 -> a
-    28:30:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    31:31:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
-    31:31:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):86 -> a
-    31:31:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    32:32:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):87:87 -> a
-    32:32:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    33:33:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function):76:76 -> a
-    33:33:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):88 -> a
-    33:33:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    34:34:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):84:84 -> a
-    34:34:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    35:41:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):55:61 -> a
-    42:42:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    42:42:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):61 -> a
-    43:50:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):61:68 -> a
-    51:51:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    51:51:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):68 -> a
-    52:57:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):68:73 -> a
-    58:58:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    58:58:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73 -> a
-    59:59:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73:73 -> a
-com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.xh:
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):31:31 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function):35:37 -> <init>
+    1:1:com.android.tools.r8.graph.DexType lambda$new$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):31:31 -> a
+    2:12:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):44:54 -> a
+    13:18:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):100:105 -> a
+    13:18:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):54 -> a
+    19:19:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function):77:77 -> a
+    19:19:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):105 -> a
+    19:19:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):54 -> a
+    20:20:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):106:106 -> a
+    20:20:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):54 -> a
+    21:21:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):57:57 -> a
+    22:27:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):82:87 -> a
+    22:27:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):57 -> a
+    28:28:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    28:28:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):87 -> a
+    28:28:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):57 -> a
+    29:31:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):87:89 -> a
+    29:31:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):57 -> a
+    32:32:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
+    32:32:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):90 -> a
+    32:32:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):57 -> a
+    33:33:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):91:91 -> a
+    33:33:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):57 -> a
+    34:34:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function):77:77 -> a
+    34:34:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):92 -> a
+    34:34:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):57 -> a
+    35:35:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):88:88 -> a
+    35:35:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):57 -> a
+    36:42:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):59:65 -> a
+    43:43:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    43:43:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):65 -> a
+    44:51:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):65:72 -> a
+    52:52:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    52:52:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):72 -> a
+    53:58:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):72:77 -> a
+    59:59:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    59:59:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):77 -> a
+    60:60:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):77:77 -> a
+com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.eh:
     com.android.tools.r8.ir.analysis.type.DoubleTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getInstance():11:11 -> F
     1:1:int hashCode():26:26 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.DynamicType -> com.android.tools.r8.internal.Fh:
+com.android.tools.r8.ir.analysis.type.DynamicType -> com.android.tools.r8.internal.mh:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -41844,11 +41430,9 @@
     61:61:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):169:169 -> a
     62:62:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():49:49 -> a
     62:62:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):169 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     63:63:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):169:169 -> a
     64:64:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():49:49 -> a
     64:64:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):169 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     65:65:com.android.tools.r8.ir.analysis.type.NotNullDynamicType com.android.tools.r8.ir.analysis.type.DynamicType.definitelyNotNull():87:87 -> a
     65:65:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):172 -> a
     66:66:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicType.unknown():91:91 -> a
@@ -41867,7 +41451,7 @@
     boolean isNullType() -> k
     boolean isUnknown() -> l
     1:1:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound unknown():91:91 -> m
-com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound -> com.android.tools.r8.internal.Hh:
+com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound -> com.android.tools.r8.internal.oh:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():11:11 -> <clinit>
@@ -41907,7 +41491,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():49:49 -> n
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound.getDynamicUpperBoundType():39:39 -> o
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():11 -> o
-com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound -> com.android.tools.r8.internal.Ih:
+com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound -> com.android.tools.r8.internal.ph:
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> c
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound NULL_TYPE -> e
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound BOTTOM -> d
@@ -41952,13 +41536,11 @@
     37:39:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
     40:40:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
     40:40:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):179 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:40:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
     41:43:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):183:185 -> a
     41:43:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
     44:44:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
     44:44:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):185 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     44:44:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
     45:51:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):189:195 -> a
     45:51:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
@@ -41997,7 +41579,7 @@
     2:2:boolean isUnknown():157 -> l
     com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType() -> n
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():104:104 -> o
-com.android.tools.r8.ir.analysis.type.ExactDynamicType -> com.android.tools.r8.internal.dj:
+com.android.tools.r8.ir.analysis.type.ExactDynamicType -> com.android.tools.r8.internal.Li:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement):16:16 -> <init>
@@ -42028,21 +41610,21 @@
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ExactDynamicType.getExactClassType():31:31 -> o
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ExactDynamicType.getDynamicUpperBoundType():21 -> o
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():13 -> o
-com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.Nk:
+com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.rk:
     com.android.tools.r8.ir.analysis.type.FloatTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getInstance():10:10 -> F
     1:1:int hashCode():25:25 -> hashCode
     1:1:java.lang.String toString():20:20 -> toString
-com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.Mt:
+com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.ht:
     com.android.tools.r8.ir.analysis.type.IntTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInstance():10:10 -> F
     1:1:int hashCode():25:25 -> hashCode
     1:1:java.lang.String toString():20:20 -> toString
-com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.Ot:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.it:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap interfaces -> a
     com.android.tools.r8.ir.analysis.type.InterfaceCollection EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -42056,7 +41638,6 @@
     6:6:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):153:153 -> a
     7:7:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):108:108 -> a
     7:7:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):153 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:10:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):155:157 -> a
     1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection empty():69:69 -> b
     2:2:boolean containsKnownInterface(com.android.tools.r8.graph.DexType):161:161 -> b
@@ -42068,8 +41649,7 @@
     1:1:boolean isEmpty():96:96 -> f
     1:1:int size():100:100 -> g
     1:1:int hashCode():117:117 -> hashCode
-com.android.tools.r8.ir.analysis.type.InterfaceCollection$1 -> com.android.tools.r8.internal.Nt:
-com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.Ot$a:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.it$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap interfaces -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.InterfaceCollection$1):32:32 -> <init>
     2:2:void <init>():35:35 -> <init>
@@ -42077,14 +41657,14 @@
     1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder addInterface(com.android.tools.r8.graph.DexType,boolean):49:49 -> a
     2:2:java.lang.Boolean lambda$addInterface$0(boolean,com.android.tools.r8.graph.DexType,java.lang.Boolean):53:53 -> a
     3:6:com.android.tools.r8.ir.analysis.type.InterfaceCollection build():58:61 -> a
-com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.rD:
+com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.zC:
     com.android.tools.r8.ir.analysis.type.LongTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.LongTypeElement getInstance():11:11 -> F
     1:1:int hashCode():26:26 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.NotNullDynamicType -> com.android.tools.r8.internal.fI:
+com.android.tools.r8.ir.analysis.type.NotNullDynamicType -> com.android.tools.r8.internal.bH:
     com.android.tools.r8.ir.analysis.type.NotNullDynamicType INSTANCE -> c
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():21:23 -> <clinit>
@@ -42097,7 +41677,7 @@
     1:1:int hashCode():71:71 -> hashCode
     boolean isNotNullType() -> j
     1:1:com.android.tools.r8.ir.analysis.type.NotNullDynamicType get():28:28 -> n
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.iI:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.hH:
     com.android.tools.r8.ir.analysis.type.Nullability DEFINITELY_NULL -> a
     com.android.tools.r8.ir.analysis.type.Nullability BOTTOM -> d
     com.android.tools.r8.ir.analysis.type.Nullability MAYBE_NULL -> c
@@ -42115,7 +41695,7 @@
     1:1:boolean isMaybeNull():45:45 -> g
     1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():99:99 -> h
     1:13:java.lang.String toString():108:120 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.jI:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.iH:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement maybeNullVariant -> a
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement bottomVariant -> d
@@ -42131,7 +41711,7 @@
     32:40:void com.android.tools.r8.ir.analysis.type.NullabilityVariants.set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):26:34 -> a
     32:40:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):64 -> a
     41:42:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):65:66 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.oN:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.fM:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -42184,10 +41764,10 @@
     79:79:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):60:60 -> b
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
     boolean isPrimitiveType() -> y
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.nN:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.eM:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():113:113 -> <clinit>
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.yS:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.cR:
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_INSTANCE -> d
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_BOTTOM_INSTANCE -> e
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
@@ -42210,23 +41790,23 @@
     1:1:boolean equals(java.lang.Object):113:113 -> equals
     1:1:int hashCode():118:118 -> hashCode
     boolean isReferenceType() -> z
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.xS:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.bR:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
-    1:1:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():49:49 -> a
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
+    2:2:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():49:49 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19 -> a
+    3:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:int hashCode():42:42 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.wV:
+com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.MT:
     com.android.tools.r8.ir.analysis.type.ShortTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ShortTypeElement getInstance():11:11 -> F
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.RV:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.qU:
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -42234,7 +41814,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getInstance():16:16 -> E
     1:1:int hashCode():36:36 -> hashCode
     1:1:java.lang.String toString():26:26 -> toString
-com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.LZ:
+com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.bY:
     com.android.tools.r8.ir.analysis.type.TopTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -42242,7 +41822,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getInstance():15:15 -> E
     1:1:int hashCode():35:35 -> hashCode
     1:1:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.b10:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.rZ:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> e
@@ -42267,119 +41847,122 @@
     69:79:com.android.tools.r8.graph.DexType toRefinedReceiverType(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):178:188 -> a
     1:4:void widening(com.android.tools.r8.ir.code.IRCode):56:59 -> b
     5:5:boolean verifyValuesUpToDate(java.lang.Iterable):82:82 -> b
-com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.h10:
+com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.xZ:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:1:void <init>():20:20 -> <init>
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>():21:21 -> <init>
     boolean isSinglePrimitive() -> A
     boolean isWidePrimitive() -> B
     com.android.tools.r8.ir.analysis.type.Nullability nullability() -> C
-    1:1:int requiredRegisters():410:410 -> D
+    1:1:int requiredRegisters():420:420 -> D
     2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> D
-    2:2:int requiredRegisters():410 -> D
+    2:2:int requiredRegisters():420 -> D
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> D
-    3:3:int requiredRegisters():410 -> D
-    4:4:int requiredRegisters():410:410 -> D
+    3:3:int requiredRegisters():420 -> D
+    4:4:int requiredRegisters():420:420 -> D
     com.android.tools.r8.ir.analysis.type.ArrayTypeElement asArrayType() -> a
     1:1:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    1:1:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):239 -> a
-    2:2:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):239:239 -> a
+    1:1:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):249 -> a
+    2:2:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):249:249 -> a
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    3:3:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):239 -> a
-    4:12:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):242:250 -> a
+    3:3:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):249 -> a
+    4:12:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):252:260 -> a
     com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set) -> a
     boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView) -> a
     13:13:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    13:13:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):115 -> a
-    14:14:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):118:118 -> a
+    13:13:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):125 -> a
+    14:14:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):128:128 -> a
     15:15:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    15:15:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):118 -> a
+    15:15:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):128 -> a
     16:17:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
-    16:17:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):121 -> a
-    18:19:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):124:125 -> a
-    20:32:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.join(com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement):134:146 -> a
-    20:32:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):125 -> a
-    33:42:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):125:134 -> a
+    16:17:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):131 -> a
+    18:19:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):134:135 -> a
+    20:20:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.join(com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement):134:134 -> a
+    20:20:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):135 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    21:32:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.join(com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement):135:146 -> a
+    21:32:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):135 -> a
+    33:42:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):135:144 -> a
     43:43:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
-    43:43:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):135 -> a
-    44:44:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):136:136 -> a
+    43:43:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):145 -> a
+    44:44:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):146:146 -> a
     45:45:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
-    45:45:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):138 -> a
-    46:48:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):139:141 -> a
-    49:49:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):415:415 -> a
-    49:49:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):142 -> a
-    50:58:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):145:153 -> a
-    59:59:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):122:122 -> a
-    60:60:com.android.tools.r8.ir.analysis.type.TypeElement rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):95:95 -> a
-    61:63:com.android.tools.r8.ir.analysis.type.TypeElement join(java.lang.Iterable,com.android.tools.r8.graph.AppView):157:159 -> a
-    64:64:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):311:311 -> a
-    65:66:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isClassType(com.android.tools.r8.graph.DexType):306:307 -> a
-    65:66:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):311 -> a
-    67:67:com.android.tools.r8.ir.analysis.type.ClassTypeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):415:415 -> a
-    68:68:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):434:434 -> a
-    69:76:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):439:446 -> a
+    45:45:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):148 -> a
+    46:48:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):149:151 -> a
+    49:49:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):425:425 -> a
+    49:49:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):152 -> a
+    50:58:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):155:163 -> a
+    59:59:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):132:132 -> a
+    60:60:com.android.tools.r8.ir.analysis.type.TypeElement rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,java.util.Set):104:104 -> a
+    61:61:com.android.tools.r8.graph.DexType lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):105:105 -> a
+    62:64:com.android.tools.r8.ir.analysis.type.TypeElement join(java.lang.Iterable,com.android.tools.r8.graph.AppView):167:169 -> a
+    65:65:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):321:321 -> a
+    66:67:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isClassType(com.android.tools.r8.graph.DexType):316:317 -> a
+    66:67:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):321 -> a
+    68:68:com.android.tools.r8.ir.analysis.type.ClassTypeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):425:425 -> a
+    69:69:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):444:444 -> a
+    70:77:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):449:456 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeElement asClassType() -> b
-    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):185:185 -> b
-    2:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):190:191 -> b
-    2:3:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):185 -> b
-    4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):430:430 -> b
+    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):195:195 -> b
+    2:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):200:201 -> b
+    2:3:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):195 -> b
+    4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):440:440 -> b
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
     1:1:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> c
-    1:1:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):205 -> c
-    2:2:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):206:206 -> c
+    1:1:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):215 -> c
+    2:2:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):216:216 -> c
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> c
-    3:3:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):206 -> c
-    4:4:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):208:208 -> c
+    3:3:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):216 -> c
+    4:4:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):218:218 -> c
     5:5:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> c
-    5:5:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):208 -> c
+    5:5:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):218 -> c
     6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> c
-    6:6:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):211 -> c
+    6:6:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):221 -> c
     7:7:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> c
-    7:7:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):214 -> c
-    8:17:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):217:226 -> c
+    7:7:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):224 -> c
+    8:17:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):227:236 -> c
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement asReferenceType() -> d
-    1:1:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):173:173 -> d
-    2:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):190:191 -> d
-    2:3:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):173 -> d
-    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeElement getBoolean():31:31 -> e
-    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getBottom():23:23 -> f
-    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getByte():35:35 -> g
-    1:1:com.android.tools.r8.ir.analysis.type.CharTypeElement getChar():43:43 -> h
-    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getDouble():63:63 -> i
-    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getFloat():51:51 -> j
-    1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInt():47:47 -> k
-    1:1:com.android.tools.r8.ir.analysis.type.LongTypeElement getLong():59:59 -> l
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getNull():71:71 -> m
-    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeElement getShort():39:39 -> n
-    1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getSingle():55:55 -> o
-    1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getTop():27:27 -> p
-    1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement getWide():67:67 -> q
+    1:1:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):183:183 -> d
+    2:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):200:201 -> d
+    2:3:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):183 -> d
+    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeElement getBoolean():32:32 -> e
+    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getBottom():24:24 -> f
+    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getByte():36:36 -> g
+    1:1:com.android.tools.r8.ir.analysis.type.CharTypeElement getChar():44:44 -> h
+    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getDouble():64:64 -> i
+    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getFloat():52:52 -> j
+    1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInt():48:48 -> k
+    1:1:com.android.tools.r8.ir.analysis.type.LongTypeElement getLong():60:60 -> l
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getNull():72:72 -> m
+    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeElement getShort():40:40 -> n
+    1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getSingle():56:56 -> o
+    1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getTop():28:28 -> p
+    1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement getWide():68:68 -> q
     boolean isArrayType() -> r
     boolean isClassType() -> s
-    1:1:boolean isDefinitelyNotNull():406:406 -> t
+    1:1:boolean isDefinitelyNotNull():416:416 -> t
     boolean isInt() -> u
     boolean isNullType() -> v
-    1:1:boolean isNullable():99:99 -> w
+    1:1:boolean isNullable():109:109 -> w
     2:2:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():49:49 -> w
-    2:2:boolean isNullable():99 -> w
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:2:boolean isPreciseType():367:368 -> x
+    2:2:boolean isNullable():109 -> w
+    1:2:boolean isPreciseType():377:378 -> x
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> x
-    3:3:boolean isPreciseType():369 -> x
+    3:3:boolean isPreciseType():379 -> x
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> x
-    4:4:boolean isPreciseType():370 -> x
+    4:4:boolean isPreciseType():380 -> x
     5:5:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> x
-    5:5:boolean isPreciseType():371 -> x
+    5:5:boolean isPreciseType():381 -> x
     6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isLong():0:0 -> x
-    6:6:boolean isPreciseType():372 -> x
+    6:6:boolean isPreciseType():382 -> x
     7:7:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDouble():0:0 -> x
-    7:7:boolean isPreciseType():373 -> x
+    7:7:boolean isPreciseType():383 -> x
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> x
-    8:8:boolean isPreciseType():374 -> x
+    8:8:boolean isPreciseType():384 -> x
     boolean isPrimitiveType() -> y
     boolean isReferenceType() -> z
-com.android.tools.r8.ir.analysis.type.TypeUtils -> com.android.tools.r8.internal.p10:
+com.android.tools.r8.ir.analysis.type.TypeUtils -> com.android.tools.r8.internal.FZ:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():36:36 -> <clinit>
     1:12:com.android.tools.r8.ir.analysis.type.TypeElement computeUseType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):72:83 -> a
@@ -42490,13 +42073,13 @@
     86:86:com.android.tools.r8.ir.analysis.type.TypeElement computeUseType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):86 -> a
     87:87:com.android.tools.r8.ir.analysis.type.TypeElement computeUseType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):86:86 -> a
     88:92:void enqueueUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):96:100 -> a
-com.android.tools.r8.ir.analysis.type.TypeUtils$UserAndValuePair -> com.android.tools.r8.internal.o10:
+com.android.tools.r8.ir.analysis.type.TypeUtils$UserAndValuePair -> com.android.tools.r8.internal.EZ:
     com.android.tools.r8.ir.code.InstructionOrPhi user -> a
     com.android.tools.r8.ir.code.Value value -> b
     1:3:void <init>(com.android.tools.r8.ir.code.InstructionOrPhi,com.android.tools.r8.ir.code.Value):43:45 -> <init>
     1:5:boolean equals(java.lang.Object):53:57 -> equals
     1:1:int hashCode():62:62 -> hashCode
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.A30:
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.M10:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -42560,7 +42143,7 @@
     39:39:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> a
     39:39:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):243 -> a
     com.android.tools.r8.ir.analysis.value.NonConstantNumberValue asNonConstantNumberValue() -> b
-    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> b
+    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> b
     boolean isNonConstantNumberValue() -> c
     com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue asNumberFromIntervalValue() -> d
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> e
@@ -42596,16 +42179,16 @@
     7:7:com.android.tools.r8.ir.analysis.value.SingleNumberValue createNullValue():45:45 -> a
     8:8:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):53:53 -> a
     9:9:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):58:58 -> a
-com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.O5:
+com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.L5:
     com.android.tools.r8.ir.analysis.value.BottomValue INSTANCE -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.BottomValue getInstance():18:18 -> E
-    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> b
-    1:1:int hashCode():43:43 -> hashCode
-    1:1:java.lang.String toString():48:48 -> toString
+    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> b
+    1:1:int hashCode():44:44 -> hashCode
+    1:1:java.lang.String toString():49:49 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.Ld:
+com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.nd:
     boolean containsInt(int) -> a
     com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]) -> a
     boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue) -> a
@@ -42614,14 +42197,14 @@
     com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue asNumberFromIntervalValue() -> d
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> e
     com.android.tools.r8.ir.analysis.value.NumberFromSetValue asNumberFromSetValue() -> i
-com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.NH:
+com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.KG:
     1:1:void <init>():7:7 -> <init>
     long getAbstractionSize() -> E
     com.android.tools.r8.ir.analysis.value.NonConstantNumberValue asNonConstantNumberValue() -> b
     boolean isNonConstantNumberValue() -> c
     com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue asConstantOrNonConstantNumberValue() -> k
     boolean isConstantOrNonConstantNumberValue() -> w
-com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.gI:
+com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.fH:
     com.android.tools.r8.ir.analysis.value.AbstractValue value -> c
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):15:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getNonNullValue():42:42 -> E
@@ -42634,8 +42217,8 @@
     5:5:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNullOrAbstractValue():0:0 -> a
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValue create(com.android.tools.r8.ir.analysis.value.AbstractValue):20 -> a
     6:6:com.android.tools.r8.ir.analysis.value.AbstractValue create(com.android.tools.r8.ir.analysis.value.AbstractValue):23:23 -> a
-    1:1:com.android.tools.r8.ir.analysis.value.NullOrAbstractValue com.android.tools.r8.ir.analysis.value.NullOrAbstractValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):48:48 -> b
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):11 -> b
+    1:1:com.android.tools.r8.ir.analysis.value.NullOrAbstractValue com.android.tools.r8.ir.analysis.value.NullOrAbstractValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):48:48 -> b
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):11 -> b
     1:1:boolean equals(java.lang.Object):56:56 -> equals
     1:1:int hashCode():61:61 -> hashCode
     com.android.tools.r8.ir.analysis.value.NullOrAbstractValue asNullOrAbstractValue() -> l
@@ -42646,7 +42229,7 @@
     70:70:java.lang.String toString():66:66 -> toString
     67:67:java.lang.String toString():66:66 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.mI:
+com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.lH:
     long maxInclusive -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():13:13 -> <clinit>
@@ -42669,13 +42252,13 @@
     11:12:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):63:64 -> a
     13:13:boolean com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue.mayOverlapWith(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):72:72 -> a
     13:13:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):64 -> a
-    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> b
+    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> b
     com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue asNumberFromIntervalValue() -> d
-    1:5:boolean equals(java.lang.Object):82:86 -> equals
-    1:2:int hashCode():92:93 -> hashCode
-    1:1:java.lang.String toString():99:99 -> toString
+    1:5:boolean equals(java.lang.Object):83:87 -> equals
+    1:2:int hashCode():93:94 -> hashCode
+    1:1:java.lang.String toString():100:100 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.pI:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.nH:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -42692,23 +42275,22 @@
     13:13:boolean com.android.tools.r8.ir.analysis.value.NumberFromSetValue.containsInt(int):41:41 -> a
     13:13:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):78 -> a
     14:16:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):80:82 -> a
-    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> b
-    1:5:boolean equals(java.lang.Object):96:100 -> equals
-    1:1:int hashCode():105:105 -> hashCode
+    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> b
+    1:5:boolean equals(java.lang.Object):97:101 -> equals
+    1:1:int hashCode():106:106 -> hashCode
     com.android.tools.r8.ir.analysis.value.NumberFromSetValue asNumberFromSetValue() -> i
-    1:7:java.lang.String toString():110:116 -> toString
+    1:7:java.lang.String toString():111:117 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue$1 -> com.android.tools.r8.internal.nI:
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.oI:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.mH:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():119:119 -> <clinit>
-    1:2:void <init>():123:124 -> <init>
-    3:4:void <init>(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):127:128 -> <init>
-    1:4:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInt(int):132:135 -> a
-    5:8:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInts(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):142:145 -> a
-    9:17:com.android.tools.r8.ir.analysis.value.AbstractValue build(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):152:160 -> a
-com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.LV:
+    1:1:void <clinit>():120:120 -> <clinit>
+    1:2:void <init>():124:125 -> <init>
+    3:4:void <init>(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):128:129 -> <init>
+    1:4:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInt(int):133:136 -> a
+    5:8:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInts(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):143:146 -> a
+    9:17:com.android.tools.r8.ir.analysis.value.AbstractValue build(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):153:161 -> a
+com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.kU:
     com.android.tools.r8.graph.DexType type -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():30:30 -> <clinit>
@@ -42717,7 +42299,7 @@
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
     1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):74:79 -> a
     7:13:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):77:83 -> a
-    14:14:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):426:426 -> a
+    14:14:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):436:436 -> a
     14:14:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):83 -> a
     15:17:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):83:85 -> a
     18:18:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> a
@@ -42736,28 +42318,24 @@
     34:34:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
     34:34:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):109 -> a
     35:41:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):109:115 -> a
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    42:42:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
+    42:42:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
     42:42:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
     42:42:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
     42:42:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):115 -> a
-    43:43:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
+    43:43:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
     43:43:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
     43:43:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
     43:43:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):115 -> a
-    44:44:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179:179 -> a
+    44:44:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    44:44:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
     44:44:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
     44:44:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):115 -> a
-    45:45:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):120:120 -> a
-    1:1:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):132:132 -> c
-    2:2:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":135,"2":136,"3":137}}
-    135:135:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):132:132 -> c
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> c
-    136:136:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):132 -> c
-    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> c
-    137:137:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):132 -> c
-    134:134:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):132:132 -> c
+    45:45:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179:179 -> a
+    45:45:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
+    45:45:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):115 -> a
+    46:46:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):120:120 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):133:133 -> c
     1:1:int hashCode():60:60 -> hashCode
     com.android.tools.r8.ir.analysis.value.SingleConstClassValue asSingleConstClassValue() -> m
     1:1:java.lang.String toString():0:0 -> toString
@@ -42772,13 +42350,13 @@
     69:69:java.lang.String toString():65:65 -> toString
     70:70:java.lang.String toString():65:65 -> toString
     71:71:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.MV:
+com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.lU:
     1:1:void <init>():7:7 -> <init>
     boolean isSingleConstValue() -> A
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo com.android.tools.r8.ir.analysis.value.SingleConstClassValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):30:30 -> a
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.SingleConstClassValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):30:30 -> b
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo com.android.tools.r8.ir.analysis.value.SingleConstClassValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):30:30 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.SingleConstClassValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):30:30 -> b
     com.android.tools.r8.ir.analysis.value.SingleConstValue asSingleConstValue() -> n
-com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.OV:
+com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.nU:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
     com.android.tools.r8.graph.DexReference item -> c
@@ -42791,9 +42369,10 @@
     boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
     1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):82:87 -> a
     7:15:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):85:93 -> a
-    1:2:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):119:120 -> c
-    3:3:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):58:58 -> c
-    3:3:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):120 -> c
+    1:3:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):120:122 -> c
+    4:4:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):121:121 -> c
+    5:5:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):58:58 -> c
+    5:5:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):121 -> c
     1:5:boolean equals(java.lang.Object):59:63 -> equals
     1:1:int hashCode():68:68 -> hashCode
     com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue asSingleDexItemBasedStringValue() -> o
@@ -42803,7 +42382,7 @@
     76:76:java.lang.String toString():73:73 -> toString
     77:77:java.lang.String toString():73:73 -> toString
     74:74:java.lang.String toString():73:73 -> toString
-com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.PV:
+com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.oU:
     com.android.tools.r8.graph.DexField field -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():34:34 -> <clinit>
@@ -42811,7 +42390,7 @@
     boolean isSingleFieldValue() -> B
     1:1:com.android.tools.r8.graph.DexField getField():43:43 -> E
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):34:34 -> a
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):34:34 -> a
     2:3:com.android.tools.r8.graph.DexEncodedField getField(com.android.tools.r8.graph.DexDefinitionSupplier):47:48 -> a
     4:7:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):90:93 -> a
     8:9:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):100:101 -> a
@@ -42822,28 +42401,28 @@
     17:17:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
     17:17:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):119 -> a
     18:21:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):122:125 -> a
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    22:22:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
+    22:22:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
     22:22:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
     22:22:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
     22:22:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):125 -> a
-    23:23:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
+    23:23:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
     23:23:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
     23:23:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
     23:23:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):125 -> a
-    24:24:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179:179 -> a
+    24:24:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    24:24:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
     24:24:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
     24:24:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):125 -> a
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):34:34 -> b
+    25:25:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179:179 -> a
+    25:25:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
+    25:25:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):125 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):34:34 -> b
     2:8:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):58:64 -> b
-    1:8:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):139:146 -> c
-    9:9:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> c
-    9:9:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):146 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:12:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):147:149 -> c
+    1:11:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):140:150 -> c
     com.android.tools.r8.ir.analysis.value.SingleFieldValue asSingleFieldValue() -> p
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState() -> t
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.QV:
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.pU:
     long value -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():24:24 -> <clinit>
@@ -42855,7 +42434,7 @@
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
     boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:1:int com.android.tools.r8.ir.analysis.value.SingleNumberValue.getIntValue():93:93 -> a
     1:1:boolean containsInt(int):36 -> a
     2:2:int com.android.tools.r8.ir.analysis.value.SingleNumberValue.getIntValue():93:93 -> a
@@ -42872,8 +42451,8 @@
     12:12:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):110 -> a
     13:13:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):110:110 -> a
     14:22:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):134:142 -> a
-    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> b
-    com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> c
+    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> b
+    com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> c
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> e
     1:1:int hashCode():120:120 -> hashCode
     com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue asConstantOrNonConstantNumberValue() -> k
@@ -42885,7 +42464,7 @@
     126:126:java.lang.String toString():125:125 -> toString
     1:1:boolean isFalse():51:51 -> x
     1:1:boolean isSingleBoolean():46:46 -> z
-com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.SV:
+com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.rU:
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState state -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():11:11 -> <clinit>
@@ -42905,7 +42484,7 @@
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue.getObjectState():39:39 -> u
     1:1:boolean hasKnownArrayLength():24 -> u
     2:2:boolean hasKnownArrayLength():24:24 -> u
-com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.TV:
+com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.sU:
     1:1:void <init>(com.android.tools.r8.graph.DexField):14:14 -> <init>
     1:5:boolean equals(java.lang.Object):34:38 -> equals
     1:1:int hashCode():43:43 -> hashCode
@@ -42918,7 +42497,7 @@
     33:33:java.lang.String toString():29:29 -> toString
     30:30:java.lang.String toString():29:29 -> toString
     boolean hasObjectState() -> v
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.UV:
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.tU:
     com.android.tools.r8.graph.DexString string -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():26:26 -> <clinit>
@@ -42928,11 +42507,11 @@
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
     boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):70:75 -> a
     7:16:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):73:82 -> a
-    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> b
-    com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> c
+    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> b
+    com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> c
     1:1:int hashCode():56:56 -> hashCode
     com.android.tools.r8.ir.analysis.value.SingleStringValue asSingleStringValue() -> q
     1:1:java.lang.String toString():0:0 -> toString
@@ -42941,59 +42520,59 @@
     64:64:java.lang.String toString():61:61 -> toString
     65:65:java.lang.String toString():61:61 -> toString
     62:62:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.WV:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.vU:
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier) -> a
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
     boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):18:18 -> a
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):18:18 -> b
-    com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> c
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):18:18 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):18:18 -> b
+    com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> c
     boolean isSingleValue() -> g
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> j
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.StatefulObjectValue -> com.android.tools.r8.internal.aX:
+com.android.tools.r8.ir.analysis.value.StatefulObjectValue -> com.android.tools.r8.internal.wV:
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState state -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):16:18 -> <init>
     1:3:com.android.tools.r8.ir.analysis.value.AbstractValue create(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):22:24 -> a
-    1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.StatefulObjectValue.getObjectState():64:64 -> b
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):54 -> b
-    2:2:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):54:54 -> b
-    1:5:boolean equals(java.lang.Object):74:78 -> equals
-    1:1:int hashCode():83:83 -> hashCode
+    1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.StatefulObjectValue.getObjectState():65:65 -> b
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):55 -> b
+    2:2:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):55:55 -> b
+    1:5:boolean equals(java.lang.Object):78:82 -> equals
+    1:1:int hashCode():87:87 -> hashCode
     com.android.tools.r8.ir.analysis.value.StatefulObjectValue asStatefulObjectValue() -> r
-    1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.StatefulObjectValue.getObjectState():64:64 -> s
+    1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.StatefulObjectValue.getObjectState():65:65 -> s
     1:1:int getKnownArrayLength():49 -> s
     2:2:int getKnownArrayLength():49:49 -> s
-    1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState():64:64 -> t
-    1:1:java.lang.String toString():69:69 -> toString
-    1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.StatefulObjectValue.getObjectState():64:64 -> u
+    1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState():65:65 -> t
+    1:1:java.lang.String toString():70:70 -> toString
+    1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.StatefulObjectValue.getObjectState():65:65 -> u
     1:1:boolean hasKnownArrayLength():44 -> u
     2:2:boolean hasKnownArrayLength():44:44 -> u
     boolean hasObjectState() -> v
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.N10:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.d00:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.UnknownValue getInstance():18:18 -> E
-    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> b
-    1:1:int hashCode():43:43 -> hashCode
-    1:1:java.lang.String toString():48:48 -> toString
+    com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> b
+    1:1:int hashCode():44:44 -> hashCode
+    1:1:java.lang.String toString():49:49 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState -> com.android.tools.r8.internal.Wh:
+com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState -> com.android.tools.r8.internal.Gh:
     com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
-    com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
+    com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):33:33 -> a
     boolean isEmpty() -> d
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState getInstance():23:23 -> e
-    1:1:int hashCode():53:53 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState -> com.android.tools.r8.internal.Ti:
+    1:1:int hashCode():54:54 -> hashCode
+com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState -> com.android.tools.r8.internal.Ci:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[] state -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -43004,48 +42583,46 @@
     2:5:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectStateForOrdinal(int):37:40 -> a
     6:6:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.empty():28:28 -> a
     6:6:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectStateForOrdinal(int):38 -> a
-    7:11:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):75:79 -> a
+    7:11:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):76:80 -> a
     1:1:int getKnownArrayLength():54:54 -> b
     boolean isEmpty() -> d
     1:1:int getEnumValuesSize():44:44 -> e
-    1:9:boolean equals(java.lang.Object):84:92 -> equals
-    1:1:int hashCode():101:101 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.KnownLengthArrayState -> com.android.tools.r8.internal.fz:
+    1:9:boolean equals(java.lang.Object):85:93 -> equals
+    1:1:int hashCode():102:102 -> hashCode
+com.android.tools.r8.ir.analysis.value.objectstate.KnownLengthArrayState -> com.android.tools.r8.internal.wy:
     int length -> a
     1:2:void <init>(int):20:21 -> <init>
     void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
-    com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
+    com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):31:31 -> a
     1:1:int getKnownArrayLength():46:46 -> b
     boolean hasKnownArrayLength() -> c
     boolean isEmpty() -> d
-    1:1:int hashCode():61:61 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.NonEmptyObjectState -> com.android.tools.r8.internal.QH:
+    1:1:int hashCode():62:62 -> hashCode
+com.android.tools.r8.ir.analysis.value.objectstate.NonEmptyObjectState -> com.android.tools.r8.internal.NG:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
     1:4:void <init>(java.util.Map):23:26 -> <init>
     1:1:void forEachAbstractFieldValue(java.util.function.BiConsumer):31:31 -> a
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):36:36 -> a
-    3:7:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):46:50 -> a
-    8:8:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
-    8:8:void lambda$rewrittenWithLens$0(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):49 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:void lambda$rewrittenWithLens$0(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):49:49 -> a
+    3:9:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):47:53 -> a
+    10:11:void lambda$rewrittenWithLens$0(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):51:52 -> a
+    12:12:void lambda$rewrittenWithLens$0(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):50:50 -> a
     boolean isEmpty() -> d
-    1:11:boolean equals(java.lang.Object):55:65 -> equals
-    1:1:int hashCode():74:74 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectState -> com.android.tools.r8.internal.EK:
+    1:11:boolean equals(java.lang.Object):58:68 -> equals
+    1:1:int hashCode():77:77 -> hashCode
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectState -> com.android.tools.r8.internal.AJ:
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState asEnumValuesObjectState() -> a
     void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField) -> a
-    com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
+    com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:9:boolean hasMaterializableFieldValueThatMatches(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):38:46 -> a
     1:1:int getKnownArrayLength():68:68 -> b
     boolean hasKnownArrayLength() -> c
     boolean isEmpty() -> d
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder -> com.android.tools.r8.internal.DK:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder -> com.android.tools.r8.internal.zJ:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():79:79 -> <clinit>
@@ -43055,7 +42632,7 @@
     5:5:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.empty():28:28 -> a
     5:5:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState build():91 -> a
     6:6:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState build():91:91 -> a
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectStateAnalysis -> com.android.tools.r8.internal.FK:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectStateAnalysis -> com.android.tools.r8.internal.BJ:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:boolean lambda$computeObjectState$0(com.android.tools.r8.ir.code.Instruction):25:25 -> a
@@ -43067,7 +42644,6 @@
     5:7:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeNewInstanceObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):46:48 -> a
     8:8:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> a
     8:8:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeNewInstanceObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):48 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.empty():28:28 -> a
     9:9:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeNewInstanceObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):50 -> a
     10:10:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeNewInstanceObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):53:53 -> a
@@ -43082,12 +42658,10 @@
     43:44:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):78:79 -> a
     45:45:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1691:1691 -> a
     45:45:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):79 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     46:53:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):82:89 -> a
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):23:23 -> b
     2:2:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():204:204 -> b
     2:2:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):23 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):23:24 -> b
     5:6:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.objectstate.ObjectStateAnalysis.computeNewArrayObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):36:37 -> b
     5:6:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):26 -> b
@@ -43121,10 +42695,10 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):82:82 -> e
     boolean isAdd() -> e1
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
-    int opcode() -> i2
+    int opcode() -> j2
     com.android.tools.r8.ir.code.Add asAdd() -> l
-    boolean isCommutative() -> m2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> q2
+    boolean isCommutative() -> n2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> r2
 com.android.tools.r8.ir.code.AliasedValueConfiguration -> com.android.tools.r8.internal.z1:
     com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction) -> a
     boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction) -> b
@@ -43137,9 +42711,9 @@
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):47:47 -> a
     7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):67:67 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    1:1:int maxInValueRegister():57:57 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
+    1:1:int maxInValueRegister():57:57 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.internal.E1:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> V0
@@ -43151,9 +42725,9 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):66:66 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:int maxInValueRegister():55:55 -> g2
-    1:1:int maxOutValueRegister():60:60 -> h2
-    int opcode() -> i2
+    1:1:int maxInValueRegister():55:55 -> h2
+    1:1:int maxOutValueRegister():60:60 -> i2
+    int opcode() -> j2
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.internal.F1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():16:16 -> <clinit>
@@ -43168,9 +42742,9 @@
     5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):72:72 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:2:int maxInValueRegister():55:56 -> g2
-    1:1:int maxOutValueRegister():61:61 -> h2
-    int opcode() -> i2
+    1:2:int maxInValueRegister():55:56 -> h2
+    1:1:int maxOutValueRegister():61:61 -> i2
+    int opcode() -> j2
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.internal.N1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:19 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -43187,11 +42761,11 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):64:64 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
-    int opcode() -> i2
+    int opcode() -> j2
     com.android.tools.r8.ir.code.And asAnd() -> m
-    boolean isCommutative() -> m2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> q2
-com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.internal.G2:
+    boolean isCommutative() -> n2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> r2
+com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.internal.F2:
     int $r8$clinit -> l
     boolean knownToBeBoolean -> j
     boolean $assertionsDisabled -> k
@@ -43212,21 +42786,21 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95:95 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isArgument() -> g1
-    1:1:int maxInValueRegister():79:79 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:int getIndex():40:40 -> l2
-    2:7:boolean com.android.tools.r8.ir.code.Argument.verifyIndex():46:51 -> l2
-    2:7:int getIndex():40 -> l2
-    8:9:int getIndex():40:41 -> l2
+    1:1:int maxInValueRegister():79:79 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:int getIndex():40:40 -> m2
+    2:7:boolean com.android.tools.r8.ir.code.Argument.verifyIndex():46:51 -> m2
+    2:7:int getIndex():40 -> m2
+    8:9:int getIndex():40:41 -> m2
     com.android.tools.r8.ir.code.Argument asArgument() -> n
-com.android.tools.r8.ir.code.Argument$Builder -> com.android.tools.r8.internal.F2:
+com.android.tools.r8.ir.code.Argument$Builder -> com.android.tools.r8.internal.E2:
     int index -> c
     1:1:void <init>():149:149 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.Argument$Builder setIndex(int):155:155 -> a
     1:1:com.android.tools.r8.ir.code.Argument build():161:161 -> b
-com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.internal.a3:
+com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.internal.Z2:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -43278,11 +42852,11 @@
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> f
     boolean isArithmeticBinop() -> h1
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> o
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> q2
-com.android.tools.r8.ir.code.ArithmeticBinop$1 -> com.android.tools.r8.internal.Z2:
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> r2
+com.android.tools.r8.ir.code.ArithmeticBinop$1 -> com.android.tools.r8.internal.Y2:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():75:75 -> <clinit>
-com.android.tools.r8.ir.code.ArrayAccess -> com.android.tools.r8.internal.b3:
+com.android.tools.r8.ir.code.ArrayAccess -> com.android.tools.r8.internal.a3:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):16:16 -> <init>
     1:1:boolean instructionInstanceCanThrow():47:47 -> b1
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> b1
@@ -43290,11 +42864,11 @@
     3:6:boolean instructionInstanceCanThrow():48:51 -> b1
     boolean instructionTypeCanThrow() -> d1
     boolean isArrayAccess() -> i1
-    1:1:com.android.tools.r8.ir.code.Value array():20:20 -> l2
-    1:1:com.android.tools.r8.ir.code.Value index():24:24 -> m2
-    com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType) -> n2
+    1:1:com.android.tools.r8.ir.code.Value array():20:20 -> m2
+    1:1:com.android.tools.r8.ir.code.Value index():24:24 -> n2
+    com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType) -> o2
     com.android.tools.r8.ir.code.ArrayAccess asArrayAccess() -> p
-com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.f3:
+com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.d3:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.MemberType type -> i
     1:1:void <clinit>():35:35 -> <clinit>
@@ -43323,9 +42897,8 @@
     265:290:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:104 -> a
     291:291:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):101:101 -> a
     292:296:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91:95 -> a
-    297:297:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> a
+    297:297:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> a
     297:297:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     298:298:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:96 -> a
     299:301:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:97 -> a
     302:326:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:112 -> a
@@ -43405,14 +42978,14 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):125:125 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():60:60 -> d
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
     boolean isArrayGet() -> j1
-    boolean throwsOnNullInput() -> k2
-    1:1:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):268:268 -> n2
+    int opcode() -> j2
+    boolean throwsOnNullInput() -> l2
+    1:269:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):0:268 -> o2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> q
-com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.g3:
+com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.e3:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():144:144 -> O0
     boolean hasInvariantOutType() -> V0
@@ -43434,13 +43007,13 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):102 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean instructionTypeCanThrow() -> d1
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    boolean throwsOnNullInput() -> k2
-    1:1:com.android.tools.r8.ir.code.Value array():40:40 -> l2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    boolean throwsOnNullInput() -> l2
+    1:1:com.android.tools.r8.ir.code.Value array():40:40 -> m2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> r
-com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.j3:
+com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.h3:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.MemberType type -> i
     1:1:void <clinit>():29:29 -> <clinit>
@@ -43467,9 +43040,8 @@
     242:265:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:95 -> a
     266:266:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):92:92 -> a
     267:271:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:86 -> a
-    272:272:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> a
+    272:272:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> a
     272:272:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     273:273:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:87 -> a
     274:276:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:88 -> a
     277:301:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:103 -> a
@@ -43487,15 +43059,15 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):185:185 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():60:60 -> d
-    int maxInValueRegister() -> g2
-    1:1:int maxOutValueRegister():113:113 -> h2
-    int opcode() -> i2
+    int maxInValueRegister() -> h2
+    1:1:int maxOutValueRegister():113:113 -> i2
+    int opcode() -> j2
     boolean isArrayPut() -> k1
-    boolean throwsOnNullInput() -> k2
-    1:1:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):246:246 -> n2
+    boolean throwsOnNullInput() -> l2
+    1:247:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):0:246 -> o2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> s
     1:1:com.android.tools.r8.ir.code.Value value():55:55 -> value
-com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.C3:
+com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.A3:
     com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption dynamicTypeAssumption -> i
     boolean $assertionsDisabled -> l
     com.android.tools.r8.ir.code.Instruction origin -> k
@@ -43523,19 +43095,19 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):192 -> b
     5:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):195:197 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:int maxInValueRegister():177:177 -> g2
-    1:1:int maxOutValueRegister():182:182 -> h2
-    int opcode() -> i2
-    1:1:boolean throwsOnNullInput():242:242 -> k2
-    1:1:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption getDynamicTypeAssumption():82:82 -> l2
-    1:1:boolean hasDynamicTypeAssumption():118:118 -> m2
-    1:1:boolean hasNonNullAssumption():126:126 -> n2
-    1:1:com.android.tools.r8.ir.code.Instruction origin():94:94 -> o2
-    1:1:com.android.tools.r8.ir.code.Value src():90:90 -> p2
-    1:1:void unsetDynamicTypeAssumption():122:122 -> q2
+    1:1:int maxInValueRegister():177:177 -> h2
+    1:1:int maxOutValueRegister():182:182 -> i2
+    int opcode() -> j2
+    1:1:boolean throwsOnNullInput():242:242 -> l2
+    1:1:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption getDynamicTypeAssumption():82:82 -> m2
+    1:1:boolean hasDynamicTypeAssumption():118:118 -> n2
+    1:1:boolean hasNonNullAssumption():126:126 -> o2
+    1:1:com.android.tools.r8.ir.code.Instruction origin():94:94 -> p2
+    1:1:com.android.tools.r8.ir.code.Value src():90:90 -> q2
+    1:1:void unsetDynamicTypeAssumption():122:122 -> r2
     com.android.tools.r8.ir.code.Assume asAssume() -> t
     1:16:java.lang.String toString():272:287 -> toString
-com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.internal.A3:
+com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.internal.y3:
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound dynamicType -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():290:290 -> <clinit>
@@ -43545,14 +43117,14 @@
     7:7:boolean verifyCorrectnessOfValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):306:306 -> a
     1:5:boolean equals(java.lang.Object):317:321 -> equals
     1:1:int hashCode():326:326 -> hashCode
-com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.internal.B3:
+com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.internal.z3:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption instance -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():330:332 -> <clinit>
     1:1:void <init>():334:334 -> <init>
     1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():337:337 -> a
     2:2:boolean verifyCorrectnessOfValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):341:341 -> a
-com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.android.tools.r8.internal.D3:
+com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.android.tools.r8.internal.B3:
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():9:11 -> <clinit>
@@ -43561,16 +43133,15 @@
     2:2:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):27:27 -> a
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
     3:3:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):27 -> a
-    4:4:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):27:27 -> a
-    5:5:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
-    5:5:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):28 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):28:28 -> a
+    4:5:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):27:28 -> a
+    6:6:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
+    6:6:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):28 -> a
+    7:7:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):28:28 -> a
     1:1:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22:22 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     2:2:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22 -> b
     3:3:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22:22 -> b
-com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.w4:
+com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.t4:
     int color -> n
     int estimatedPredecessorsCount -> l
     int unfilledPredecessorsCount -> m
@@ -43587,424 +43158,399 @@
     java.util.List phis -> h
     java.util.Map incompletePhis -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtEntry -> a
-    1:1:void <clinit>():56:56 -> <clinit>
-    1:142:void <init>():56:197 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():229:229 -> A
-    2:2:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():216:216 -> A
-    2:2:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():229 -> A
-    3:4:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():229:230 -> A
-    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():292:293 -> B
-    1:2:com.android.tools.r8.ir.code.BasicBlock getUniqueSuccessor():224:225 -> C
-    1:2:boolean hasCatchHandlers():625:626 -> D
+    1:1:void <clinit>():57:57 -> <clinit>
+    1:142:void <init>():57:198 -> <init>
+    1:1:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():230:230 -> A
+    2:2:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():217:217 -> A
+    2:2:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():230 -> A
+    3:4:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():230:231 -> A
+    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():293:294 -> B
+    1:2:com.android.tools.r8.ir.code.BasicBlock getUniqueSuccessor():225:226 -> C
+    1:2:boolean hasCatchHandlers():626:627 -> D
     3:3:boolean com.android.tools.r8.ir.code.CatchHandlers.isEmpty():55:55 -> D
-    3:3:boolean hasCatchHandlers():626 -> D
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:boolean hasIncompletePhis():1222:1222 -> E
-    1:1:boolean hasOneNormalExit():1602:1602 -> F
-    1:1:boolean hasPhis():592:592 -> G
-    1:1:boolean hasUniquePredecessor():288:288 -> H
-    1:1:boolean hasUniqueSuccessor():208:208 -> I
-    1:2:void incrementUnfilledPredecessorCount():757:758 -> J
-    1:1:boolean isEmpty():694:694 -> K
-    1:1:boolean isFilled():613:613 -> L
-    1:1:boolean isReturnBlock():702:702 -> M
-    1:1:boolean isSealed():1210:1210 -> N
-    1:1:boolean isTrivialGoto():1534:1534 -> O
-    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1678:1678 -> P
-    1:2:boolean notifyPredecessorsMayChangeListeners():306:307 -> Q
-    1:2:boolean notifySuccessorsMayChangeListeners():243:244 -> R
-    1:1:int numberOfCatchHandlers():1627:1627 -> S
-    1:2:int numberOfExceptionalSuccessors():281:282 -> T
-    1:4:int numberOfNormalSuccessors():274:277 -> U
-    1:2:void removeAllNormalSuccessors():353:354 -> V
+    3:3:boolean hasCatchHandlers():627 -> D
+    1:1:boolean hasIncompletePhis():1223:1223 -> E
+    1:1:boolean hasOneNormalExit():1603:1603 -> F
+    1:1:boolean hasPhis():593:593 -> G
+    1:1:boolean hasUniquePredecessor():289:289 -> H
+    1:1:boolean hasUniqueSuccessor():209:209 -> I
+    1:2:void incrementUnfilledPredecessorCount():758:759 -> J
+    1:1:boolean isEmpty():695:695 -> K
+    1:1:boolean isFilled():614:614 -> L
+    1:1:boolean isReturnBlock():703:703 -> M
+    1:1:boolean isSealed():1211:1211 -> N
+    1:1:boolean isTrivialGoto():1535:1535 -> O
+    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1679:1679 -> P
+    1:2:boolean notifyPredecessorsMayChangeListeners():307:308 -> Q
+    1:2:boolean notifySuccessorsMayChangeListeners():244:245 -> R
+    1:1:int numberOfCatchHandlers():1628:1628 -> S
+    1:2:int numberOfExceptionalSuccessors():282:283 -> T
+    1:4:int numberOfNormalSuccessors():275:278 -> U
+    1:2:void removeAllNormalSuccessors():354:355 -> V
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> V
-    3:3:void removeAllNormalSuccessors():354 -> V
-    4:12:void removeAllNormalSuccessors():355:363 -> V
-    1:1:void setFilled():617:617 -> W
-    1:1:void setFilledForTesting():621:621 -> X
-    1:1:int size():698:698 -> Y
+    3:3:void removeAllNormalSuccessors():355 -> V
+    4:12:void removeAllNormalSuccessors():356:364 -> V
+    1:1:void setFilled():618:618 -> W
+    1:1:void setFilledForTesting():622:622 -> X
+    1:1:int size():699:699 -> Y
     1:1:java.lang.String toDetailedString():0:0 -> Z
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5214,"2":5215,"3":5216}}
-    5214:5214:java.lang.String toDetailedString():1263:1263 -> Z
-    5215:5215:java.lang.String toDetailedString():1263:1263 -> Z
-    5216:5216:java.lang.String toDetailedString():1264:1264 -> Z
-    1266:1268:java.lang.String toDetailedString():1265:1267 -> Z
-    1269:1269:java.lang.String toDetailedString():0:0 -> Z
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5214,"2":5215,"3":5216}}
-    5214:5214:java.lang.String toDetailedString():1268:1268 -> Z
-    5215:5215:java.lang.String toDetailedString():1268:1268 -> Z
-    5216:5216:java.lang.String toDetailedString():1268:1268 -> Z
-    2537:2537:java.lang.String toDetailedString():1268:1268 -> Z
-    2538:2538:java.lang.String toDetailedString():0:0 -> Z
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5214,"2":5215,"3":5216}}
-    5214:5214:java.lang.String toDetailedString():1270:1270 -> Z
-    5215:5215:java.lang.String toDetailedString():1270:1270 -> Z
-    5216:5216:java.lang.String toDetailedString():1270:1270 -> Z
-    3808:3809:java.lang.String toDetailedString():1270:1271 -> Z
-    3810:3810:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():613:613 -> Z
-    3810:3810:java.lang.String toDetailedString():1271 -> Z
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5218,"2":5219,"3":5220}}
+    5218:5218:java.lang.String toDetailedString():1264:1264 -> Z
+    5219:5219:java.lang.String toDetailedString():1264:1264 -> Z
+    5220:5220:java.lang.String toDetailedString():1265:1265 -> Z
+    1267:1269:java.lang.String toDetailedString():1266:1268 -> Z
+    1270:1270:java.lang.String toDetailedString():0:0 -> Z
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5218,"2":5219,"3":5220}}
+    5218:5218:java.lang.String toDetailedString():1269:1269 -> Z
+    5219:5219:java.lang.String toDetailedString():1269:1269 -> Z
+    5220:5220:java.lang.String toDetailedString():1269:1269 -> Z
+    2539:2539:java.lang.String toDetailedString():1269:1269 -> Z
+    2540:2540:java.lang.String toDetailedString():0:0 -> Z
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5218,"2":5219,"3":5220}}
+    5218:5218:java.lang.String toDetailedString():1271:1271 -> Z
+    5219:5219:java.lang.String toDetailedString():1271:1271 -> Z
+    5220:5220:java.lang.String toDetailedString():1271:1271 -> Z
     3811:3812:java.lang.String toDetailedString():1271:1272 -> Z
-    3813:3813:boolean com.android.tools.r8.ir.code.BasicBlock.isSealed():1210:1210 -> Z
+    3813:3813:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():614:614 -> Z
     3813:3813:java.lang.String toDetailedString():1272 -> Z
-    3814:3817:java.lang.String toDetailedString():1272:1275 -> Z
-    3818:3825:void com.android.tools.r8.ir.code.BasicBlock.appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1231:1238 -> Z
-    3818:3825:java.lang.String toDetailedString():1275 -> Z
-    3826:3828:java.lang.String toDetailedString():1276:1278 -> Z
-    3829:3836:void com.android.tools.r8.ir.code.BasicBlock.appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1231:1238 -> Z
-    3829:3836:java.lang.String toDetailedString():1278 -> Z
-    3837:3867:java.lang.String toDetailedString():1279:1309 -> Z
-    3868:3868:int com.android.tools.r8.ir.code.BasicBlock.digits(int):1259:1259 -> Z
-    3868:3868:java.lang.String toDetailedString():1309 -> Z
-    3869:3879:java.lang.String toDetailedString():1309:1319 -> Z
-    3880:3880:java.lang.String toDetailedString():0:0 -> Z
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5214,"2":5215,"3":5216}}
-    5214:5214:java.lang.String toDetailedString():1321:1321 -> Z
-    5215:5215:java.lang.String toDetailedString():1321:1321 -> Z
-    5216:5216:java.lang.String toDetailedString():1321:1321 -> Z
-    5201:5213:java.lang.String toDetailedString():1321:1333 -> Z
-    1:4:boolean consistentInitClassInstruction(com.android.tools.r8.ir.code.InitClass,boolean):92:95 -> a
-    5:7:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):100:100 -> a
-    8:8:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper,com.android.tools.r8.ir.code.Instruction):101:101 -> a
-    9:9:void setLocalsAtEntry(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):106:106 -> a
-    10:14:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):200:204 -> a
-    15:33:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):329:347 -> a
-    34:51:void swapSuccessorsByIndex(int,int):376:393 -> a
-    52:59:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):510:517 -> a
-    60:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):521:524 -> a
+    3814:3815:java.lang.String toDetailedString():1272:1273 -> Z
+    3816:3816:boolean com.android.tools.r8.ir.code.BasicBlock.isSealed():1211:1211 -> Z
+    3816:3816:java.lang.String toDetailedString():1273 -> Z
+    3817:3820:java.lang.String toDetailedString():1273:1276 -> Z
+    3821:3828:void com.android.tools.r8.ir.code.BasicBlock.appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1232:1239 -> Z
+    3821:3828:java.lang.String toDetailedString():1276 -> Z
+    3829:3831:java.lang.String toDetailedString():1277:1279 -> Z
+    3832:3839:void com.android.tools.r8.ir.code.BasicBlock.appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1232:1239 -> Z
+    3832:3839:java.lang.String toDetailedString():1279 -> Z
+    3840:3870:java.lang.String toDetailedString():1280:1310 -> Z
+    3871:3871:int com.android.tools.r8.ir.code.BasicBlock.digits(int):1260:1260 -> Z
+    3871:3871:java.lang.String toDetailedString():1310 -> Z
+    3872:3882:java.lang.String toDetailedString():1310:1320 -> Z
+    3883:3883:java.lang.String toDetailedString():0:0 -> Z
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5218,"2":5219,"3":5220}}
+    5218:5218:java.lang.String toDetailedString():1322:1322 -> Z
+    5219:5219:java.lang.String toDetailedString():1322:1322 -> Z
+    5220:5220:java.lang.String toDetailedString():1322:1322 -> Z
+    5205:5217:java.lang.String toDetailedString():1322:1334 -> Z
+    1:4:boolean consistentInitClassInstruction(com.android.tools.r8.ir.code.InitClass,boolean):93:96 -> a
+    5:7:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):101:101 -> a
+    8:8:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper,com.android.tools.r8.ir.code.Instruction):102:102 -> a
+    9:9:void setLocalsAtEntry(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):107:107 -> a
+    10:14:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):201:205 -> a
+    15:33:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):330:348 -> a
+    34:51:void swapSuccessorsByIndex(int,int):377:394 -> a
+    52:59:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):511:518 -> a
+    60:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):522:525 -> a
     64:64:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):245:245 -> a
-    64:64:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):524 -> a
+    64:64:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525 -> a
     65:66:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):606:606 -> a
     65:66:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):32 -> a
     65:66:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):246 -> a
-    65:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):524 -> a
+    65:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525 -> a
     67:67:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):246:246 -> a
-    67:67:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):524 -> a
-    68:71:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):524:527 -> a
+    67:67:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525 -> a
+    68:71:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525:528 -> a
     72:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
     72:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
-    72:72:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):529 -> a
-    73:73:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):529:529 -> a
+    72:72:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):530 -> a
+    73:73:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):530:530 -> a
     74:74:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
     74:74:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
-    74:74:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):529 -> a
-    75:93:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):529:547 -> a
+    74:74:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):530 -> a
+    75:93:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):530:548 -> a
     94:94:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
     94:94:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
-    94:94:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):549 -> a
-    95:95:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):549:549 -> a
+    94:94:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550 -> a
+    95:95:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550:550 -> a
     96:96:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
     96:96:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
-    96:96:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):549 -> a
-    97:113:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):549:565 -> a
-    114:115:boolean hasDeadPhi(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):596:597 -> a
-    116:116:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):656:656 -> a
-    117:118:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):733:734 -> a
-    119:121:void clearMark(int):746:748 -> a
-    122:122:void addPhi(com.android.tools.r8.ir.code.Phi):778:778 -> a
-    123:123:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):792:792 -> a
-    124:124:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():613:613 -> a
-    124:124:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):792 -> a
-    125:128:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):792:795 -> a
-    129:129:void close(com.android.tools.r8.ir.conversion.IRBuilder):799:799 -> a
-    130:130:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():613:613 -> a
-    130:130:void close(com.android.tools.r8.ir.conversion.IRBuilder):799 -> a
-    131:135:void close(com.android.tools.r8.ir.conversion.IRBuilder):799:803 -> a
-    136:137:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1664:1665 -> a
-    136:137:void close(com.android.tools.r8.ir.conversion.IRBuilder):804 -> a
-    138:138:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1682:1682 -> a
-    138:138:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1665 -> a
-    138:138:void close(com.android.tools.r8.ir.conversion.IRBuilder):804 -> a
-    139:144:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1666:1671 -> a
-    139:144:void close(com.android.tools.r8.ir.conversion.IRBuilder):804 -> a
-    145:145:void close(com.android.tools.r8.ir.conversion.IRBuilder):805:805 -> a
-    146:157:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1169:1180 -> a
-    146:157:void close(com.android.tools.r8.ir.conversion.IRBuilder):806 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    158:158:boolean blocksClean(java.util.List):818:818 -> a
-    159:168:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):898:907 -> a
-    169:169:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):904:904 -> a
-    170:174:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):933:937 -> a
-    175:175:java.util.List com.android.tools.r8.ir.code.DominatorTree.dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock):171:171 -> a
-    175:175:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):938 -> a
-    176:180:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):938:942 -> a
-    181:190:void linkCatchSuccessors(java.util.List,java.util.List):981:990 -> a
-    191:222:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):994:1025 -> a
-    223:228:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens):1036:1041 -> a
-    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    229:229:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens):1041 -> a
-    230:234:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens):1042:1046 -> a
-    235:236:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1096:1097 -> a
-    235:236:boolean com.android.tools.r8.ir.code.BasicBlock.isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1103 -> a
-    235:236:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1214 -> a
-    237:238:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1217:1218 -> a
-    239:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1096:1097 -> a
-    239:240:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1109 -> a
-    241:243:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1111:1113 -> a
-    244:245:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1096:1097 -> a
-    244:245:boolean com.android.tools.r8.ir.code.BasicBlock.isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1103 -> a
-    244:245:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1134 -> a
-    246:250:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1140:1144 -> a
-    251:252:boolean com.android.tools.r8.ir.code.BasicBlock.verifyOnThrowWrite(int):1654:1655 -> a
-    251:252:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1144 -> a
-    253:260:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1145:1152 -> a
-    261:262:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1160:1161 -> a
-    263:264:boolean com.android.tools.r8.ir.code.BasicBlock.verifyOnThrowWrite(int):1654:1655 -> a
-    263:264:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1161 -> a
-    265:267:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1162:1162 -> a
-    270:270:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1165:1165 -> a
-    271:276:void print(com.android.tools.r8.utils.CfgPrinter):1337:1342 -> a
-    277:278:void com.android.tools.r8.ir.code.BasicBlock.printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1373:1374 -> a
-    277:278:void print(com.android.tools.r8.utils.CfgPrinter):1342 -> a
-    279:281:void print(com.android.tools.r8.utils.CfgPrinter):1343:1345 -> a
-    282:283:void com.android.tools.r8.ir.code.BasicBlock.printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1373:1374 -> a
-    282:283:void print(com.android.tools.r8.utils.CfgPrinter):1345 -> a
-    284:307:void print(com.android.tools.r8.utils.CfgPrinter):1346:1369 -> a
-    308:309:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1432:1433 -> a
-    310:314:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1446:1450 -> a
-    315:324:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1503:1512 -> a
-    325:325:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):788:788 -> a
-    325:325:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1513 -> a
-    326:326:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):788:788 -> a
-    326:326:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1514 -> a
-    327:327:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1515:1515 -> a
-    328:328:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    328:328:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1516 -> a
-    329:329:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1516:1516 -> a
-    330:331:boolean canThrow():1641:1642 -> a
-    332:332:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1690:1690 -> a
-    333:333:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.BasicBlock.listIterator(com.android.tools.r8.ir.code.IRMetadata):1694:1694 -> a
-    333:333:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1690 -> a
-    334:334:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1694:1694 -> a
-    335:335:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1698:1698 -> a
-    336:336:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1709:1709 -> a
-    337:348:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1727:1738 -> a
-    349:354:void com.android.tools.r8.ir.code.BasicBlock.moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1759:1764 -> a
-    349:354:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1742 -> a
-    355:359:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1746:1750 -> a
-    360:375:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1775:1790 -> a
-    376:377:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1810:1811 -> a
-    376:377:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    378:378:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    378:378:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1811 -> a
-    378:378:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    379:396:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1815:1832 -> a
-    379:396:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    397:397:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    397:397:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1833 -> a
-    397:397:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    398:404:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1833:1839 -> a
-    398:404:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    405:405:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):788:788 -> a
-    405:405:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1840 -> a
-    405:405:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    406:409:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1841:1844 -> a
-    406:409:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    410:410:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):788:788 -> a
-    410:410:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1845 -> a
-    410:410:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    411:416:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1846:1851 -> a
-    411:416:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    417:417:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1829:1829 -> a
-    417:417:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    418:418:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    418:418:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1829 -> a
-    418:418:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    419:419:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    419:419:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    419:419:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1829 -> a
-    419:419:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    420:457:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1829:1866 -> a
-    420:457:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    458:531:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1882:1955 -> a
-    1:2:void unlinkCatchHandler():871:872 -> a0
-    3:5:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):323:325 -> a0
-    3:5:void unlinkCatchHandler():872 -> a0
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    96:96:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550 -> a
+    97:113:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550:566 -> a
+    114:115:boolean hasDeadPhi(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):597:598 -> a
+    116:116:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):657:657 -> a
+    117:118:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):734:735 -> a
+    119:121:void clearMark(int):747:749 -> a
+    122:122:void addPhi(com.android.tools.r8.ir.code.Phi):779:779 -> a
+    123:123:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):793:793 -> a
+    124:124:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():614:614 -> a
+    124:124:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):793 -> a
+    125:128:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):793:796 -> a
+    129:129:void close(com.android.tools.r8.ir.conversion.IRBuilder):800:800 -> a
+    130:130:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():614:614 -> a
+    130:130:void close(com.android.tools.r8.ir.conversion.IRBuilder):800 -> a
+    131:135:void close(com.android.tools.r8.ir.conversion.IRBuilder):800:804 -> a
+    136:137:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1665:1666 -> a
+    136:137:void close(com.android.tools.r8.ir.conversion.IRBuilder):805 -> a
+    138:138:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1683:1683 -> a
+    138:138:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1666 -> a
+    138:138:void close(com.android.tools.r8.ir.conversion.IRBuilder):805 -> a
+    139:144:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1667:1672 -> a
+    139:144:void close(com.android.tools.r8.ir.conversion.IRBuilder):805 -> a
+    145:146:void close(com.android.tools.r8.ir.conversion.IRBuilder):806:807 -> a
+    147:158:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1170:1181 -> a
+    147:158:void close(com.android.tools.r8.ir.conversion.IRBuilder):807 -> a
+    159:159:boolean blocksClean(java.util.List):819:819 -> a
+    160:169:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):899:908 -> a
+    170:170:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):905:905 -> a
+    171:175:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):934:938 -> a
+    176:176:java.util.List com.android.tools.r8.ir.code.DominatorTree.dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock):171:171 -> a
+    176:176:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):939 -> a
+    177:181:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):939:943 -> a
+    182:191:void linkCatchSuccessors(java.util.List,java.util.List):982:991 -> a
+    192:223:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):995:1026 -> a
+    224:234:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1037:1047 -> a
+    235:236:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1097:1098 -> a
+    235:236:boolean com.android.tools.r8.ir.code.BasicBlock.isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1104 -> a
+    235:236:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1215 -> a
+    237:238:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1218:1219 -> a
+    239:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1097:1098 -> a
+    239:240:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1110 -> a
+    241:243:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1112:1114 -> a
+    244:245:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1097:1098 -> a
+    244:245:boolean com.android.tools.r8.ir.code.BasicBlock.isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1104 -> a
+    244:245:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1135 -> a
+    246:250:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1141:1145 -> a
+    251:252:boolean com.android.tools.r8.ir.code.BasicBlock.verifyOnThrowWrite(int):1655:1656 -> a
+    251:252:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1145 -> a
+    253:260:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1146:1153 -> a
+    261:262:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1161:1162 -> a
+    263:264:boolean com.android.tools.r8.ir.code.BasicBlock.verifyOnThrowWrite(int):1655:1656 -> a
+    263:264:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1162 -> a
+    265:267:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1163:1163 -> a
+    270:270:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1166:1166 -> a
+    271:276:void print(com.android.tools.r8.utils.CfgPrinter):1338:1343 -> a
+    277:278:void com.android.tools.r8.ir.code.BasicBlock.printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1374:1375 -> a
+    277:278:void print(com.android.tools.r8.utils.CfgPrinter):1343 -> a
+    279:281:void print(com.android.tools.r8.utils.CfgPrinter):1344:1346 -> a
+    282:283:void com.android.tools.r8.ir.code.BasicBlock.printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1374:1375 -> a
+    282:283:void print(com.android.tools.r8.utils.CfgPrinter):1346 -> a
+    284:307:void print(com.android.tools.r8.utils.CfgPrinter):1347:1370 -> a
+    308:309:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1433:1434 -> a
+    310:314:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1447:1451 -> a
+    315:324:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1504:1513 -> a
+    325:325:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
+    325:325:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1514 -> a
+    326:326:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
+    326:326:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1515 -> a
+    327:327:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1516:1516 -> a
+    328:328:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    328:328:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1517 -> a
+    329:329:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1517:1517 -> a
+    330:331:boolean canThrow():1642:1643 -> a
+    332:332:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1691:1691 -> a
+    333:333:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.BasicBlock.listIterator(com.android.tools.r8.ir.code.IRMetadata):1695:1695 -> a
+    333:333:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1691 -> a
+    334:334:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1695:1695 -> a
+    335:335:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1699:1699 -> a
+    336:336:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1710:1710 -> a
+    337:348:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1728:1739 -> a
+    349:354:void com.android.tools.r8.ir.code.BasicBlock.moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1760:1765 -> a
+    349:354:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1743 -> a
+    355:359:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1747:1751 -> a
+    360:376:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1776:1792 -> a
+    377:378:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1811:1812 -> a
+    377:378:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    379:379:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    379:379:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1812 -> a
+    379:379:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    380:398:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1816:1834 -> a
+    380:398:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    399:399:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    399:399:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1834 -> a
+    399:399:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    400:406:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1834:1840 -> a
+    400:406:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    407:407:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
+    407:407:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1841 -> a
+    407:407:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    408:411:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1842:1845 -> a
+    408:411:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    412:412:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
+    412:412:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1846 -> a
+    412:412:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    413:418:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1847:1852 -> a
+    413:418:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    419:419:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1830:1830 -> a
+    419:419:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    420:420:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    420:420:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1830 -> a
+    420:420:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    421:421:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    421:421:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    421:421:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1830 -> a
+    421:421:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    422:459:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1830:1867 -> a
+    422:459:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    460:533:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1883:1956 -> a
+    1:2:void unlinkCatchHandler():872:873 -> a0
+    3:5:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):324:326 -> a0
+    3:5:void unlinkCatchHandler():873 -> a0
     6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> a0
-    6:6:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):325 -> a0
-    6:6:void unlinkCatchHandler():872 -> a0
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    7:7:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):325:325 -> a0
-    7:7:void unlinkCatchHandler():872 -> a0
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:void unlinkCatchHandler():873:873 -> a0
-    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):307:307 -> b
-    2:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):398:428 -> b
-    33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> b
-    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):430 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):430:430 -> b
+    6:6:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):326 -> a0
+    6:6:void unlinkCatchHandler():873 -> a0
+    7:7:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):326:326 -> a0
+    7:7:void unlinkCatchHandler():873 -> a0
+    8:8:void unlinkCatchHandler():874:874 -> a0
+    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):308:308 -> b
+    2:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):399:431 -> b
     35:35:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> b
     35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):431 -> b
-    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):431:434 -> b
-    40:40:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> b
-    40:40:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):434 -> b
-    41:42:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):434:435 -> b
-    43:47:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):497:501 -> b
-    43:47:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435 -> b
-    48:48:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":537,"2":538,"3":539}}
-    537:537:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):501:501 -> b
-    537:537:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435 -> b
-    538:538:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):501:501 -> b
-    538:538:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435 -> b
-    539:539:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):501:501 -> b
-    539:539:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435 -> b
-    483:536:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435:488 -> b
-    540:541:void removePhisByIndex(java.util.List):586:587 -> b
-    542:542:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):660:660 -> b
-    543:544:void decrementUnfilledPredecessorCount(int):762:763 -> b
-    545:546:void removePhi(com.android.tools.r8.ir.code.Phi):782:783 -> b
-    547:547:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):886:886 -> b
-    548:552:boolean com.android.tools.r8.ir.code.BasicBlock.isCatchHandlerForSingleGuard():912:916 -> b
-    548:552:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):887 -> b
-    553:557:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):889:893 -> b
-    558:564:java.util.Set cleanForRemoval():947:953 -> b
-    565:567:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):323:325 -> b
-    565:567:java.util.Set cleanForRemoval():954 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    568:568:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> b
-    568:568:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):325 -> b
-    568:568:java.util.Set cleanForRemoval():954 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    569:569:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):325:325 -> b
-    569:569:java.util.Set cleanForRemoval():954 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    570:588:java.util.Set cleanForRemoval():956:974 -> b
-    589:590:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1185:1186 -> b
-    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():832:836 -> b0
-    1:1:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):244:244 -> c
-    2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):368:372 -> c
-    7:8:boolean isMarked(int):752:753 -> c
-    9:12:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1190:1193 -> c
-    13:22:boolean isInstructionBeforeThrowingInstruction(com.android.tools.r8.ir.code.Instruction):1521:1530 -> c
-    23:23:void clearCatchHandlers():1618:1618 -> c
-    1:5:void unlinkSinglePredecessorSiblingsAllowed():842:846 -> c0
-    1:2:boolean hasNormalSuccessor(com.android.tools.r8.ir.code.BasicBlock):256:257 -> d
-    3:5:void clearCurrentDefinitions():1082:1084 -> d
-    6:6:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1682:1682 -> d
-    7:7:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1686:1686 -> d
-    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():855:860 -> d0
-    1:2:void clearUserInfo():728:729 -> e
-    3:6:void mark(int):739:742 -> e
-    7:7:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1686:1686 -> e
-    7:7:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):656 -> e
-    8:20:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1965:1977 -> e
-    1:2:boolean verifyFilledPredecessors():772:773 -> e0
-    1:2:int numberInstructions(int):644:645 -> f
-    3:3:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):661:661 -> f
-    4:5:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):820:821 -> f
-    6:7:boolean consistentCatchHandlers():1053:1054 -> f
-    8:8:com.android.tools.r8.ir.code.CatchHandlers com.android.tools.r8.ir.code.BasicBlock.getCatchHandlersWithSuccessorIndexes():1614:1614 -> f
-    8:8:boolean consistentCatchHandlers():1055 -> f
-    9:11:boolean consistentCatchHandlers():1057:1057 -> f
-    14:30:boolean consistentCatchHandlers():1060:1076 -> f
-    1:2:void setNumber(int):635:636 -> g
-    3:4:void decrementUnfilledPredecessorCount():767:768 -> g
-    5:5:java.lang.String lambda$toDetailedString$7(com.android.tools.r8.ir.code.BasicBlock):1275:1275 -> g
-    6:8:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1416:1418 -> g
-    9:21:void com.android.tools.r8.ir.code.BasicBlock.removeInstructions(java.util.List):1395:1407 -> g
-    9:21:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1418 -> g
-    22:22:void com.android.tools.r8.ir.code.BasicBlock.setInstructions(java.util.LinkedList):1387:1387 -> g
-    22:22:void com.android.tools.r8.ir.code.BasicBlock.removeInstructions(java.util.List):1408 -> g
-    22:22:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1418 -> g
-    1:4:void link(com.android.tools.r8.ir.code.BasicBlock):811:814 -> h
-    5:39:void deduplicatePhis():2008:2042 -> h
-    1:4:void detachAllSuccessors():925:928 -> i
-    5:6:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1252:1253 -> i
-    7:15:int com.android.tools.r8.ir.code.BasicBlock.guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1197:1205 -> i
-    7:15:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1253 -> i
-    16:18:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1253:1255 -> i
-    1:1:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1562:1562 -> j
+    36:36:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):431:431 -> b
+    37:37:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> b
+    37:37:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):432 -> b
+    38:41:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):432:435 -> b
+    42:42:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> b
+    42:42:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435 -> b
+    43:44:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435:436 -> b
+    45:49:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):498:502 -> b
+    45:49:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):436 -> b
+    50:50:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":540,"2":541,"3":542}}
+    540:540:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):502:502 -> b
+    540:540:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):436 -> b
+    541:541:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):502:502 -> b
+    541:541:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):436 -> b
+    542:542:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):502:502 -> b
+    542:542:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):436 -> b
+    486:539:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):436:489 -> b
+    543:544:void removePhisByIndex(java.util.List):587:588 -> b
+    545:545:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):661:661 -> b
+    546:547:void decrementUnfilledPredecessorCount(int):763:764 -> b
+    548:549:void removePhi(com.android.tools.r8.ir.code.Phi):783:784 -> b
+    550:550:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):887:887 -> b
+    551:555:boolean com.android.tools.r8.ir.code.BasicBlock.isCatchHandlerForSingleGuard():913:917 -> b
+    551:555:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):888 -> b
+    556:560:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):890:894 -> b
+    561:568:java.util.Set cleanForRemoval():948:955 -> b
+    569:571:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):324:326 -> b
+    569:571:java.util.Set cleanForRemoval():955 -> b
+    572:572:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> b
+    572:572:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):326 -> b
+    572:572:java.util.Set cleanForRemoval():955 -> b
+    573:573:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):326:326 -> b
+    573:573:java.util.Set cleanForRemoval():955 -> b
+    574:592:java.util.Set cleanForRemoval():957:975 -> b
+    593:594:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1186:1187 -> b
+    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():833:837 -> b0
+    1:1:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):245:245 -> c
+    2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):369:373 -> c
+    7:8:boolean isMarked(int):753:754 -> c
+    9:12:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1191:1194 -> c
+    13:22:boolean isInstructionBeforeThrowingInstruction(com.android.tools.r8.ir.code.Instruction):1522:1531 -> c
+    23:23:void clearCatchHandlers():1619:1619 -> c
+    1:5:void unlinkSinglePredecessorSiblingsAllowed():843:847 -> c0
+    1:2:boolean hasNormalSuccessor(com.android.tools.r8.ir.code.BasicBlock):257:258 -> d
+    3:5:void clearCurrentDefinitions():1083:1085 -> d
+    6:6:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1683:1683 -> d
+    7:7:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1687:1687 -> d
+    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():856:861 -> d0
+    1:2:void clearUserInfo():729:730 -> e
+    3:6:void mark(int):740:743 -> e
+    7:7:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1687:1687 -> e
+    7:7:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):657 -> e
+    8:20:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1966:1978 -> e
+    1:2:boolean verifyFilledPredecessors():773:774 -> e0
+    1:2:int numberInstructions(int):645:646 -> f
+    3:3:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):662:662 -> f
+    4:5:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):821:822 -> f
+    6:7:boolean consistentCatchHandlers():1054:1055 -> f
+    8:8:com.android.tools.r8.ir.code.CatchHandlers com.android.tools.r8.ir.code.BasicBlock.getCatchHandlersWithSuccessorIndexes():1615:1615 -> f
+    8:8:boolean consistentCatchHandlers():1056 -> f
+    9:11:boolean consistentCatchHandlers():1058:1058 -> f
+    14:30:boolean consistentCatchHandlers():1061:1077 -> f
+    1:2:void setNumber(int):636:637 -> g
+    3:4:void decrementUnfilledPredecessorCount():768:769 -> g
+    5:5:java.lang.String lambda$toDetailedString$7(com.android.tools.r8.ir.code.BasicBlock):1276:1276 -> g
+    6:8:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1417:1419 -> g
+    9:21:void com.android.tools.r8.ir.code.BasicBlock.removeInstructions(java.util.List):1396:1408 -> g
+    9:21:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1419 -> g
+    22:22:void com.android.tools.r8.ir.code.BasicBlock.setInstructions(java.util.LinkedList):1388:1388 -> g
+    22:22:void com.android.tools.r8.ir.code.BasicBlock.removeInstructions(java.util.List):1409 -> g
+    22:22:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1419 -> g
+    1:4:void link(com.android.tools.r8.ir.code.BasicBlock):812:815 -> h
+    5:39:void deduplicatePhis():2009:2043 -> h
+    1:4:void detachAllSuccessors():926:929 -> i
+    5:6:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1253:1254 -> i
+    7:15:int com.android.tools.r8.ir.code.BasicBlock.guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1198:1206 -> i
+    7:15:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1254 -> i
+    16:18:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1254:1256 -> i
+    1:1:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1563:1563 -> j
     2:2:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():0:0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1566,"2":1567,"3":1568}}
-    1566:1566:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1563:1563 -> j
-    1567:1567:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1563:1563 -> j
-    1568:1568:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1563:1563 -> j
-    3:3:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():0:0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1569,"2":1570,"3":1571}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1567,"2":1568,"3":1569}}
+    1567:1567:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1564:1564 -> j
+    1568:1568:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1564:1564 -> j
     1569:1569:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1564:1564 -> j
-    1570:1570:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1564:1564 -> j
-    1571:1571:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1564:1564 -> j
-    1572:1573:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1622:1623 -> j
-    1:1:com.android.tools.r8.ir.code.Instruction entry():706:706 -> k
-    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():716:717 -> l
-    3:3:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1682:1682 -> l
-    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():717 -> l
-    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():718:720 -> l
-    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():710:712 -> m
-    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1606:1610 -> n
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1614:1614 -> o
-    1:1:java.util.LinkedList getInstructions():652:652 -> p
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():110:110 -> q
-    1:2:java.util.List getMutablePredecessors():301:302 -> r
-    1:2:java.util.List getMutableSuccessors():238:239 -> s
-    1:7:java.util.List getNormalPredecessors():313:319 -> t
-    1:1:java.lang.String toString():1244:1244 -> toString
-    1:5:java.util.List getNormalSuccessors():265:269 -> u
-    6:7:void com.android.tools.r8.ir.code.BasicBlock.forEachNormalSuccessor(java.util.function.Consumer):250:251 -> u
-    6:7:java.util.List getNormalSuccessors():269 -> u
-    8:8:java.util.List getNormalSuccessors():270:270 -> u
-    1:2:int getNumber():630:631 -> v
-    1:1:java.lang.String getNumberAsString():640:640 -> w
+    3:3:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():0:0 -> j
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1570,"2":1571,"3":1572}}
+    1570:1570:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1565:1565 -> j
+    1571:1571:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1565:1565 -> j
+    1572:1572:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1565:1565 -> j
+    1573:1574:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1623:1624 -> j
+    1:1:com.android.tools.r8.ir.code.Instruction entry():707:707 -> k
+    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():717:718 -> l
+    3:3:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1683:1683 -> l
+    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():718 -> l
+    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():719:721 -> l
+    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():711:713 -> m
+    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1607:1611 -> n
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1615:1615 -> o
+    1:1:java.util.LinkedList getInstructions():653:653 -> p
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():111:111 -> q
+    1:2:java.util.List getMutablePredecessors():302:303 -> r
+    1:2:java.util.List getMutableSuccessors():239:240 -> s
+    1:7:java.util.List getNormalPredecessors():314:320 -> t
+    1:1:java.lang.String toString():1245:1245 -> toString
+    1:5:java.util.List getNormalSuccessors():266:270 -> u
+    6:7:void com.android.tools.r8.ir.code.BasicBlock.forEachNormalSuccessor(java.util.function.Consumer):251:252 -> u
+    6:7:java.util.List getNormalSuccessors():270 -> u
+    8:8:java.util.List getNormalSuccessors():271:271 -> u
+    1:2:int getNumber():631:632 -> v
+    1:1:java.lang.String getNumberAsString():641:641 -> w
     2:2:java.lang.String getNumberAsString():0:0 -> w
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":643,"2":644,"3":645}}
-    643:643:java.lang.String getNumberAsString():640:640 -> w
-    644:644:java.lang.String getNumberAsString():640:640 -> w
-    645:645:java.lang.String getNumberAsString():640:640 -> w
-    642:642:java.lang.String getNumberAsString():640:640 -> w
-    1:1:java.util.List getPhis():605:605 -> x
-    1:1:java.util.List getPredecessors():297:297 -> y
-    1:1:java.util.List getSuccessors():234:234 -> z
-com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.r4:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":644,"2":645,"3":646}}
+    644:644:java.lang.String getNumberAsString():641:641 -> w
+    645:645:java.lang.String getNumberAsString():641:641 -> w
+    646:646:java.lang.String getNumberAsString():641:641 -> w
+    643:643:java.lang.String getNumberAsString():641:641 -> w
+    1:1:java.util.List getPhis():606:606 -> x
+    1:1:java.util.List getPredecessors():298:298 -> y
+    1:1:java.util.List getSuccessors():235:235 -> z
+com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.o4:
     com.android.tools.r8.ir.code.Instruction next -> c
     com.android.tools.r8.ir.code.Instruction val$instruction -> d
     com.android.tools.r8.ir.code.InstructionIterator iterator -> b
-    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):661:664 -> <init>
-    1:1:boolean hasNext():678:678 -> hasNext
-    1:3:com.android.tools.r8.ir.code.Instruction advance():667:669 -> l
-    1:5:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():683:687 -> next
-    1:5:java.lang.Object next():661 -> next
-    6:6:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():685:685 -> next
-    6:6:java.lang.Object next():661 -> next
-com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.s4:
-com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.t4:
+    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):662:665 -> <init>
+    1:1:boolean hasNext():679:679 -> hasNext
+    1:3:com.android.tools.r8.ir.code.Instruction advance():668:670 -> l
+    1:5:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():684:688 -> next
+    1:5:java.lang.Object next():662 -> next
+    6:6:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():686:686 -> next
+    6:6:java.lang.Object next():662 -> next
+com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.p4:
+com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.q4:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NON_EDGE -> b
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> c
     com.android.tools.r8.ir.code.BasicBlock$EdgeType EXCEPTIONAL -> d
-    1:3:void <clinit>():133:135 -> <clinit>
-    1:1:void <init>(java.lang.String,int):132:132 -> <init>
-com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.u4:
+    1:3:void <clinit>():134:136 -> <clinit>
+    1:1:void <init>(java.lang.String,int):133:133 -> <init>
+com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.r4:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1985:1985 -> <clinit>
-    1:1:void <init>():1985:1985 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1985:1985 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1985:1985 -> a
-    2:4:boolean com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1988:1990 -> a
-    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1985 -> a
-    5:5:int doHash(java.lang.Object):1985:1985 -> a
-    6:7:int com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doHash(com.android.tools.r8.ir.code.Phi):2000:2001 -> a
-    6:7:int doHash(java.lang.Object):1985 -> a
-com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.v4:
+    1:1:void <clinit>():1986:1986 -> <clinit>
+    1:1:void <init>():1986:1986 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1986:1986 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1986:1986 -> a
+    2:4:boolean com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1989:1991 -> a
+    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1986 -> a
+    5:5:int doHash(java.lang.Object):1986:1986 -> a
+    6:7:int com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doHash(com.android.tools.r8.ir.code.Phi):2001:2002 -> a
+    6:7:int doHash(java.lang.Object):1986 -> a
+com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.s4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo.defaultForConstString(com.android.tools.r8.utils.InternalOptions):124 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.y4:
+    1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo.defaultForConstString(com.android.tools.r8.utils.InternalOptions):125:125 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo.defaultForConstString(com.android.tools.r8.utils.InternalOptions):125 -> a
+com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.v4:
     java.util.ListIterator instructionIterator -> b
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):13:14 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):17:18 -> <init>
@@ -44015,231 +43561,218 @@
     1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionIterator.next():43:43 -> next
     1:1:java.lang.Object next():9 -> next
     1:1:com.android.tools.r8.ir.code.Instruction previous():33:33 -> previous
-com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.z4:
+com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.w4:
     java.util.ListIterator listIterator -> c
     com.android.tools.r8.ir.code.Instruction current -> d
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.code.BasicBlock block -> b
     com.android.tools.r8.ir.code.IRMetadata metadata -> f
     com.android.tools.r8.ir.code.Position position -> e
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):47:47 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):43:50 -> <init>
-    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):53:53 -> <init>
-    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):43:56 -> <init>
-    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):61:62 -> <init>
+    1:1:void <clinit>():39:39 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):48:48 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):44:51 -> <init>
+    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):54:54 -> <init>
+    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):44:57 -> <init>
+    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):62:63 -> <init>
     boolean lambda$inlineInvoke$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
     boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):104:104 -> a
-    2:12:void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):137:147 -> a
-    13:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):224:224 -> a
+    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):105:105 -> a
+    2:12:void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):138:148 -> a
+    13:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):225:225 -> a
     14:14:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
-    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):227 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:34:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):227:246 -> a
-    35:35:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):225:225 -> a
-    36:42:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):284:290 -> a
-    43:43:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    43:43:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):290 -> a
-    44:45:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):291:292 -> a
-    46:46:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
-    46:46:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):292 -> a
-    47:47:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):292:292 -> a
-    48:49:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1654:1655 -> a
-    48:49:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):293 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    50:55:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):293:298 -> a
-    56:56:com.android.tools.r8.ir.code.InvokeVirtual$Builder com.android.tools.r8.ir.code.InvokeVirtual.builder():37:37 -> a
-    56:56:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):298 -> a
-    57:58:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):299:300 -> a
-    59:59:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
-    59:59:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):300 -> a
-    60:60:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):300:300 -> a
-    61:62:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1654:1655 -> a
-    61:62:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):301 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    63:68:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):301:306 -> a
-    69:78:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):314:323 -> a
-    79:79:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):300:300 -> a
-    79:79:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):324 -> a
-    80:80:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    80:80:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):300 -> a
-    80:80:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):324 -> a
-    81:99:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):328:346 -> a
-    100:100:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
-    100:100:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):348 -> a
-    101:126:boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):355:380 -> a
-    127:127:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
-    127:127:boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):380 -> a
-    128:132:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):388:392 -> a
-    133:133:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):426:426 -> a
-    133:133:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):392 -> a
-    134:135:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):393:394 -> a
-    136:136:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> a
-    136:136:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):394 -> a
-    137:137:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
-    137:137:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):395 -> a
-    138:138:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):389:389 -> a
-    139:143:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):400:404 -> a
-    144:144:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    144:144:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):404 -> a
-    145:148:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):404:407 -> a
-    149:149:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
-    149:149:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):408 -> a
-    150:150:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):401:401 -> a
-    151:159:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):426:434 -> a
-    160:160:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
-    160:160:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):435 -> a
-    161:162:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):438:439 -> a
-    163:163:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):427:427 -> a
-    164:192:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):451:479 -> a
-    193:193:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):478:478 -> a
-    194:211:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):477:494 -> a
-    212:212:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():99:99 -> a
-    212:212:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):495 -> a
-    213:217:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):496:500 -> a
-    218:218:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
-    218:218:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):501 -> a
-    219:221:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):501:503 -> a
-    222:222:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):452:452 -> a
-    223:243:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):513:533 -> a
-    244:244:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():67:67 -> a
-    244:244:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):538 -> a
-    245:251:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):538:544 -> a
-    252:252:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):543:543 -> a
-    253:276:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):542:565 -> a
-    277:277:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():99:99 -> a
-    277:277:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):566 -> a
-    278:284:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):567:573 -> a
-    285:285:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
-    285:285:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):574 -> a
-    286:313:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):574:601 -> a
-    314:314:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):514:514 -> a
-    315:324:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):585:594 -> a
-    325:326:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):609:610 -> a
-    327:327:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():67:67 -> a
-    327:327:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):613 -> a
-    328:331:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):613:616 -> a
-    332:332:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
-    332:332:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):616 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    333:333:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):620:620 -> a
-    334:334:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    334:334:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):620 -> a
-    335:338:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):620:623 -> a
-    339:340:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    339:340:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):623 -> a
-    341:359:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):624:642 -> a
-    360:367:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):651:658 -> a
-    368:371:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):666:669 -> a
-    372:404:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):695:727 -> a
-    405:410:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):765:770 -> a
-    411:418:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):781:788 -> a
-    419:421:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):787:789 -> a
-    422:424:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.canThrow(com.android.tools.r8.ir.code.IRCode):675:677 -> a
-    422:424:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):791 -> a
-    425:441:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):795:811 -> a
-    442:442:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
-    442:442:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):812 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    443:450:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):812:819 -> a
-    451:451:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
-    451:451:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):822 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    452:488:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):822:858 -> a
-    489:489:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
-    489:489:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):862 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    490:494:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):862:866 -> a
-    495:495:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
-    495:495:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):867 -> a
-    496:503:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):867:874 -> a
-    504:504:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    504:504:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):874 -> a
-    505:524:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):874:893 -> a
-    525:525:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    525:525:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):893 -> a
-    526:526:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):896:896 -> a
-    527:527:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    527:527:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):895 -> a
-    528:561:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):894:927 -> a
-    562:562:com.android.tools.r8.ir.code.BasicBlockIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1057:1057 -> a
-    562:562:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):927 -> a
-    563:569:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):930:936 -> a
-    570:570:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    570:570:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):937 -> a
-    571:576:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):937:942 -> a
-    577:593:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):742:758 -> a
-    577:593:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):943 -> a
-    594:599:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):950:955 -> a
-    600:600:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    600:600:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):955 -> a
-    601:611:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):955:965 -> a
-    612:616:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):964:968 -> a
-    617:623:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):974:980 -> a
-    624:624:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    624:624:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):981 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    625:650:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):981:1006 -> a
-    651:651:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    651:651:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):1006 -> a
-    652:669:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):1006:1023 -> a
-    670:670:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1134:1134 -> a
-    670:670:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):252 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    671:671:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():99:99 -> a
-    671:671:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):254 -> a
-    672:673:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):256:257 -> a
-    674:674:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
-    674:674:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):257 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    675:680:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):259:264 -> a
-    681:681:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):1162:1162 -> a
-    681:681:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):269 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    682:683:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DebugLocalInfo):1167:1168 -> a
-    682:683:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):1162 -> a
-    682:683:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):269 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    684:684:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):272:272 -> a
-    685:688:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):271:274 -> a
-    1:1:void add(java.lang.Object):38:38 -> add
-    1:7:void add(com.android.tools.r8.ir.code.Instruction):122:128 -> b
-    8:13:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):414:419 -> b
-    14:15:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DebugLocalInfo):1167:1168 -> b
-    14:15:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):419 -> b
-    16:16:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
-    16:16:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):420 -> b
-    17:17:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):415:415 -> b
-    1:1:void unsetInsertionPosition():109:109 -> h
-    1:1:boolean hasNext():67:67 -> hasNext
-    1:1:boolean hasPrevious():83:83 -> hasPrevious
-    1:7:void removeOrReplaceByDebugLocalRead():212:218 -> i
-    8:8:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> i
-    8:8:void removeOrReplaceByDebugLocalRead():218 -> i
-    9:9:void removeOrReplaceByDebugLocalRead():213:213 -> i
-    1:5:void removeInstructionIgnoreOutValue():203:207 -> k
-    6:6:void removeInstructionIgnoreOutValue():204:204 -> k
-    1:1:com.android.tools.r8.ir.code.Instruction next():72:72 -> l
-    1:1:java.lang.Object next():38:38 -> next
-    1:1:int nextIndex():78:78 -> nextIndex
-    1:1:java.lang.Object previous():38:38 -> previous
-    2:2:com.android.tools.r8.ir.code.Instruction previous():88:88 -> previous
-    1:1:int previousIndex():94:94 -> previousIndex
-    1:6:void remove():178:183 -> remove
+    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):228 -> a
+    15:34:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):228:247 -> a
+    35:35:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):226:226 -> a
+    36:36:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):253:253 -> a
+    37:37:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1158:1158 -> a
+    37:37:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):253 -> a
+    38:38:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():100:100 -> a
+    38:38:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):255 -> a
+    39:40:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):257:258 -> a
+    41:41:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    41:41:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):258 -> a
+    42:47:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):260:265 -> a
+    48:48:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):270:270 -> a
+    49:50:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DebugLocalInfo):1191:1192 -> a
+    49:50:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):1186 -> a
+    49:50:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):270 -> a
+    51:51:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):273:273 -> a
+    52:55:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):272:275 -> a
+    56:62:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):285:291 -> a
+    63:63:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
+    63:63:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):291 -> a
+    64:65:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):292:293 -> a
+    66:66:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
+    66:66:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):293 -> a
+    67:68:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):293:294 -> a
+    69:70:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1662:1663 -> a
+    69:70:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):294 -> a
+    71:76:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):294:299 -> a
+    77:77:com.android.tools.r8.ir.code.InvokeVirtual$Builder com.android.tools.r8.ir.code.InvokeVirtual.builder():37:37 -> a
+    77:77:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):299 -> a
+    78:79:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):300:301 -> a
+    80:80:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
+    80:80:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):301 -> a
+    81:82:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):301:302 -> a
+    83:84:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1662:1663 -> a
+    83:84:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):302 -> a
+    85:90:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):302:307 -> a
+    91:100:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):315:324 -> a
+    101:101:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):300:300 -> a
+    101:101:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):325 -> a
+    102:102:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    102:102:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):300 -> a
+    102:102:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):325 -> a
+    103:121:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):329:347 -> a
+    122:122:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    122:122:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):349 -> a
+    123:148:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):359:384 -> a
+    149:149:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    149:149:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):385 -> a
+    150:150:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):386:386 -> a
+    151:155:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):394:398 -> a
+    156:156:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):436:436 -> a
+    156:156:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):398 -> a
+    157:158:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):399:400 -> a
+    159:159:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> a
+    159:159:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):400 -> a
+    160:160:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    160:160:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):401 -> a
+    161:161:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):395:395 -> a
+    162:166:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):406:410 -> a
+    167:167:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
+    167:167:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):410 -> a
+    168:171:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):410:413 -> a
+    172:172:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    172:172:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):414 -> a
+    173:173:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):407:407 -> a
+    174:182:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):432:440 -> a
+    183:183:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    183:183:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):441 -> a
+    184:185:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):444:445 -> a
+    186:186:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):433:433 -> a
+    187:215:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):457:485 -> a
+    216:216:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):484:484 -> a
+    217:234:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):483:500 -> a
+    235:235:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():100:100 -> a
+    235:235:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):501 -> a
+    236:240:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):502:506 -> a
+    241:241:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
+    241:241:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):507 -> a
+    242:244:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):507:509 -> a
+    245:245:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):458:458 -> a
+    246:266:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):519:539 -> a
+    267:267:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():68:68 -> a
+    267:267:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):544 -> a
+    268:274:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):544:550 -> a
+    275:275:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):549:549 -> a
+    276:299:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):548:571 -> a
+    300:300:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():100:100 -> a
+    300:300:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):572 -> a
+    301:307:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):573:579 -> a
+    308:308:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
+    308:308:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):580 -> a
+    309:336:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):580:607 -> a
+    337:337:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):520:520 -> a
+    338:347:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):591:600 -> a
+    348:349:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):615:616 -> a
+    350:350:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():68:68 -> a
+    350:350:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):619 -> a
+    351:354:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):619:622 -> a
+    355:355:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    355:355:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):622 -> a
+    356:356:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):626:626 -> a
+    357:357:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    357:357:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):626 -> a
+    358:361:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):626:629 -> a
+    362:363:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
+    362:363:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):629 -> a
+    364:382:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):630:648 -> a
+    383:390:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):657:664 -> a
+    391:394:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):672:675 -> a
+    395:427:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):701:733 -> a
+    428:433:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):771:776 -> a
+    434:441:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):787:794 -> a
+    442:444:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):793:795 -> a
+    445:447:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.canThrow(com.android.tools.r8.ir.code.IRCode):681:683 -> a
+    445:447:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):797 -> a
+    448:465:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):801:818 -> a
+    466:466:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
+    466:466:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):818 -> a
+    467:477:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):818:828 -> a
+    478:478:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
+    478:478:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):828 -> a
+    479:519:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):828:868 -> a
+    520:520:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
+    520:520:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):868 -> a
+    521:525:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):868:872 -> a
+    526:526:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
+    526:526:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):873 -> a
+    527:534:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):873:880 -> a
+    535:535:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    535:535:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):880 -> a
+    536:555:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):880:899 -> a
+    556:556:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    556:556:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):899 -> a
+    557:557:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):902:902 -> a
+    558:558:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
+    558:558:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):901 -> a
+    559:592:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):900:933 -> a
+    593:593:com.android.tools.r8.ir.code.BasicBlockIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1060:1060 -> a
+    593:593:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):933 -> a
+    594:600:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):936:942 -> a
+    601:601:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    601:601:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):943 -> a
+    602:607:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):943:948 -> a
+    608:624:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):748:764 -> a
+    608:624:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):949 -> a
+    625:630:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):956:961 -> a
+    631:631:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    631:631:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):961 -> a
+    632:642:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):961:971 -> a
+    643:647:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):970:974 -> a
+    648:655:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):980:987 -> a
+    656:656:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    656:656:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):987 -> a
+    657:682:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):987:1012 -> a
+    683:683:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    683:683:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):1012 -> a
+    684:701:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):1012:1029 -> a
+    1:1:void add(java.lang.Object):39:39 -> add
+    1:7:void add(com.android.tools.r8.ir.code.Instruction):123:129 -> b
+    8:13:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):420:425 -> b
+    14:15:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DebugLocalInfo):1191:1192 -> b
+    14:15:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):425 -> b
+    16:16:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> b
+    16:16:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):426 -> b
+    17:17:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):421:421 -> b
+    1:1:void unsetInsertionPosition():110:110 -> h
+    1:1:boolean hasNext():68:68 -> hasNext
+    1:1:boolean hasPrevious():84:84 -> hasPrevious
+    1:7:void removeOrReplaceByDebugLocalRead():213:219 -> i
+    8:8:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> i
+    8:8:void removeOrReplaceByDebugLocalRead():219 -> i
+    9:9:void removeOrReplaceByDebugLocalRead():214:214 -> i
+    1:5:void removeInstructionIgnoreOutValue():204:208 -> k
+    6:6:void removeInstructionIgnoreOutValue():205:205 -> k
+    1:1:com.android.tools.r8.ir.code.Instruction next():73:73 -> l
+    1:1:java.lang.Object next():39:39 -> next
+    1:1:int nextIndex():79:79 -> nextIndex
+    1:1:java.lang.Object previous():39:39 -> previous
+    2:2:com.android.tools.r8.ir.code.Instruction previous():89:89 -> previous
+    1:1:int previousIndex():95:95 -> previousIndex
+    1:6:void remove():179:184 -> remove
     7:7:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> remove
-    7:7:void remove():183 -> remove
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:9:void remove():183:184 -> remove
+    7:7:void remove():184 -> remove
+    8:9:void remove():184:185 -> remove
     10:10:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> remove
-    10:10:void remove():184 -> remove
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:25:void remove():184:198 -> remove
-    26:26:void remove():179:179 -> remove
-    1:1:void set(java.lang.Object):38:38 -> set
-    2:5:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):161:164 -> set
-    2:5:void set(java.lang.Object):38 -> set
-com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.B4:
+    10:10:void remove():185 -> remove
+    11:25:void remove():185:199 -> remove
+    26:26:void remove():180:180 -> remove
+    1:1:void set(java.lang.Object):39:39 -> set
+    2:5:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):162:165 -> set
+    2:5:void set(java.lang.Object):39 -> set
+com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.y4:
     java.util.ListIterator listIterator -> c
     com.android.tools.r8.ir.code.IRCode code -> b
     com.android.tools.r8.ir.code.BasicBlock current -> d
@@ -44261,7 +43794,7 @@
     1:1:void set(java.lang.Object):11:11 -> set
     2:2:void com.android.tools.r8.ir.code.BasicBlockIterator.set(com.android.tools.r8.ir.code.BasicBlock):78:78 -> set
     2:2:void set(java.lang.Object):11 -> set
-com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.W4:
+com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.T4:
     com.android.tools.r8.ir.code.NumericType type -> i
     1:8:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:31 -> <init>
     boolean hasInvariantOutType() -> V0
@@ -44277,18 +43810,18 @@
     11:12:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):132:133 -> a
     13:13:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):138:138 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:int maxInValueRegister():90:90 -> g2
     1:3:boolean com.android.tools.r8.ir.code.Binop.fitsInLit16Instruction(com.android.tools.r8.ir.code.Value):68:70 -> h
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> h
-    1:1:int maxOutValueRegister():95:95 -> h2
-    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> l2
-    boolean isCommutative() -> m2
-    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> n2
+    1:1:int maxInValueRegister():90:90 -> h2
+    1:1:int maxOutValueRegister():95:95 -> i2
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> m2
+    boolean isCommutative() -> n2
     boolean isBinop() -> o1
-    1:2:int maxInOutValueRegisterSize():82:83 -> o2
-    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> p2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> o2
+    1:2:int maxInOutValueRegisterSize():82:83 -> p2
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> q2
     com.android.tools.r8.ir.code.Binop asBinop() -> u
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.u6:
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.q6:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.Position callerPosition -> a
@@ -44299,21 +43832,20 @@
     1:15:void <init>(com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.graph.DexMethod,boolean):31:45 -> <init>
     16:26:void <init>(com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.graph.DexMethod,boolean):40:50 -> <init>
     1:1:com.android.tools.r8.ir.code.Position getPreamblePosition():55:55 -> a
-    2:18:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):73:89 -> a
-    19:20:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.disableLineCheck():260:261 -> a
-    19:20:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):90 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:23:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):90:92 -> a
-    24:24:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):85:85 -> a
-    25:34:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):102:111 -> a
-    35:35:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getPreamblePosition():55:55 -> a
-    35:35:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):115 -> a
-    36:46:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):116:126 -> a
-    47:47:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
-    47:47:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):126 -> a
-    48:51:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):126:129 -> a
+    2:19:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):73:90 -> a
+    20:21:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.disableLineCheck():270:271 -> a
+    20:21:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):90 -> a
+    22:24:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):90:92 -> a
+    25:25:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):85:85 -> a
+    26:35:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):102:111 -> a
+    36:36:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getPreamblePosition():55:55 -> a
+    36:36:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):115 -> a
+    37:47:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):116:126 -> a
+    48:48:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
+    48:48:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):126 -> a
+    49:52:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):126:129 -> a
     1:1:com.android.tools.r8.ir.code.Position getCanonical(com.android.tools.r8.ir.code.Position):63:63 -> b
-com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.x6:
+com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.t6:
     java.util.List guards -> b
     java.util.Set uniqueTargets -> d
     java.util.List targets -> c
@@ -44342,18 +43874,18 @@
     1:1:int hashCode():144:144 -> hashCode
     1:1:java.util.Iterator iterator():111:111 -> iterator
     1:2:int size():59:60 -> size
-com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.v6:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.r6:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> c
     int nextIndex -> b
     1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):111:113 -> <init>
     1:1:boolean hasNext():117:117 -> hasNext
     1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler com.android.tools.r8.ir.code.CatchHandlers$1.next():122:125 -> next
     1:4:java.lang.Object next():111 -> next
-com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.w6:
+com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.s6:
     java.lang.Object target -> b
     com.android.tools.r8.graph.DexType guard -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,java.lang.Object):24:26 -> <init>
-com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.u9:
+com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.k9:
     int $r8$clinit -> l
     com.android.tools.r8.graph.DexType type -> i
     boolean ignoreCompatRules -> j
@@ -44397,15 +43929,15 @@
     1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> e
     1:1:com.android.tools.r8.ir.code.Value object():94 -> e
     2:2:com.android.tools.r8.ir.code.Value object():94:94 -> e
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.graph.DexType getType():90:90 -> l2
-    1:1:boolean ignoreCompatRules():76:76 -> m2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.graph.DexType getType():90:90 -> m2
+    1:1:boolean ignoreCompatRules():76:76 -> n2
     boolean isCheckCast() -> p1
     1:1:java.lang.String toString():195:195 -> toString
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> v
-com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.t9:
+com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.j9:
     com.android.tools.r8.ir.code.Value object -> d
     com.android.tools.r8.graph.DexType castType -> c
     1:1:void <init>():275:275 -> <init>
@@ -44416,7 +43948,7 @@
     3:3:void com.android.tools.r8.ir.code.CheckCast.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):40:40 -> b
     3:3:com.android.tools.r8.ir.code.CheckCast build():292 -> b
     4:4:com.android.tools.r8.ir.code.CheckCast build():292:292 -> b
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.Gb:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.mb:
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.Cmp$Bias bias -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -44465,10 +43997,10 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):136 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):136:136 -> b
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    boolean isCommutative() -> m2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    boolean isCommutative() -> n2
     1:17:java.lang.String toString():104:120 -> toString
     18:18:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":188,"2":189,"3":190}}
@@ -44493,12 +44025,12 @@
     165:165:java.lang.String toString():110 -> toString
     166:187:java.lang.String toString():110:131 -> toString
     com.android.tools.r8.ir.code.Cmp asCmp() -> w
-com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.Eb:
+com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.kb:
     int[] $SwitchMap$com$android$tools$r8$ir$code$Cmp$Bias -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():90:90 -> <clinit>
     2:2:void <clinit>():60:60 -> <clinit>
-com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.Fb:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.lb:
     com.android.tools.r8.ir.code.Cmp$Bias GT -> c
     com.android.tools.r8.ir.code.Cmp$Bias[] $VALUES -> e
     com.android.tools.r8.ir.code.Cmp$Bias LT -> d
@@ -44507,7 +44039,7 @@
     2:2:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
     1:1:com.android.tools.r8.ir.code.Cmp$Bias[] values():28:28 -> a
-com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.wd:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.Yc:
     com.android.tools.r8.graph.DexType clazz -> j
     int $r8$clinit -> m
     boolean ignoreCompatRules -> k
@@ -44518,7 +44050,6 @@
     1:2:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):66:67 -> a
     3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getValue():75:75 -> a
     3:3:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):67 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> a
     4:4:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):67 -> a
     5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ConstClass.dest():71:71 -> a
@@ -44530,7 +44061,7 @@
     10:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):154:154 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):180:180 -> a
     12:12:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):185:185 -> a
-    13:13:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):426:426 -> a
+    13:13:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):436:436 -> a
     13:13:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):185 -> a
     14:14:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):190:190 -> a
     15:15:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):195:195 -> a
@@ -44550,14 +44081,14 @@
     28:28:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):164:164 -> b
     boolean instructionInstanceCanThrow() -> b1
     boolean instructionTypeCanThrow() -> d1
-    1:1:int maxInValueRegister():91:91 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> l2
-    1:1:com.android.tools.r8.graph.DexType getValue():75:75 -> m2
+    1:1:int maxInValueRegister():91:91 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> m2
+    1:1:com.android.tools.r8.graph.DexType getValue():75:75 -> n2
     1:1:java.lang.String toString():102:102 -> toString
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> x
-com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.vd:
+com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.Xc:
     com.android.tools.r8.graph.DexType type -> c
     1:1:void <init>():212:212 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
@@ -44566,7 +44097,7 @@
     2:2:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> b
     2:2:com.android.tools.r8.ir.code.ConstClass build():223 -> b
     3:3:com.android.tools.r8.ir.code.ConstClass build():223:223 -> b
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.xd:
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.Zc:
     int $r8$clinit -> i
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> Q0
@@ -44576,7 +44107,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isConstInstruction() -> r1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> y
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.zd:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.bd:
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():21:21 -> <clinit>
@@ -44586,7 +44117,6 @@
     1:1:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):47:47 -> a
     2:2:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.ir.code.ConstMethodHandle.getValue():55:55 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):47 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):47:47 -> a
     4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ConstMethodHandle.dest():51:51 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60 -> a
@@ -44603,13 +44133,13 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
     boolean instructionTypeCanThrow() -> d1
-    1:1:int maxInValueRegister():76:76 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():55:55 -> l2
+    1:1:int maxInValueRegister():76:76 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():55:55 -> m2
     1:1:java.lang.String toString():93:93 -> toString
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> z
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.Ad:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.cd:
     com.android.tools.r8.graph.DexProto methodType -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():21:21 -> <clinit>
@@ -44620,7 +44150,6 @@
     1:1:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):47:47 -> a
     2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.code.ConstMethodType.getValue():55:55 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):47 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):47:47 -> a
     4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ConstMethodType.dest():51:51 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60 -> a
@@ -44637,11 +44166,11 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
     boolean instructionTypeCanThrow() -> d1
-    1:1:int maxInValueRegister():76:76 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
+    1:1:int maxInValueRegister():76:76 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
     1:1:java.lang.String toString():87:87 -> toString
-com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.Cd:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.ed:
     long value -> j
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
@@ -44693,28 +44222,28 @@
     101:101:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):344:344 -> a
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):272:276 -> b
     boolean instructionTypeCanBeCanonicalized() -> c1
-    1:1:int maxInValueRegister():249:249 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Value dest():78:78 -> l2
-    1:2:double getDoubleValue():102:103 -> m2
-    1:2:float getFloatValue():97:98 -> n2
-    1:3:int getIntValue():86:86 -> o2
-    5:5:int getIntValue():88:88 -> o2
-    1:2:long getLongValue():92:93 -> p2
-    1:1:long getRawValue():107:107 -> q2
-    1:1:boolean is16Bit():288:288 -> r2
+    1:1:int maxInValueRegister():249:249 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Value dest():78:78 -> m2
+    1:2:double getDoubleValue():102:103 -> n2
+    1:2:float getFloatValue():97:98 -> o2
+    1:3:int getIntValue():86:86 -> p2
+    5:5:int getIntValue():88:88 -> p2
+    1:2:long getLongValue():92:93 -> q2
+    1:1:long getRawValue():107:107 -> r2
     boolean isConstNumber() -> s1
-    1:1:boolean is8Bit():280:280 -> s2
-    1:1:boolean isIntegerOne():119:119 -> t2
+    1:1:boolean is16Bit():288:288 -> s2
+    1:1:boolean is8Bit():280:280 -> t2
     1:4:java.lang.String toString():260:263 -> toString
-    1:1:boolean isZero():111:111 -> u2
-    1:1:boolean negativeIs16Bit():292:292 -> v2
-    1:1:boolean negativeIs8Bit():284:284 -> w2
-com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.Bd:
+    1:1:boolean isIntegerOne():119:119 -> u2
+    1:1:boolean isZero():111:111 -> v2
+    1:1:boolean negativeIs16Bit():292:292 -> w2
+    1:1:boolean negativeIs8Bit():284:284 -> x2
+com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.dd:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():188:188 -> <clinit>
-com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.Ed:
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.gd:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.DexString value -> j
@@ -44726,15 +44255,13 @@
     1:2:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):52:53 -> a
     3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.code.ConstString.getValue():61:61 -> a
     3:3:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):53 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):53:53 -> a
     5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ConstString.dest():57:57 -> a
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71 -> a
     6:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:72 -> a
     8:8:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):134:134 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     9:9:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):134 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:13:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):134:137 -> a
     14:14:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135:135 -> a
     15:15:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):142:142 -> a
@@ -44750,12 +44277,12 @@
     1:6:boolean instructionInstanceCanThrow():120:125 -> b1
     boolean instructionTypeCanBeCanonicalized() -> c1
     boolean instructionTypeCanThrow() -> d1
-    1:1:int maxInValueRegister():82:82 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.graph.DexString getValue():61:61 -> l2
+    1:1:int maxInValueRegister():82:82 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.graph.DexString getValue():61:61 -> m2
     1:1:java.lang.String toString():93:93 -> toString
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.Md:
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.od:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:6:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20:25 -> a
@@ -44764,16 +44291,13 @@
     8:14:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):26:32 -> a
     15:15:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1576:1576 -> a
     15:15:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):32 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):33:33 -> a
     17:18:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:43 -> a
     19:19:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1576:1576 -> a
     19:19:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:42 -> a
     21:21:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> a
     21:21:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     22:22:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44:44 -> a
     23:23:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> a
     23:23:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44 -> a
@@ -44792,7 +44316,7 @@
     40:40:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     40:40:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):55 -> a
     41:41:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):56:56 -> a
-com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.Me:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.re:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> V0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -44806,14 +44330,14 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:int maxInValueRegister():60:60 -> g2
-    1:1:int maxOutValueRegister():65:65 -> h2
-    int opcode() -> i2
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.Ne:
+    1:1:int maxInValueRegister():60:60 -> h2
+    1:1:int maxOutValueRegister():65:65 -> i2
+    int opcode() -> j2
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.se:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean isAllowedAfterThrowingInstruction() -> f1
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.Oe:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.te:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):30:31 -> <init>
@@ -44827,7 +44351,7 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> b
     boolean isAllowedAfterThrowingInstruction() -> f1
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.Pe:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.ue:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap starting -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> i
     boolean $assertionsDisabled -> k
@@ -44854,13 +44378,13 @@
     3:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:73 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isAllowedAfterThrowingInstruction() -> f1
-    1:1:int maxInValueRegister():78:78 -> g2
-    1:1:int maxOutValueRegister():83:83 -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():44:44 -> l2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():48:48 -> m2
+    1:1:int maxInValueRegister():78:78 -> h2
+    1:1:int maxOutValueRegister():83:83 -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():44:44 -> m2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():48:48 -> n2
     1:6:java.lang.String toString():93:98 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.Qe:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.ve:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -44871,26 +44395,25 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:45 -> a
     2:2:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:45 -> a
-    4:4:void com.android.tools.r8.ir.conversion.DexBuilder.addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):618:618 -> a
-    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:72 -> a
-    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):87:87 -> a
-    7:7:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
-    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):87 -> a
-    8:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):87:89 -> a
-    11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugPosition():118:118 -> a
-    11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):67 -> a
+    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:46 -> a
+    5:5:void com.android.tools.r8.ir.conversion.DexBuilder.addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):618:618 -> a
+    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46 -> a
+    6:6:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:72 -> a
+    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):87:87 -> a
+    8:8:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
+    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):87 -> a
+    9:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):87:89 -> a
+    12:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugPosition():118:118 -> a
+    12:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):67 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51:51 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isAllowedAfterThrowingInstruction() -> f1
-    1:1:int maxInValueRegister():56:56 -> g2
-    1:1:int maxOutValueRegister():61:61 -> h2
-    int opcode() -> i2
-com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.Re:
+    1:1:int maxInValueRegister():56:56 -> h2
+    1:1:int maxOutValueRegister():61:61 -> i2
+    int opcode() -> j2
+com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.we:
     com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
@@ -44903,13 +44426,13 @@
     1:1:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20:20 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     2:2:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20 -> b
-com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.af:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.Ee:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
     java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke) -> a
     java.lang.Object com.android.tools.r8.ir.code.InstructionVisitor.visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance) -> a
     java.lang.Object com.android.tools.r8.ir.code.InstructionVisitor.visit(com.android.tools.r8.ir.code.NewInstance) -> a
-com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.zg:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.hg:
     int $r8$clinit -> m
     com.android.tools.r8.graph.DexReference item -> j
     boolean $assertionsDisabled -> l
@@ -44922,7 +44445,6 @@
     1:2:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):54:55 -> a
     3:3:com.android.tools.r8.graph.DexReference com.android.tools.r8.ir.code.DexItemBasedConstString.getItem():59:59 -> a
     3:3:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):55 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):55:55 -> a
     5:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:84 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod):94:94 -> a
@@ -44940,13 +44462,13 @@
     boolean instructionInstanceCanThrow() -> b1
     boolean instructionTypeCanBeCanonicalized() -> c1
     boolean instructionTypeCanThrow() -> d1
-    1:1:int maxInValueRegister():98:98 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.graph.DexReference getItem():59:59 -> l2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():63:63 -> m2
+    1:1:int maxInValueRegister():98:98 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.graph.DexReference getItem():59:59 -> m2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():63:63 -> n2
     1:1:java.lang.String toString():109:109 -> toString
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.qh:
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.Yg:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     com.android.tools.r8.ir.code.Div asDiv() -> G
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -44973,10 +44495,10 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
-    int opcode() -> i2
-    boolean isCommutative() -> m2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> q2
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.th:
+    int opcode() -> j2
+    boolean isCommutative() -> n2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> r2
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.bh:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
     boolean obsolete -> e
@@ -44986,35 +44508,35 @@
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):40:40 -> <init>
     2:56:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):30:84 -> <init>
-    1:1:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):103:103 -> a
-    2:8:boolean com.android.tools.r8.ir.code.DominatorTree.strictlyDominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):134:140 -> a
-    2:8:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):107 -> a
-    9:16:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):157:164 -> a
-    17:17:boolean com.android.tools.r8.ir.code.DominatorTree.postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):247:247 -> a
-    17:17:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):296 -> a
-    17:17:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):164 -> a
-    18:18:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):297:297 -> a
-    18:18:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):164 -> a
-    19:19:boolean com.android.tools.r8.ir.code.DominatorTree.postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):247:247 -> a
-    19:19:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):299 -> a
-    19:19:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):164 -> a
-    20:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):300:300 -> a
-    20:20:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):164 -> a
-    21:25:java.util.Collection dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock,java.util.Collection):176:180 -> a
-    26:27:java.lang.Iterable dominatorBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):193:194 -> a
-    28:55:java.util.Iterator lambda$dominatorBlocks$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):195:222 -> a
-    56:80:void build():256:280 -> a
-    81:81:boolean com.android.tools.r8.ir.code.DominatorTree.postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):247:247 -> a
-    81:81:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):296 -> a
-    81:81:void build():281 -> a
-    82:82:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):297:297 -> a
-    82:82:void build():281 -> a
-    83:83:boolean com.android.tools.r8.ir.code.DominatorTree.postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):247:247 -> a
-    83:83:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):299 -> a
-    83:83:void build():281 -> a
-    84:84:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):300:300 -> a
-    84:84:void build():281 -> a
-    85:86:void build():284:285 -> a
+    1:195:java.lang.Iterable dominatorBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):0:194 -> a
+    196:196:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):103:103 -> a
+    197:203:boolean com.android.tools.r8.ir.code.DominatorTree.strictlyDominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):134:140 -> a
+    197:203:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):107 -> a
+    204:211:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):157:164 -> a
+    212:212:boolean com.android.tools.r8.ir.code.DominatorTree.postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):247:247 -> a
+    212:212:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):296 -> a
+    212:212:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):164 -> a
+    213:213:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):297:297 -> a
+    213:213:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):164 -> a
+    214:214:boolean com.android.tools.r8.ir.code.DominatorTree.postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):247:247 -> a
+    214:214:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):299 -> a
+    214:214:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):164 -> a
+    215:215:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):300:300 -> a
+    215:215:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):164 -> a
+    216:220:java.util.Collection dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock,java.util.Collection):176:180 -> a
+    221:248:java.util.Iterator lambda$dominatorBlocks$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):195:222 -> a
+    249:273:void build():256:280 -> a
+    274:274:boolean com.android.tools.r8.ir.code.DominatorTree.postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):247:247 -> a
+    274:274:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):296 -> a
+    274:274:void build():281 -> a
+    275:275:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):297:297 -> a
+    275:275:void build():281 -> a
+    276:276:boolean com.android.tools.r8.ir.code.DominatorTree.postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):247:247 -> a
+    276:276:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):299 -> a
+    276:276:void build():281 -> a
+    277:277:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree.intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):300:300 -> a
+    277:277:void build():281 -> a
+    278:279:void build():284:285 -> a
     1:2:com.android.tools.r8.ir.code.BasicBlock immediateDominator(com.android.tools.r8.ir.code.BasicBlock):91:92 -> b
     3:3:com.android.tools.r8.ir.code.BasicBlock[] getSortedBlocks():236:236 -> b
     4:5:boolean recordChangesToControlFlowEdges(java.util.List):320:321 -> b
@@ -45028,7 +44550,7 @@
     319:319:java.lang.String toString():308:308 -> toString
     320:320:java.lang.String toString():309:309 -> toString
     311:317:java.lang.String toString():310:316 -> toString
-com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.rh:
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.Zg:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> c
     com.android.tools.r8.ir.code.BasicBlock current -> b
     boolean $assertionsDisabled -> d
@@ -45037,11 +44559,11 @@
     1:1:boolean hasNext():201:201 -> hasNext
     1:9:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree$1.next():206:214 -> next
     1:9:java.lang.Object next():196 -> next
-com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.sh:
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.ah:
     com.android.tools.r8.ir.code.DominatorTree$Inclusive NO -> b
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.Dh:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.kh:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):21:21 -> <init>
@@ -45059,17 +44581,17 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:5:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):41:45 -> f
-    int maxInValueRegister() -> g2
-    1:1:int maxOutValueRegister():90:90 -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.Dup.getStackValues():49:49 -> l2
-    1:1:com.android.tools.r8.ir.code.StackValue outBottom():53 -> l2
-    2:2:com.android.tools.r8.ir.code.StackValue outBottom():53:53 -> l2
+    int maxInValueRegister() -> h2
+    1:1:int maxOutValueRegister():90:90 -> i2
+    int opcode() -> j2
     1:1:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.Dup.getStackValues():49:49 -> m2
-    1:1:com.android.tools.r8.ir.code.StackValue outTop():57 -> m2
-    2:2:com.android.tools.r8.ir.code.StackValue outTop():57:57 -> m2
-    1:1:com.android.tools.r8.ir.code.StackValue src():61:61 -> n2
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.Ch:
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():53 -> m2
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():53:53 -> m2
+    1:1:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.Dup.getStackValues():49:49 -> n2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():57 -> n2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():57:57 -> n2
+    1:1:com.android.tools.r8.ir.code.StackValue src():61:61 -> o2
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.jh:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):28:28 -> <init>
@@ -45086,12 +44608,12 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:5:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):55:59 -> f
-    int maxInValueRegister() -> g2
-    1:1:int maxOutValueRegister():104:104 -> h2
-    int opcode() -> i2
-com.android.tools.r8.ir.code.FieldGet -> com.android.tools.r8.internal.Kj:
+    int maxInValueRegister() -> h2
+    1:1:int maxOutValueRegister():104:104 -> i2
+    int opcode() -> j2
+com.android.tools.r8.ir.code.FieldGet -> com.android.tools.r8.internal.rj:
     com.android.tools.r8.ir.code.Value outValue() -> a
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.Nj:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.uj:
     com.android.tools.r8.graph.DexField field -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -45116,9 +44638,9 @@
     5:5:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):67:67 -> b
     1:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):136:159 -> f
     1:1:com.android.tools.r8.graph.DexField getField():47:47 -> getField
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():43:43 -> l2
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():43:43 -> m2
     boolean isFieldInstruction() -> z1
-com.android.tools.r8.ir.code.FieldMemberType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Oj:
+com.android.tools.r8.ir.code.FieldMemberType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.vj:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -45128,11 +44650,11 @@
     2:2:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromDexType(com.android.tools.r8.graph.DexType):51 -> a
     3:3:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromTypeDescriptorChar(char):44:44 -> a
     3:3:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromDexType(com.android.tools.r8.graph.DexType):51 -> a
-com.android.tools.r8.ir.code.FieldPut -> com.android.tools.r8.internal.Wj:
+com.android.tools.r8.ir.code.FieldPut -> com.android.tools.r8.internal.Dj:
     void setValue(com.android.tools.r8.ir.code.Value) -> a
     boolean isStaticPut() -> b
     int getValueIndex() -> f
-com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.zk:
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.ek:
     int register -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():12:12 -> <clinit>
@@ -45161,7 +44683,7 @@
     78:78:java.lang.String toString():75:75 -> toString
     79:79:java.lang.String toString():75:75 -> toString
     76:76:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.dm:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.Gl:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -45174,17 +44696,17 @@
     4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):121:121 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):89:89 -> b
     boolean isAllowedAfterThrowingInstruction() -> f1
-    1:1:int maxInValueRegister():63:63 -> g2
-    1:1:int maxOutValueRegister():69:69 -> h2
-    int opcode() -> i2
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():40:43 -> m2
+    1:1:int maxInValueRegister():63:63 -> h2
+    1:1:int maxOutValueRegister():69:69 -> i2
+    int opcode() -> j2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():40:43 -> n2
     1:4:java.lang.String toString():75:78 -> toString
     5:5:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6,"2":7,"3":8}}
     6:6:java.lang.String toString():78:78 -> toString
     7:7:java.lang.String toString():78:78 -> toString
     8:8:java.lang.String toString():78:78 -> toString
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.tn:
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.Ym:
     boolean $assertionsDisabled -> l
     boolean numbered -> f
     int nextInstructionNumber -> g
@@ -45197,421 +44719,430 @@
     java.util.LinkedList blocks -> b
     com.android.tools.r8.utils.InternalOptions options -> j
     com.android.tools.r8.ir.code.NumberGenerator valueNumberGenerator -> c
-    1:1:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,java.util.LinkedList,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):135:135 -> <init>
-    2:35:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,java.util.LinkedList,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):114:147 -> <init>
-    1:13:java.util.Set removeUnreachableBlocks():1348:1360 -> A
-    1:1:int reserveMarkingColor():1246:1246 -> B
-    2:2:boolean com.android.tools.r8.ir.code.IRCode.anyMarkingColorAvailable():1260:1260 -> B
-    2:2:int reserveMarkingColor():1246 -> B
-    3:10:int reserveMarkingColor():1246:1253 -> B
-    11:12:boolean com.android.tools.r8.ir.code.IRCode.verifyNoBlocksMarked(int):499:500 -> B
-    11:12:int reserveMarkingColor():1254 -> B
-    1:1:void setAllThrowingInstructionsHavePositions(boolean):1201:1201 -> C
-    1:11:void splitCriticalEdges():368:378 -> D
-    12:12:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> D
-    12:12:void splitCriticalEdges():378 -> D
-    13:17:void splitCriticalEdges():378:382 -> D
-    18:18:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> D
-    18:18:void splitCriticalEdges():390 -> D
-    19:19:void splitCriticalEdges():390:390 -> D
-    20:29:void splitCriticalEdges():389:398 -> D
-    1:1:java.util.stream.Stream streamInstructions():1027:1027 -> E
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.depthFirstSorting():524:547 -> F
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():517 -> F
-    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():518:518 -> F
-    26:28:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):553:555 -> F
-    26:28:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> F
-    29:29:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> F
-    29:29:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):555 -> F
-    29:29:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> F
-    30:34:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):556:560 -> F
-    30:34:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> F
-    35:35:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> F
-    35:35:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):560 -> F
-    35:35:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> F
-    36:39:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):561:564 -> F
-    36:39:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> F
-    1:14:void traceBlocks():429:442 -> G
-    15:15:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> G
-    15:15:void traceBlocks():447 -> G
-    16:16:void traceBlocks():447:447 -> G
-    17:29:void traceBlocks():446:458 -> G
-    30:30:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1289:1289 -> G
-    30:30:void traceBlocks():458 -> G
-    31:31:void traceBlocks():458:458 -> G
-    1:12:boolean verifyNoImpreciseOrBottomTypes():953:964 -> H
-    1:7:boolean verifyNoNullabilityBottomTypes():968:974 -> I
-    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():978:989 -> J
-    1:14:boolean verifySplitCriticalEdges():402:415 -> K
-    1:14:boolean controlFlowMayDependOnEnvironment(java.util.function.Consumer):301:314 -> a
-    15:19:void com.android.tools.r8.ir.code.IRCode.ensureBlockNumbering():462:466 -> a
-    15:19:void print(com.android.tools.r8.utils.CfgPrinter):568 -> a
-    20:21:void print(com.android.tools.r8.utils.CfgPrinter):569:570 -> a
-    22:29:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):591:598 -> a
-    30:30:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":637,"2":638,"3":639}}
-    637:637:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):598:598 -> a
-    638:638:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):598:598 -> a
-    639:639:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):598:598 -> a
-    630:635:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):600:605 -> a
-    636:636:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):603:603 -> a
-    640:640:boolean lambda$hasNoMergedClasses$1(com.android.tools.r8.graph.classmerging.MergedClassesCollection,com.android.tools.r8.graph.DexType,java.lang.Boolean):607:607 -> a
-    641:641:boolean lambda$verifyTypes$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper,com.android.tools.r8.ir.code.BasicBlock):638:638 -> a
-    642:642:java.util.Collection lambda$consistentPredecessorSuccessors$3(java.util.Collection):766:766 -> a
-    643:643:java.util.Collection lambda$consistentPredecessorSuccessors$4(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):770:770 -> a
-    644:645:void lambda$consistentBlockNumbering$8(java.lang.Integer,java.lang.Long):810:811 -> a
-    646:649:boolean consistentBlockInstructions(boolean):818:821 -> a
-    650:654:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):67:71 -> a
-    650:654:boolean consistentBlockInstructions(boolean):819 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    655:655:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> a
-    655:655:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):71 -> a
-    655:655:boolean consistentBlockInstructions(boolean):819 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    656:657:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):71:72 -> a
-    656:657:boolean consistentBlockInstructions(boolean):819 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    658:658:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
-    658:658:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):72 -> a
-    658:658:boolean consistentBlockInstructions(boolean):819 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    659:659:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):73:73 -> a
-    659:659:boolean consistentBlockInstructions(boolean):819 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    660:662:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):72:74 -> a
-    660:662:boolean consistentBlockInstructions(boolean):819 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    663:663:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    663:663:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):74 -> a
-    663:663:boolean consistentBlockInstructions(boolean):819 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    664:667:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):75:78 -> a
-    664:667:boolean consistentBlockInstructions(boolean):819 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    668:672:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):77:81 -> a
-    668:672:boolean consistentBlockInstructions(boolean):819 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    673:674:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):955:956 -> a
-    675:675:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBoolean():0:0 -> a
-    675:675:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():378 -> a
-    675:675:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):956 -> a
-    676:676:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isByte():0:0 -> a
-    676:676:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():379 -> a
-    676:676:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):956 -> a
-    677:677:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isShort():0:0 -> a
-    677:677:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():380 -> a
-    677:677:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):956 -> a
-    678:678:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isChar():0:0 -> a
-    678:678:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():381 -> a
-    678:678:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):956 -> a
-    679:682:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):956:959 -> a
-    683:683:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,java.util.LinkedList,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):138:138 -> <init>
+    2:35:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,java.util.LinkedList,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):117:150 -> <init>
+    1:1:boolean removeAllDeadAndTrivialPhis():1242:1242 -> A
+    1:13:java.util.Set removeUnreachableBlocks():1384:1396 -> B
+    1:1:int reserveMarkingColor():1282:1282 -> C
+    2:2:boolean com.android.tools.r8.ir.code.IRCode.anyMarkingColorAvailable():1296:1296 -> C
+    2:2:int reserveMarkingColor():1282 -> C
+    3:10:int reserveMarkingColor():1282:1289 -> C
+    11:12:boolean com.android.tools.r8.ir.code.IRCode.verifyNoBlocksMarked(int):502:503 -> C
+    11:12:int reserveMarkingColor():1290 -> C
+    1:1:void setAllThrowingInstructionsHavePositions(boolean):1225:1225 -> D
+    1:11:void splitCriticalEdges():371:381 -> E
+    12:12:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> E
+    12:12:void splitCriticalEdges():381 -> E
+    13:17:void splitCriticalEdges():381:385 -> E
+    18:18:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> E
+    18:18:void splitCriticalEdges():393 -> E
+    19:19:void splitCriticalEdges():393:393 -> E
+    20:29:void splitCriticalEdges():392:401 -> E
+    1:1:java.util.stream.Stream streamInstructions():1030:1030 -> F
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.depthFirstSorting():527:550 -> G
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():520 -> G
+    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():521:521 -> G
+    26:28:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):556:558 -> G
+    26:28:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():522 -> G
+    29:29:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> G
+    29:29:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):558 -> G
+    29:29:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():522 -> G
+    30:34:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):559:563 -> G
+    30:34:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():522 -> G
+    35:35:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> G
+    35:35:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):563 -> G
+    35:35:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():522 -> G
+    36:39:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):564:567 -> G
+    36:39:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():522 -> G
+    1:14:void traceBlocks():432:445 -> H
+    15:15:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> H
+    15:15:void traceBlocks():450 -> H
+    16:16:void traceBlocks():450:450 -> H
+    17:29:void traceBlocks():449:461 -> H
+    30:30:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1325:1325 -> H
+    30:30:void traceBlocks():461 -> H
+    31:31:void traceBlocks():461:461 -> H
+    1:12:boolean verifyNoImpreciseOrBottomTypes():956:967 -> I
+    1:7:boolean verifyNoNullabilityBottomTypes():971:977 -> J
+    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():981:992 -> K
+    1:14:boolean verifySplitCriticalEdges():405:418 -> L
+    1:14:boolean controlFlowMayDependOnEnvironment(java.util.function.Consumer):304:317 -> a
+    15:15:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):367:367 -> a
+    16:17:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1633:1634 -> a
+    16:17:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):367 -> a
+    18:22:void com.android.tools.r8.ir.code.IRCode.ensureBlockNumbering():465:469 -> a
+    18:22:void print(com.android.tools.r8.utils.CfgPrinter):571 -> a
+    23:24:void print(com.android.tools.r8.utils.CfgPrinter):572:573 -> a
+    25:32:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):594:601 -> a
+    33:33:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":643,"2":644,"3":645}}
+    643:643:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):601:601 -> a
+    644:644:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):601:601 -> a
+    645:645:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):601:601 -> a
+    636:641:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):603:608 -> a
+    642:642:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):606:606 -> a
+    646:646:boolean lambda$hasNoMergedClasses$1(com.android.tools.r8.graph.classmerging.MergedClassesCollection,com.android.tools.r8.graph.DexType,java.lang.Boolean):610:610 -> a
+    647:647:boolean lambda$verifyTypes$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper,com.android.tools.r8.ir.code.BasicBlock):641:641 -> a
+    648:648:java.util.Collection lambda$consistentPredecessorSuccessors$3(java.util.Collection):769:769 -> a
+    649:649:java.util.Collection lambda$consistentPredecessorSuccessors$4(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):773:773 -> a
+    650:651:void lambda$consistentBlockNumbering$8(java.lang.Integer,java.lang.Long):813:814 -> a
+    652:655:boolean consistentBlockInstructions(boolean):821:824 -> a
+    656:656:boolean consistentBlockInstructions(boolean):822:822 -> a
+    657:661:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):68:72 -> a
+    657:661:boolean consistentBlockInstructions(boolean):822 -> a
+    662:662:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> a
+    662:662:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):72 -> a
+    662:662:boolean consistentBlockInstructions(boolean):822 -> a
+    663:664:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):72:73 -> a
+    663:664:boolean consistentBlockInstructions(boolean):822 -> a
+    665:665:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
+    665:665:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):73 -> a
+    665:665:boolean consistentBlockInstructions(boolean):822 -> a
+    666:666:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):74:74 -> a
+    666:666:boolean consistentBlockInstructions(boolean):822 -> a
+    667:669:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):73:75 -> a
+    667:669:boolean consistentBlockInstructions(boolean):822 -> a
+    670:670:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    670:670:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):75 -> a
+    670:670:boolean consistentBlockInstructions(boolean):822 -> a
+    671:674:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):76:79 -> a
+    671:674:boolean consistentBlockInstructions(boolean):822 -> a
+    675:679:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):78:82 -> a
+    675:679:boolean consistentBlockInstructions(boolean):822 -> a
+    680:681:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):958:959 -> a
+    682:682:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBoolean():0:0 -> a
+    682:682:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():388 -> a
+    682:682:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):959 -> a
+    683:683:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isByte():0:0 -> a
+    683:683:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():389 -> a
     683:683:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):959 -> a
-    684:686:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):959:961 -> a
-    687:687:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):960:960 -> a
-    688:688:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$11(com.android.tools.r8.ir.code.Instruction):981:981 -> a
-    689:689:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    689:689:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$11(com.android.tools.r8.ir.code.Instruction):981 -> a
-    690:693:boolean lambda$wrapSSAVerifierWithStackValueHandling$14(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):996:999 -> a
-    694:694:java.lang.Iterable blocks(java.util.function.Predicate):1019:1019 -> a
-    695:695:com.android.tools.r8.ir.code.BasicBlockIterator listIterator(int):1057:1057 -> a
-    696:709:java.util.List com.android.tools.r8.ir.code.IRCode.collectArguments(boolean):1092:1105 -> a
-    696:709:java.util.List collectArguments():1088 -> a
-    710:710:java.util.List com.android.tools.r8.ir.code.IRCode.collectArguments(boolean):1103:1103 -> a
-    710:710:java.util.List collectArguments():1088 -> a
-    711:711:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1130:1130 -> a
-    712:712:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1138:1138 -> a
-    713:713:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1154:1154 -> a
-    714:720:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1231:1237 -> a
-    721:721:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1390:1390 -> a
-    722:722:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1276:1276 -> a
-    722:722:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1390 -> a
-    723:734:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1390:1401 -> a
-    735:751:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1412:1428 -> a
+    684:684:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isShort():0:0 -> a
+    684:684:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():390 -> a
+    684:684:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):959 -> a
+    685:685:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isChar():0:0 -> a
+    685:685:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():391 -> a
+    685:685:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):959 -> a
+    686:689:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):959:962 -> a
+    690:690:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    690:690:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):962 -> a
+    691:693:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):962:964 -> a
+    694:694:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):963:963 -> a
+    695:695:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$11(com.android.tools.r8.ir.code.Instruction):984:984 -> a
+    696:696:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    696:696:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$11(com.android.tools.r8.ir.code.Instruction):984 -> a
+    697:700:boolean lambda$wrapSSAVerifierWithStackValueHandling$14(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):999:1002 -> a
+    701:701:java.lang.Iterable blocks(java.util.function.Predicate):1022:1022 -> a
+    702:702:com.android.tools.r8.ir.code.BasicBlockIterator listIterator(int):1060:1060 -> a
+    703:703:java.util.Iterator argumentIterator():1091:1091 -> a
+    704:704:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1154:1154 -> a
+    705:705:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1162:1162 -> a
+    706:706:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1178:1178 -> a
+    707:710:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1255:1258 -> a
+    711:716:boolean com.android.tools.r8.ir.code.IRCode.isDeadPhi(com.android.tools.r8.utils.WorkList):1271:1276 -> a
+    711:716:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1259 -> a
+    717:720:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1260:1263 -> a
+    721:721:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1426:1426 -> a
+    722:722:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1312:1312 -> a
+    722:722:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1426 -> a
+    723:734:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1426:1437 -> a
+    735:751:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1448:1464 -> a
     752:752:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2186,"2":2187,"3":2188}}
-    2186:2186:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1429:1429 -> a
-    2187:2187:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1429:1429 -> a
-    2188:2188:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1429:1429 -> a
-    2185:2185:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1433:1433 -> a
-    2189:2190:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1632:1633 -> a
-    2189:2190:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):364 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:void removeBlocks(java.util.Collection):506:506 -> b
-    2:2:boolean isConsistentGraph(boolean):620:620 -> b
-    3:3:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1289:1289 -> b
-    3:3:boolean isConsistentGraph(boolean):620 -> b
-    4:6:boolean isConsistentGraph(boolean):620:622 -> b
-    7:8:boolean com.android.tools.r8.ir.code.IRCode.consistentCatchHandlers():799:800 -> b
-    7:8:boolean isConsistentGraph(boolean):623 -> b
-    9:9:boolean isConsistentGraph(boolean):624:624 -> b
-    10:12:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():829:831 -> b
-    10:12:boolean isConsistentGraph(boolean):625 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2222,"2":2223,"3":2224}}
+    2222:2222:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1465:1465 -> a
+    2223:2223:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1465:1465 -> a
+    2224:2224:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1465:1465 -> a
+    2221:2221:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1469:1469 -> a
+    1:1:void removeBlocks(java.util.Collection):509:509 -> b
+    2:2:boolean isConsistentGraph(boolean):623:623 -> b
+    3:3:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1325:1325 -> b
+    3:3:boolean isConsistentGraph(boolean):623 -> b
+    4:6:boolean isConsistentGraph(boolean):623:625 -> b
+    7:8:boolean com.android.tools.r8.ir.code.IRCode.consistentCatchHandlers():802:803 -> b
+    7:8:boolean isConsistentGraph(boolean):626 -> b
+    9:9:boolean isConsistentGraph(boolean):627:627 -> b
+    10:12:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():832:834 -> b
+    10:12:boolean isConsistentGraph(boolean):628 -> b
     13:13:boolean com.android.tools.r8.ir.code.Instruction.isAnd():0:0 -> b
-    13:13:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():833 -> b
-    13:13:boolean isConsistentGraph(boolean):625 -> b
-    14:20:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():834:840 -> b
-    14:20:boolean isConsistentGraph(boolean):625 -> b
+    13:13:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():836 -> b
+    13:13:boolean isConsistentGraph(boolean):628 -> b
+    14:20:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():837:843 -> b
+    14:20:boolean isConsistentGraph(boolean):628 -> b
     21:21:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> b
-    21:21:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():842 -> b
-    21:21:boolean isConsistentGraph(boolean):625 -> b
-    22:22:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():843:843 -> b
-    22:22:boolean isConsistentGraph(boolean):625 -> b
+    21:21:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():845 -> b
+    21:21:boolean isConsistentGraph(boolean):628 -> b
+    22:22:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():846:846 -> b
+    22:22:boolean isConsistentGraph(boolean):628 -> b
     23:23:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
-    23:23:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():845 -> b
-    23:23:boolean isConsistentGraph(boolean):625 -> b
-    24:24:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():846:846 -> b
-    24:24:boolean isConsistentGraph(boolean):625 -> b
+    23:23:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():848 -> b
+    23:23:boolean isConsistentGraph(boolean):628 -> b
+    24:24:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():849:849 -> b
+    24:24:boolean isConsistentGraph(boolean):628 -> b
     25:25:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> b
-    25:25:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():848 -> b
-    25:25:boolean isConsistentGraph(boolean):625 -> b
-    26:26:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():849:849 -> b
-    26:26:boolean isConsistentGraph(boolean):625 -> b
+    25:25:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():851 -> b
+    25:25:boolean isConsistentGraph(boolean):628 -> b
+    26:26:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():852:852 -> b
+    26:26:boolean isConsistentGraph(boolean):628 -> b
     27:27:boolean com.android.tools.r8.ir.code.Instruction.isDiv():0:0 -> b
-    27:27:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():851 -> b
-    27:27:boolean isConsistentGraph(boolean):625 -> b
-    28:28:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():852:852 -> b
-    28:28:boolean isConsistentGraph(boolean):625 -> b
+    27:27:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():854 -> b
+    27:27:boolean isConsistentGraph(boolean):628 -> b
+    28:28:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():855:855 -> b
+    28:28:boolean isConsistentGraph(boolean):628 -> b
     29:29:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> b
-    29:29:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():854 -> b
-    29:29:boolean isConsistentGraph(boolean):625 -> b
-    30:33:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():855:858 -> b
-    30:33:boolean isConsistentGraph(boolean):625 -> b
+    29:29:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():857 -> b
+    29:29:boolean isConsistentGraph(boolean):628 -> b
+    30:33:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():858:861 -> b
+    30:33:boolean isConsistentGraph(boolean):628 -> b
     34:34:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> b
-    34:34:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():860 -> b
-    34:34:boolean isConsistentGraph(boolean):625 -> b
-    35:41:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():861:867 -> b
-    35:41:boolean isConsistentGraph(boolean):625 -> b
+    34:34:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():863 -> b
+    34:34:boolean isConsistentGraph(boolean):628 -> b
+    35:41:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():864:870 -> b
+    35:41:boolean isConsistentGraph(boolean):628 -> b
     42:42:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> b
-    42:42:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():869 -> b
-    42:42:boolean isConsistentGraph(boolean):625 -> b
-    43:43:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():870:870 -> b
-    43:43:boolean isConsistentGraph(boolean):625 -> b
+    42:42:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():872 -> b
+    42:42:boolean isConsistentGraph(boolean):628 -> b
+    43:43:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():873:873 -> b
+    43:43:boolean isConsistentGraph(boolean):628 -> b
     44:44:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> b
-    44:44:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():872 -> b
-    44:44:boolean isConsistentGraph(boolean):625 -> b
-    45:48:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():873:876 -> b
-    45:48:boolean isConsistentGraph(boolean):625 -> b
+    44:44:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():875 -> b
+    44:44:boolean isConsistentGraph(boolean):628 -> b
+    45:48:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():876:879 -> b
+    45:48:boolean isConsistentGraph(boolean):628 -> b
     49:49:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> b
-    49:49:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():878 -> b
-    49:49:boolean isConsistentGraph(boolean):625 -> b
-    50:53:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():879:882 -> b
-    50:53:boolean isConsistentGraph(boolean):625 -> b
+    49:49:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():881 -> b
+    49:49:boolean isConsistentGraph(boolean):628 -> b
+    50:53:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():882:885 -> b
+    50:53:boolean isConsistentGraph(boolean):628 -> b
     54:54:boolean com.android.tools.r8.ir.code.Instruction.isOr():0:0 -> b
-    54:54:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():884 -> b
-    54:54:boolean isConsistentGraph(boolean):625 -> b
-    55:55:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():885:885 -> b
-    55:55:boolean isConsistentGraph(boolean):625 -> b
+    54:54:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():887 -> b
+    54:54:boolean isConsistentGraph(boolean):628 -> b
+    55:55:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():888:888 -> b
+    55:55:boolean isConsistentGraph(boolean):628 -> b
     56:56:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> b
-    56:56:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():887 -> b
-    56:56:boolean isConsistentGraph(boolean):625 -> b
-    57:57:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():888:888 -> b
-    57:57:boolean isConsistentGraph(boolean):625 -> b
+    56:56:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():890 -> b
+    56:56:boolean isConsistentGraph(boolean):628 -> b
+    57:57:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():891:891 -> b
+    57:57:boolean isConsistentGraph(boolean):628 -> b
     58:58:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> b
-    58:58:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():890 -> b
-    58:58:boolean isConsistentGraph(boolean):625 -> b
-    59:62:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():891:894 -> b
-    59:62:boolean isConsistentGraph(boolean):625 -> b
+    58:58:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():893 -> b
+    58:58:boolean isConsistentGraph(boolean):628 -> b
+    59:62:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():894:897 -> b
+    59:62:boolean isConsistentGraph(boolean):628 -> b
     63:63:boolean com.android.tools.r8.ir.code.Instruction.isRem():0:0 -> b
-    63:63:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():896 -> b
-    63:63:boolean isConsistentGraph(boolean):625 -> b
-    64:64:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():897:897 -> b
-    64:64:boolean isConsistentGraph(boolean):625 -> b
+    63:63:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():899 -> b
+    63:63:boolean isConsistentGraph(boolean):628 -> b
+    64:64:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():900:900 -> b
+    64:64:boolean isConsistentGraph(boolean):628 -> b
     65:65:boolean com.android.tools.r8.ir.code.Instruction.isShl():0:0 -> b
-    65:65:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():899 -> b
-    65:65:boolean isConsistentGraph(boolean):625 -> b
-    66:66:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():900:900 -> b
-    66:66:boolean isConsistentGraph(boolean):625 -> b
+    65:65:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():902 -> b
+    65:65:boolean isConsistentGraph(boolean):628 -> b
+    66:66:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():903:903 -> b
+    66:66:boolean isConsistentGraph(boolean):628 -> b
     67:67:boolean com.android.tools.r8.ir.code.Instruction.isShr():0:0 -> b
-    67:67:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():902 -> b
-    67:67:boolean isConsistentGraph(boolean):625 -> b
-    68:68:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():903:903 -> b
-    68:68:boolean isConsistentGraph(boolean):625 -> b
+    67:67:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():905 -> b
+    67:67:boolean isConsistentGraph(boolean):628 -> b
+    68:68:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():906:906 -> b
+    68:68:boolean isConsistentGraph(boolean):628 -> b
     69:69:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
-    69:69:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():905 -> b
-    69:69:boolean isConsistentGraph(boolean):625 -> b
-    70:76:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():906:912 -> b
-    70:76:boolean isConsistentGraph(boolean):625 -> b
+    69:69:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():908 -> b
+    69:69:boolean isConsistentGraph(boolean):628 -> b
+    70:76:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():909:915 -> b
+    70:76:boolean isConsistentGraph(boolean):628 -> b
     77:77:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> b
-    77:77:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():914 -> b
-    77:77:boolean isConsistentGraph(boolean):625 -> b
-    78:78:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():915:915 -> b
-    78:78:boolean isConsistentGraph(boolean):625 -> b
+    77:77:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():917 -> b
+    77:77:boolean isConsistentGraph(boolean):628 -> b
+    78:78:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():918:918 -> b
+    78:78:boolean isConsistentGraph(boolean):628 -> b
     79:79:boolean com.android.tools.r8.ir.code.Instruction.isUshr():0:0 -> b
-    79:79:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():917 -> b
-    79:79:boolean isConsistentGraph(boolean):625 -> b
-    80:80:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():918:918 -> b
-    80:80:boolean isConsistentGraph(boolean):625 -> b
+    79:79:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():920 -> b
+    79:79:boolean isConsistentGraph(boolean):628 -> b
+    80:80:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():921:921 -> b
+    80:80:boolean isConsistentGraph(boolean):628 -> b
     81:81:boolean com.android.tools.r8.ir.code.Instruction.isXor():0:0 -> b
-    81:81:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():920 -> b
-    81:81:boolean isConsistentGraph(boolean):625 -> b
-    82:82:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():921:921 -> b
-    82:82:boolean isConsistentGraph(boolean):625 -> b
-    83:83:boolean isConsistentGraph(boolean):626:626 -> b
-    84:86:boolean verifyTypes(com.android.tools.r8.graph.AppView):633:635 -> b
-    87:89:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):643:645 -> b
-    87:89:boolean verifyTypes(com.android.tools.r8.graph.AppView):635 -> b
+    81:81:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():923 -> b
+    81:81:boolean isConsistentGraph(boolean):628 -> b
+    82:82:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():924:924 -> b
+    82:82:boolean isConsistentGraph(boolean):628 -> b
+    83:83:boolean isConsistentGraph(boolean):629:629 -> b
+    84:86:boolean verifyTypes(com.android.tools.r8.graph.AppView):636:638 -> b
+    87:89:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):646:648 -> b
+    87:89:boolean verifyTypes(com.android.tools.r8.graph.AppView):638 -> b
     90:90:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
-    90:90:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):645 -> b
-    90:90:boolean verifyTypes(com.android.tools.r8.graph.AppView):635 -> b
-    91:91:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):646:646 -> b
-    91:91:boolean verifyTypes(com.android.tools.r8.graph.AppView):635 -> b
-    92:94:boolean verifyTypes(com.android.tools.r8.graph.AppView):636:638 -> b
-    95:95:java.util.Collection lambda$consistentPredecessorSuccessors$5(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):773:773 -> b
-    96:98:boolean lambda$verifyNoNullabilityBottomTypes$10(com.android.tools.r8.ir.code.Value):970:970 -> b
-    99:99:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Instruction):984:984 -> b
+    90:90:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):648 -> b
+    90:90:boolean verifyTypes(com.android.tools.r8.graph.AppView):638 -> b
+    91:91:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):649:649 -> b
+    91:91:boolean verifyTypes(com.android.tools.r8.graph.AppView):638 -> b
+    92:94:boolean verifyTypes(com.android.tools.r8.graph.AppView):639:641 -> b
+    95:95:java.util.Collection lambda$consistentPredecessorSuccessors$5(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):776:776 -> b
+    96:98:boolean lambda$verifyNoNullabilityBottomTypes$10(com.android.tools.r8.ir.code.Value):973:973 -> b
+    99:99:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Instruction):987:987 -> b
     100:100:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
-    100:100:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Instruction):984 -> b
-    101:101:java.lang.Iterable instructions(java.util.function.Predicate):1031:1031 -> b
-    102:103:boolean computeAllThrowingInstructionsHavePositions():1205:1206 -> b
-    104:104:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> b
-    104:104:boolean computeAllThrowingInstructionsHavePositions():1207 -> b
-    105:105:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> b
-    105:105:boolean computeAllThrowingInstructionsHavePositions():1208 -> b
-    106:107:boolean computeAllThrowingInstructionsHavePositions():1209:1210 -> b
-    108:108:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> b
-    108:108:boolean com.android.tools.r8.ir.code.Position.isSyntheticNone():137 -> b
-    108:108:boolean computeAllThrowingInstructionsHavePositions():1210 -> b
-    109:109:void returnMarkingColor(int):1270:1270 -> b
-    110:110:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1276:1276 -> b
-    110:110:void returnMarkingColor(int):1270 -> b
-    111:111:void returnMarkingColor(int):1270:1270 -> b
-    112:113:void com.android.tools.r8.ir.code.IRCode.clearMarks(int):483:484 -> b
-    112:113:void returnMarkingColor(int):1271 -> b
-    114:114:void returnMarkingColor(int):1272:1272 -> b
-    115:115:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1365:1365 -> b
-    116:116:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1369:1369 -> b
-    116:116:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1365 -> b
-    117:117:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1276:1276 -> b
-    117:117:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1369 -> b
-    117:117:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1365 -> b
-    118:119:boolean com.android.tools.r8.ir.code.IRCode.anyBlocksMarkedWithColor(int):1280:1281 -> b
-    118:119:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1369 -> b
-    118:119:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1365 -> b
-    120:129:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1369:1378 -> b
-    120:129:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1365 -> b
-    1:17:java.util.Map computeLiveAtEntrySets():171:187 -> c
-    18:18:void com.android.tools.r8.utils.LinkedHashSetUtils.addAll(java.util.LinkedHashSet,java.util.LinkedHashSet):12:12 -> c
-    18:18:java.util.Map computeLiveAtEntrySets():187 -> c
-    19:54:java.util.Map computeLiveAtEntrySets():188:223 -> c
-    55:75:java.util.Map computeLiveAtEntrySets():222:242 -> c
-    76:76:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> c
-    76:76:java.util.Map computeLiveAtEntrySets():246 -> c
-    77:116:java.util.Map computeLiveAtEntrySets():246:285 -> c
-    117:117:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():92:92 -> c
-    117:117:java.util.Map computeLiveAtEntrySets():285 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    118:118:java.util.Map computeLiveAtEntrySets():285:285 -> c
-    119:119:java.util.Map computeLiveAtEntrySets():0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":407,"2":408,"3":409}}
-    407:407:java.util.Map computeLiveAtEntrySets():285:285 -> c
-    408:408:java.util.Map computeLiveAtEntrySets():285:285 -> c
-    409:409:java.util.Map computeLiveAtEntrySets():285:285 -> c
-    406:406:java.util.Map computeLiveAtEntrySets():287:287 -> c
-    410:410:java.util.Collection lambda$consistentPredecessorSuccessors$6(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):784:784 -> c
-    411:417:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$13(com.android.tools.r8.ir.code.Value):980:980 -> c
-    423:423:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$13(com.android.tools.r8.ir.code.Value):986:986 -> c
-    424:424:java.util.Iterator lambda$blocks$15(java.util.function.Predicate):1019:1019 -> c
-    1:1:java.util.Collection lambda$consistentPredecessorSuccessors$7(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):791:791 -> d
-    2:2:java.util.Iterator lambda$instructions$16(java.util.function.Predicate):1031:1031 -> d
-    3:9:java.util.List computeNormalExitBlocks():1043:1049 -> d
-    1:3:boolean consistentBlockNumbering():806:808 -> e
-    4:11:boolean verifySSATypeLattice(java.util.function.Predicate):1005:1012 -> e
-    1:33:boolean consistentPredecessorSuccessors():760:792 -> f
-    34:34:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):993:993 -> f
-    1:1:com.android.tools.r8.graph.ProgramMethod context():155:155 -> g
-    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1189:1189 -> h
-    2:2:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1134:1134 -> h
-    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1189 -> h
-    1:1:boolean doAllThrowingInstructionsHavePositions():1197:1197 -> i
-    1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():164:164 -> j
-    1:1:int getCurrentBlockNumber():1180:1180 -> k
-    1:1:com.android.tools.r8.ir.code.Argument getLastArgument():1110:1110 -> l
-    2:3:int com.android.tools.r8.ir.code.IRCode.getNumberOfArguments():1083:1084 -> l
-    2:3:com.android.tools.r8.ir.code.Argument getLastArgument():1110 -> l
-    4:4:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1682:1682 -> l
-    4:4:com.android.tools.r8.ir.code.Argument getLastArgument():1110 -> l
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:7:com.android.tools.r8.ir.code.Argument getLastArgument():1111:1113 -> l
-    1:1:int getNextInstructionNumber():1079:1079 -> m
-    1:7:com.android.tools.r8.ir.code.Value getThis():1118:1124 -> n
-    1:9:java.util.Set getUnreachableBlocks():1335:1343 -> o
-    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():1035:1035 -> p
-    1:1:java.lang.Iterable instructions():1023:1023 -> q
-    1:2:boolean isConsistentSSA():575:576 -> r
-    1:2:boolean isConsistentSSABeforeTypesAreCorrect():581:582 -> s
-    3:24:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():683:704 -> s
-    3:24:boolean isConsistentSSABeforeTypesAreCorrect():583 -> s
-    25:25:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> s
-    25:25:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():706 -> s
-    25:25:boolean isConsistentSSABeforeTypesAreCorrect():583 -> s
-    26:38:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():706:718 -> s
-    26:38:boolean isConsistentSSABeforeTypesAreCorrect():583 -> s
-    39:39:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):726:726 -> s
-    39:39:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():718 -> s
-    39:39:boolean isConsistentSSABeforeTypesAreCorrect():583 -> s
-    40:40:boolean com.android.tools.r8.ir.code.IRCode.verifyPhi(com.android.tools.r8.ir.code.Phi):731:731 -> s
-    40:40:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):726 -> s
-    40:40:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():718 -> s
-    40:40:boolean isConsistentSSABeforeTypesAreCorrect():583 -> s
-    41:44:boolean com.android.tools.r8.ir.code.IRCode.verifyDefinition(com.android.tools.r8.ir.code.Value):736:739 -> s
-    41:44:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):726 -> s
-    41:44:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():718 -> s
-    41:44:boolean isConsistentSSABeforeTypesAreCorrect():583 -> s
-    45:45:boolean com.android.tools.r8.ir.code.IRCode.verifyDefinition(com.android.tools.r8.ir.code.Value):737:737 -> s
-    45:45:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):726 -> s
-    45:45:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():718 -> s
-    45:45:boolean isConsistentSSABeforeTypesAreCorrect():583 -> s
-    46:47:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):744:745 -> s
-    46:47:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():719 -> s
-    46:47:boolean isConsistentSSABeforeTypesAreCorrect():583 -> s
-    48:48:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> s
-    48:48:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):745 -> s
-    48:48:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():719 -> s
-    48:48:boolean isConsistentSSABeforeTypesAreCorrect():583 -> s
-    49:57:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):745:753 -> s
-    49:57:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():719 -> s
-    49:57:boolean isConsistentSSABeforeTypesAreCorrect():583 -> s
-    58:58:boolean isConsistentSSABeforeTypesAreCorrect():584:584 -> s
-    59:75:boolean com.android.tools.r8.ir.code.IRCode.validThrowingInstructions():929:945 -> s
-    59:75:boolean isConsistentSSABeforeTypesAreCorrect():584 -> s
-    76:76:boolean isConsistentSSABeforeTypesAreCorrect():585:585 -> s
-    77:88:boolean com.android.tools.r8.ir.code.IRCode.noCriticalEdges():654:665 -> s
-    77:88:boolean isConsistentSSABeforeTypesAreCorrect():585 -> s
-    89:90:boolean isConsistentSSABeforeTypesAreCorrect():585:586 -> s
-    1:1:com.android.tools.r8.ir.code.BasicBlockIterator listIterator():1053:1053 -> t
+    100:100:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Instruction):987 -> b
+    101:101:java.lang.Iterable instructions(java.util.function.Predicate):1034:1034 -> b
+    102:102:java.util.List com.android.tools.r8.ir.code.IRCode.collectArguments(boolean):1118:1118 -> b
+    102:102:java.util.List collectArguments():1114 -> b
+    103:103:java.util.Iterator com.android.tools.r8.ir.code.IRCode.argumentIterator():1091:1091 -> b
+    103:103:java.util.List com.android.tools.r8.ir.code.IRCode.collectArguments(boolean):1119 -> b
+    103:103:java.util.List collectArguments():1114 -> b
+    104:113:java.util.List com.android.tools.r8.ir.code.IRCode.collectArguments(boolean):1120:1129 -> b
+    104:113:java.util.List collectArguments():1114 -> b
+    114:114:java.util.List com.android.tools.r8.ir.code.IRCode.collectArguments(boolean):1127:1127 -> b
+    114:114:java.util.List collectArguments():1114 -> b
+    115:115:void returnMarkingColor(int):1306:1306 -> b
+    116:116:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1312:1312 -> b
+    116:116:void returnMarkingColor(int):1306 -> b
+    117:117:void returnMarkingColor(int):1306:1306 -> b
+    118:119:void com.android.tools.r8.ir.code.IRCode.clearMarks(int):486:487 -> b
+    118:119:void returnMarkingColor(int):1307 -> b
+    120:120:void returnMarkingColor(int):1308:1308 -> b
+    121:121:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1401:1401 -> b
+    122:122:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1405:1405 -> b
+    122:122:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1401 -> b
+    123:123:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1312:1312 -> b
+    123:123:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1405 -> b
+    123:123:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1401 -> b
+    124:125:boolean com.android.tools.r8.ir.code.IRCode.anyBlocksMarkedWithColor(int):1316:1317 -> b
+    124:125:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1405 -> b
+    124:125:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1401 -> b
+    126:135:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1405:1414 -> b
+    126:135:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1401 -> b
+    1:1:java.util.Collection lambda$consistentPredecessorSuccessors$6(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):787:787 -> c
+    2:8:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$13(com.android.tools.r8.ir.code.Value):983:983 -> c
+    14:14:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$13(com.android.tools.r8.ir.code.Value):989:989 -> c
+    15:15:java.util.Iterator lambda$blocks$15(java.util.function.Predicate):1022:1022 -> c
+    16:17:boolean computeAllThrowingInstructionsHavePositions():1229:1230 -> c
+    18:18:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> c
+    18:18:boolean computeAllThrowingInstructionsHavePositions():1231 -> c
+    19:19:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> c
+    19:19:boolean computeAllThrowingInstructionsHavePositions():1232 -> c
+    20:21:boolean computeAllThrowingInstructionsHavePositions():1233:1234 -> c
+    22:22:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> c
+    22:22:boolean com.android.tools.r8.ir.code.Position.isSyntheticNone():137 -> c
+    22:22:boolean computeAllThrowingInstructionsHavePositions():1234 -> c
+    1:17:java.util.Map computeLiveAtEntrySets():174:190 -> d
+    18:18:void com.android.tools.r8.utils.LinkedHashSetUtils.addAll(java.util.LinkedHashSet,java.util.LinkedHashSet):12:12 -> d
+    18:18:java.util.Map computeLiveAtEntrySets():190 -> d
+    19:54:java.util.Map computeLiveAtEntrySets():191:226 -> d
+    55:75:java.util.Map computeLiveAtEntrySets():225:245 -> d
+    76:76:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> d
+    76:76:java.util.Map computeLiveAtEntrySets():249 -> d
+    77:116:java.util.Map computeLiveAtEntrySets():249:288 -> d
+    117:117:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():95:95 -> d
+    117:117:java.util.Map computeLiveAtEntrySets():288 -> d
+    118:118:java.util.Map computeLiveAtEntrySets():288:288 -> d
+    119:119:java.util.Map computeLiveAtEntrySets():0:0 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":410,"2":411,"3":412}}
+    410:410:java.util.Map computeLiveAtEntrySets():288:288 -> d
+    411:411:java.util.Map computeLiveAtEntrySets():288:288 -> d
+    412:412:java.util.Map computeLiveAtEntrySets():288:288 -> d
+    409:409:java.util.Map computeLiveAtEntrySets():290:290 -> d
+    413:413:java.util.Collection lambda$consistentPredecessorSuccessors$7(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):794:794 -> d
+    414:414:java.util.Iterator lambda$instructions$16(java.util.function.Predicate):1034:1034 -> d
+    1:8:boolean verifySSATypeLattice(java.util.function.Predicate):1008:1015 -> e
+    9:15:java.util.List computeNormalExitBlocks():1046:1052 -> e
+    1:3:boolean consistentBlockNumbering():809:811 -> f
+    4:4:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):996:996 -> f
+    1:33:boolean consistentPredecessorSuccessors():763:795 -> g
+    1:1:com.android.tools.r8.graph.ProgramMethod context():158:158 -> h
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1213:1213 -> i
+    2:2:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1158:1158 -> i
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1213 -> i
+    1:1:boolean doAllThrowingInstructionsHavePositions():1221:1221 -> j
+    1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():167:167 -> k
+    1:1:int getCurrentBlockNumber():1204:1204 -> l
+    1:1:com.android.tools.r8.ir.code.Argument getLastArgument():1134:1134 -> m
+    2:3:int com.android.tools.r8.ir.code.IRCode.getNumberOfArguments():1086:1087 -> m
+    2:3:com.android.tools.r8.ir.code.Argument getLastArgument():1134 -> m
+    4:4:com.android.tools.r8.ir.code.Argument getLastArgument():1134:1134 -> m
+    5:5:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1683:1683 -> m
+    5:5:com.android.tools.r8.ir.code.Argument getLastArgument():1134 -> m
+    6:8:com.android.tools.r8.ir.code.Argument getLastArgument():1135:1137 -> m
+    1:1:int getNextInstructionNumber():1082:1082 -> n
+    1:7:com.android.tools.r8.ir.code.Value getThis():1142:1148 -> o
+    1:9:java.util.Set getUnreachableBlocks():1371:1379 -> p
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():1038:1038 -> q
+    1:1:java.lang.Iterable instructions():1026:1026 -> r
+    1:2:boolean isConsistentSSA():578:579 -> s
+    1:2:boolean isConsistentSSABeforeTypesAreCorrect():584:585 -> t
+    3:24:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():686:707 -> t
+    3:24:boolean isConsistentSSABeforeTypesAreCorrect():586 -> t
+    25:25:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> t
+    25:25:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():709 -> t
+    25:25:boolean isConsistentSSABeforeTypesAreCorrect():586 -> t
+    26:38:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():709:721 -> t
+    26:38:boolean isConsistentSSABeforeTypesAreCorrect():586 -> t
+    39:39:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):729:729 -> t
+    39:39:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():721 -> t
+    39:39:boolean isConsistentSSABeforeTypesAreCorrect():586 -> t
+    40:40:boolean com.android.tools.r8.ir.code.IRCode.verifyPhi(com.android.tools.r8.ir.code.Phi):734:734 -> t
+    40:40:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):729 -> t
+    40:40:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():721 -> t
+    40:40:boolean isConsistentSSABeforeTypesAreCorrect():586 -> t
+    41:44:boolean com.android.tools.r8.ir.code.IRCode.verifyDefinition(com.android.tools.r8.ir.code.Value):739:742 -> t
+    41:44:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):729 -> t
+    41:44:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():721 -> t
+    41:44:boolean isConsistentSSABeforeTypesAreCorrect():586 -> t
+    45:45:boolean com.android.tools.r8.ir.code.IRCode.verifyDefinition(com.android.tools.r8.ir.code.Value):740:740 -> t
+    45:45:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):729 -> t
+    45:45:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():721 -> t
+    45:45:boolean isConsistentSSABeforeTypesAreCorrect():586 -> t
+    46:47:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):747:748 -> t
+    46:47:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():722 -> t
+    46:47:boolean isConsistentSSABeforeTypesAreCorrect():586 -> t
+    48:48:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> t
+    48:48:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):748 -> t
+    48:48:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():722 -> t
+    48:48:boolean isConsistentSSABeforeTypesAreCorrect():586 -> t
+    49:57:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):748:756 -> t
+    49:57:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():722 -> t
+    49:57:boolean isConsistentSSABeforeTypesAreCorrect():586 -> t
+    58:58:boolean isConsistentSSABeforeTypesAreCorrect():587:587 -> t
+    59:75:boolean com.android.tools.r8.ir.code.IRCode.validThrowingInstructions():932:948 -> t
+    59:75:boolean isConsistentSSABeforeTypesAreCorrect():587 -> t
+    76:76:boolean isConsistentSSABeforeTypesAreCorrect():588:588 -> t
+    77:88:boolean com.android.tools.r8.ir.code.IRCode.noCriticalEdges():657:668 -> t
+    77:88:boolean isConsistentSSABeforeTypesAreCorrect():588 -> t
+    89:90:boolean isConsistentSSABeforeTypesAreCorrect():588:589 -> t
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":481,"2":482,"3":483}}
-    481:481:java.lang.String toString():473:473 -> toString
-    482:482:java.lang.String toString():473:473 -> toString
-    483:483:java.lang.String toString():474:474 -> toString
-    476:480:java.lang.String toString():475:479 -> toString
-    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():151:151 -> u
-    1:1:com.android.tools.r8.graph.DexEncodedMethod method():160:160 -> v
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():1061:1063 -> w
-    1:7:int numberRemainingInstructions():1069:1075 -> x
-    1:23:void prepareBlocksForCatchHandlers():333:355 -> y
-    24:24:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> y
-    24:24:void prepareBlocksForCatchHandlers():356 -> y
-    25:26:void prepareBlocksForCatchHandlers():356:357 -> y
-    27:28:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> y
-    27:28:void prepareBlocksForCatchHandlers():357 -> y
-    29:35:void prepareBlocksForCatchHandlers():358:364 -> y
-    1:1:boolean removeAllDeadAndTrivialPhis():1218:1218 -> z
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.rn:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":484,"2":485,"3":486}}
+    484:484:java.lang.String toString():476:476 -> toString
+    485:485:java.lang.String toString():476:476 -> toString
+    486:486:java.lang.String toString():477:477 -> toString
+    479:483:java.lang.String toString():478:482 -> toString
+    1:1:com.android.tools.r8.ir.code.BasicBlockIterator listIterator():1056:1056 -> u
+    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():154:154 -> v
+    1:1:com.android.tools.r8.graph.DexEncodedMethod method():163:163 -> w
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():1064:1066 -> x
+    1:7:int numberRemainingInstructions():1072:1078 -> y
+    1:23:void prepareBlocksForCatchHandlers():336:358 -> z
+    24:24:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> z
+    24:24:void prepareBlocksForCatchHandlers():359 -> z
+    25:26:void prepareBlocksForCatchHandlers():359:360 -> z
+    27:28:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> z
+    27:28:void prepareBlocksForCatchHandlers():360 -> z
+    29:35:void prepareBlocksForCatchHandlers():361:367 -> z
+com.android.tools.r8.ir.code.IRCode$1 -> com.android.tools.r8.internal.Vm:
+    com.android.tools.r8.ir.code.Argument next -> c
+    com.android.tools.r8.ir.code.InstructionIterator instructionIterator -> b
+    1:4:void <init>(com.android.tools.r8.ir.code.IRCode):1091:1094 -> <init>
+    1:1:boolean hasNext():1098:1098 -> hasNext
+    1:5:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.code.IRCode$1.next():1103:1107 -> next
+    1:5:java.lang.Object next():1091 -> next
+    6:6:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.code.IRCode$1.next():1104:1104 -> next
+    6:6:java.lang.Object next():1091 -> next
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.Wm:
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):100:101 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.sn:
+    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):103:104 -> <init>
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.Xm:
     java.util.Deque liveStackValues -> c
     java.util.Set liveLocalValues -> b
     java.util.LinkedHashSet liveValues -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():63:63 -> <clinit>
-    1:5:void <init>(java.util.LinkedHashSet,java.util.Set,java.util.Deque):73:77 -> <init>
-    1:2:boolean equals(java.lang.Object):87:88 -> equals
-    1:1:int hashCode():82:82 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.un:
+    1:1:void <clinit>():66:66 -> <clinit>
+    1:5:void <init>(java.util.LinkedHashSet,java.util.Set,java.util.Deque):76:80 -> <init>
+    1:2:boolean equals(java.lang.Object):90:91 -> equals
+    1:1:int hashCode():85:85 -> hashCode
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.Zm:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
@@ -45626,53 +45157,53 @@
     10:10:java.lang.Object next():10 -> next
     1:10:com.android.tools.r8.ir.code.Instruction previous():48:57 -> previous
     11:11:com.android.tools.r8.ir.code.Instruction previous():52:52 -> previous
-com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.vn:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.an:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.code.IRCode):30:33 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):39:39 -> a
-    2:2:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):44:44 -> a
-    3:3:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):54:54 -> a
-    4:4:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):61:61 -> a
-    5:5:boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):67:67 -> a
-    6:6:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):73:73 -> a
-    7:7:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):78:78 -> a
-    8:8:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):90:90 -> a
-    9:9:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):107:107 -> a
-    10:10:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):117:117 -> a
-    11:11:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):123:123 -> a
-    12:12:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):128:128 -> a
-    13:13:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):134:134 -> a
-    14:14:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):145:145 -> a
-    15:15:void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):206:206 -> a
-    16:16:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):222:222 -> a
-    17:17:void setInsertionPosition(com.android.tools.r8.ir.code.Position):237:237 -> a
-    1:1:void add(java.lang.Object):23:23 -> add
-    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):197:197 -> add
-    2:2:void add(java.lang.Object):23 -> add
-    1:1:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):84:84 -> b
-    1:1:void unsetInsertionPosition():242:242 -> h
-    1:1:boolean hasNext():150:150 -> hasNext
-    1:1:boolean hasPrevious():168:168 -> hasPrevious
-    1:1:void removeOrReplaceByDebugLocalRead():227:227 -> i
-    1:1:void removeInstructionIgnoreOutValue():96:96 -> k
-    1:9:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():155:163 -> next
-    1:9:java.lang.Object next():23 -> next
-    10:10:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():159:159 -> next
-    10:10:java.lang.Object next():23 -> next
-    1:1:int nextIndex():187:187 -> nextIndex
-    1:1:java.lang.Object previous():23:23 -> previous
-    2:11:com.android.tools.r8.ir.code.Instruction previous():173:182 -> previous
-    12:12:com.android.tools.r8.ir.code.Instruction previous():177:177 -> previous
-    1:1:int previousIndex():192:192 -> previousIndex
-    1:1:void remove():212:212 -> remove
-    1:1:void set(java.lang.Object):23:23 -> set
-    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):217:217 -> set
-    2:2:void set(java.lang.Object):23 -> set
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.xn:
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.code.IRCode):31:34 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):40:40 -> a
+    2:2:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):45:45 -> a
+    3:3:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):55:55 -> a
+    4:4:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> a
+    5:5:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):71:71 -> a
+    6:6:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):78:78 -> a
+    7:7:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):83:83 -> a
+    8:8:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):95:95 -> a
+    9:9:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):112:112 -> a
+    10:10:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):122:122 -> a
+    11:11:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):128:128 -> a
+    12:12:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):133:133 -> a
+    13:13:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):139:139 -> a
+    14:14:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):150:150 -> a
+    15:15:void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):211:211 -> a
+    16:16:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):227:227 -> a
+    17:17:void setInsertionPosition(com.android.tools.r8.ir.code.Position):242:242 -> a
+    1:1:void add(java.lang.Object):24:24 -> add
+    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):202:202 -> add
+    2:2:void add(java.lang.Object):24 -> add
+    1:1:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):89:89 -> b
+    1:1:void unsetInsertionPosition():247:247 -> h
+    1:1:boolean hasNext():155:155 -> hasNext
+    1:1:boolean hasPrevious():173:173 -> hasPrevious
+    1:1:void removeOrReplaceByDebugLocalRead():232:232 -> i
+    1:1:void removeInstructionIgnoreOutValue():101:101 -> k
+    1:9:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():160:168 -> next
+    1:9:java.lang.Object next():24 -> next
+    10:10:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():164:164 -> next
+    10:10:java.lang.Object next():24 -> next
+    1:1:int nextIndex():192:192 -> nextIndex
+    1:1:java.lang.Object previous():24:24 -> previous
+    2:11:com.android.tools.r8.ir.code.Instruction previous():178:187 -> previous
+    12:12:com.android.tools.r8.ir.code.Instruction previous():182:182 -> previous
+    1:1:int previousIndex():197:197 -> previousIndex
+    1:1:void remove():217:217 -> remove
+    1:1:void set(java.lang.Object):24:24 -> set
+    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):222:222 -> set
+    2:2:void set(java.lang.Object):24 -> set
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.cn:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:7:com.android.tools.r8.ir.code.InvokeDirect getUniqueConstructorInvoke(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):24:30 -> a
@@ -45690,7 +45221,7 @@
     76:76:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
     76:76:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148 -> a
     77:80:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148:151 -> a
-com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.zn:
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.en:
     long second -> b
     long first -> a
     boolean $assertionsDisabled -> c
@@ -45806,7 +45337,7 @@
     1:1:boolean mayHaveInvokeVirtual():206:206 -> x
     1:1:boolean mayHaveMonitorInstruction():210:210 -> y
     1:1:boolean mayHaveMul():214:214 -> z
-com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.Qn:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.vn:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.If$Type type -> j
@@ -45860,23 +45391,23 @@
     274:274:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):241:241 -> c
     275:275:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):239:239 -> c
     276:276:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):237:237 -> c
-    1:1:int maxInValueRegister():182:182 -> g2
-    1:1:int maxOutValueRegister():187:187 -> h2
-    int opcode() -> i2
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():140:143 -> l2
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():125:128 -> m2
-    1:1:com.android.tools.r8.ir.code.If$Type getType():114:114 -> n2
-    1:4:void invert():118:121 -> o2
-    1:1:boolean isZeroTest():101:101 -> p2
-    1:1:com.android.tools.r8.ir.code.Value lhs():105:105 -> q2
-    1:2:com.android.tools.r8.ir.code.Value rhs():109:110 -> r2
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():222:224 -> s2
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNullObject():228:230 -> t2
+    1:1:int maxInValueRegister():182:182 -> h2
+    1:1:int maxOutValueRegister():187:187 -> i2
+    int opcode() -> j2
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():140:143 -> m2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():125:128 -> n2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():114:114 -> o2
+    1:4:void invert():118:121 -> p2
+    1:1:boolean isZeroTest():101:101 -> q2
+    1:1:com.android.tools.r8.ir.code.Value lhs():105:105 -> r2
+    1:2:com.android.tools.r8.ir.code.Value rhs():109:110 -> s2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():222:224 -> t2
     1:8:java.lang.String toString():169:176 -> toString
-com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.Pn:
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNullObject():228:230 -> u2
+com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.un:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():27:27 -> <clinit>
-com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.Qn$a:
+com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.vn$a:
     com.android.tools.r8.ir.code.If$Type GE -> c
     com.android.tools.r8.ir.code.If$Type GT -> d
     com.android.tools.r8.ir.code.If$Type EQ -> b
@@ -45899,10 +45430,10 @@
     19:27:com.android.tools.r8.ir.code.If$Type inverted():49:57 -> b
     28:28:com.android.tools.r8.ir.code.If$Type inverted():47:47 -> b
     1:1:com.android.tools.r8.ir.code.If$Type[] values():22:22 -> c
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.Ro:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.vo:
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
     com.android.tools.r8.ir.code.MemberType getMemberType() -> d
-com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.Vo:
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.zo:
     boolean $assertionsDisabled -> j
     int increment -> i
     1:1:void <clinit>():20:20 -> <clinit>
@@ -45914,11 +45445,11 @@
     4:14:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:96 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54:54 -> b
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> c
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.jp:
+com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.Mo:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -45940,23 +45471,22 @@
     4:16:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):101:113 -> b
     1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127:134 -> d
     boolean instructionTypeCanThrow() -> d1
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.InitClass$Builder builder():39:39 -> l2
-    1:1:com.android.tools.r8.graph.DexType getClassValue():43:43 -> m2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.InitClass$Builder builder():39:39 -> m2
+    1:1:com.android.tools.r8.graph.DexType getClassValue():43:43 -> n2
     1:1:java.lang.String toString():171:171 -> toString
-com.android.tools.r8.ir.code.InitClass$1 -> com.android.tools.r8.internal.hp:
-com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.ip:
+com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.Lo:
     com.android.tools.r8.graph.DexType type -> c
     1:1:void <init>(com.android.tools.r8.ir.code.InitClass$1):174:174 -> <init>
     2:2:void <init>():178:178 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.InitClass$Builder setType(com.android.tools.r8.graph.DexType):181:181 -> a
     1:1:com.android.tools.r8.ir.code.InitClass build():187:187 -> b
-com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.Tp:
+com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.vp:
     com.android.tools.r8.ir.code.Value object() -> e
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.Wp:
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.yp:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):38:38 -> <init>
@@ -45985,14 +45515,12 @@
     192:192:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):147:147 -> a
     193:193:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InstanceGet):169:169 -> a
     193:193:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):53 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     194:194:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):187:187 -> a
     195:195:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):192:192 -> a
     196:197:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):197:198 -> a
     198:198:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:203 -> a
     199:201:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.conversion.CfBuilder.resolveField(com.android.tools.r8.graph.DexField):229:231 -> a
     199:201:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     202:202:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:203 -> a
     203:203:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):208:208 -> a
     204:204:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):228:228 -> a
@@ -46003,13 +45531,13 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean instructionTypeCanThrow() -> d1
     1:2:com.android.tools.r8.ir.code.Value object():62:63 -> e
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    boolean throwsOnNullInput() -> k2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    boolean throwsOnNullInput() -> l2
     1:1:java.lang.String toString():182:182 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():68:68 -> value
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.fq:
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.Hp:
     com.android.tools.r8.graph.DexType type -> i
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> Q
@@ -46028,13 +45556,13 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean instructionTypeCanThrow() -> d1
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.graph.DexType type():40:40 -> l2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.graph.DexType type():40:40 -> m2
     1:2:java.lang.String toString():127:128 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():48:48 -> value
-com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.gq:
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.Ip:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):38:38 -> <init>
@@ -46067,13 +45595,11 @@
     213:223:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):158:168 -> a
     224:224:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InstancePut):179:179 -> a
     224:224:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):64 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     225:225:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):199:199 -> a
     226:226:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):239:239 -> a
     227:227:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):244:244 -> a
     228:230:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.conversion.CfBuilder.resolveField(com.android.tools.r8.graph.DexField):229:231 -> a
     228:230:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):244 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     231:231:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):244:244 -> a
     232:232:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):249:249 -> a
     233:233:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):269:269 -> a
@@ -46082,13 +45608,13 @@
     boolean instructionTypeCanThrow() -> d1
     1:1:com.android.tools.r8.ir.code.Value object():74:74 -> e
     int getValueIndex() -> f
-    int maxInValueRegister() -> g2
-    1:1:int maxOutValueRegister():192:192 -> h2
-    int opcode() -> i2
-    boolean throwsOnNullInput() -> k2
+    int maxInValueRegister() -> h2
+    1:1:int maxOutValueRegister():192:192 -> i2
+    int opcode() -> j2
+    boolean throwsOnNullInput() -> l2
     1:1:java.lang.String toString():234:234 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():79:79 -> value
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.qq:
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.Sp:
     com.android.tools.r8.ir.code.Position position -> g
     java.util.List inValues -> c
     java.util.Set debugValues -> f
@@ -46147,7 +45673,7 @@
     1:1:java.lang.String getInstructionName():346:346 -> N0
     boolean isInvokeVirtual() -> N1
     com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction() -> O
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1510:1510 -> O0
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1518:1518 -> O0
     boolean isJumpInstruction() -> O1
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> P
     1:1:int getNumber():395:395 -> P0
@@ -46213,122 +45739,119 @@
     269:277:void replaceDebugValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):243:251 -> a
     281:287:com.android.tools.r8.ir.code.Value removeDebugValue(com.android.tools.r8.graph.DebugLocalInfo):278:284 -> a
     288:289:void setBlock(com.android.tools.r8.ir.code.BasicBlock):314:315 -> a
-    290:290:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):335:335 -> a
-    290:290:void replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):331 -> a
-    291:292:void print(com.android.tools.r8.utils.CfgPrinter):370:371 -> a
-    293:293:java.lang.String com.android.tools.r8.utils.CfgPrinter.makeUnusedValue():20:20 -> a
-    293:293:void print(com.android.tools.r8.utils.CfgPrinter):371 -> a
-    294:295:void print(com.android.tools.r8.utils.CfgPrinter):373:374 -> a
-    296:296:void print(com.android.tools.r8.utils.CfgPrinter):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":681,"2":682,"3":683}}
+    290:291:void print(com.android.tools.r8.utils.CfgPrinter):370:371 -> a
+    292:292:java.lang.String com.android.tools.r8.utils.CfgPrinter.makeUnusedValue():20:20 -> a
+    292:292:void print(com.android.tools.r8.utils.CfgPrinter):371 -> a
+    293:294:void print(com.android.tools.r8.utils.CfgPrinter):373:374 -> a
+    295:295:void print(com.android.tools.r8.utils.CfgPrinter):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":680,"2":681,"3":682}}
+    680:680:void print(com.android.tools.r8.utils.CfgPrinter):376:376 -> a
     681:681:void print(com.android.tools.r8.utils.CfgPrinter):376:376 -> a
     682:682:void print(com.android.tools.r8.utils.CfgPrinter):376:376 -> a
-    683:683:void print(com.android.tools.r8.utils.CfgPrinter):376:376 -> a
-    672:680:void print(com.android.tools.r8.utils.CfgPrinter):376:384 -> a
-    684:693:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):505:514 -> a
-    694:695:boolean com.android.tools.r8.ir.code.Instruction.identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):413:414 -> a
-    694:695:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):511 -> a
-    696:696:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):517:517 -> a
-    697:700:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):108:111 -> a
-    697:700:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):517 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    701:702:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):520:521 -> a
-    703:703:int com.android.tools.r8.ir.code.Instruction.getNumber():395:395 -> a
-    703:703:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):525 -> a
-    704:712:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):469:477 -> a
-    704:712:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
-    713:713:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552:552 -> a
+    671:679:void print(com.android.tools.r8.utils.CfgPrinter):376:384 -> a
+    683:692:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):505:514 -> a
+    693:694:boolean com.android.tools.r8.ir.code.Instruction.identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):413:414 -> a
+    693:694:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):511 -> a
+    695:695:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):517:517 -> a
+    696:699:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):108:111 -> a
+    696:699:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):517 -> a
+    700:701:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):520:521 -> a
+    702:702:int com.android.tools.r8.ir.code.Instruction.getNumber():395:395 -> a
+    702:702:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):525 -> a
+    703:711:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):469:477 -> a
+    703:711:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
+    712:712:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552:552 -> a
+    712:712:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):477 -> a
+    712:712:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
+    713:713:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
+    713:713:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552 -> a
     713:713:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):477 -> a
     713:713:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
-    714:714:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
-    714:714:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552 -> a
-    714:714:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):477 -> a
+    714:714:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):481:481 -> a
     714:714:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
-    715:715:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):481:481 -> a
-    715:715:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
-    716:722:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):556:562 -> a
-    716:722:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
-    716:722:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
-    723:723:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552:552 -> a
+    715:721:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):556:562 -> a
+    715:721:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
+    715:721:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
+    722:722:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552:552 -> a
+    722:722:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):562 -> a
+    722:722:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
+    722:722:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
+    723:723:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
+    723:723:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552 -> a
     723:723:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):562 -> a
     723:723:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
     723:723:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
-    724:724:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
-    724:724:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552 -> a
-    724:724:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):562 -> a
-    724:724:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
-    724:724:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
-    725:742:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):484:501 -> a
-    725:742:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
-    743:752:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):528:537 -> a
-    753:753:int com.android.tools.r8.ir.code.Instruction.getNumber():395:395 -> a
-    753:753:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
-    754:762:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):424:432 -> a
-    754:762:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
-    763:763:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552:552 -> a
+    724:741:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):484:501 -> a
+    724:741:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):524 -> a
+    742:751:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):528:537 -> a
+    752:752:int com.android.tools.r8.ir.code.Instruction.getNumber():395:395 -> a
+    752:752:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
+    753:761:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):424:432 -> a
+    753:761:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
+    762:762:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552:552 -> a
+    762:762:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):432 -> a
+    762:762:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
+    763:763:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
+    763:763:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552 -> a
     763:763:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):432 -> a
     763:763:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
-    764:764:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
-    764:764:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552 -> a
-    764:764:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):432 -> a
+    764:764:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):436:436 -> a
     764:764:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
-    765:765:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):436:436 -> a
-    765:765:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
-    766:772:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):556:562 -> a
-    766:772:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):436 -> a
-    766:772:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
-    773:773:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552:552 -> a
+    765:771:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):556:562 -> a
+    765:771:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):436 -> a
+    765:771:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
+    772:772:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552:552 -> a
+    772:772:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):562 -> a
+    772:772:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):436 -> a
+    772:772:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
+    773:773:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
+    773:773:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552 -> a
     773:773:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):562 -> a
     773:773:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):436 -> a
     773:773:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
-    774:774:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
-    774:774:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):552 -> a
-    774:774:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):562 -> a
-    774:774:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):436 -> a
-    774:774:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
-    775:795:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):439:459 -> a
-    775:795:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
-    796:812:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):448:464 -> a
-    796:812:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
-    813:814:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):544:545 -> a
-    815:815:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):618:618 -> a
-    816:818:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):634:636 -> a
-    819:820:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1446:1447 -> a
-    821:824:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1453:1456 -> a
-    825:826:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1461:1462 -> a
-    827:827:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2291,"2":2292,"3":2293}}
-    2291:2291:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1462:1462 -> a
-    2292:2292:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1462:1462 -> a
-    2293:2293:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1462:1462 -> a
-    2290:2290:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1463:1463 -> a
-    2294:2302:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1467:1475 -> a
-    2303:2303:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5261,"2":5262,"3":5263}}
-    5261:5261:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1475:1475 -> a
-    5262:5262:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    5262:5262:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1475 -> a
-    5263:5263:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    5263:5263:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1475 -> a
-    3778:3781:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1475:1478 -> a
-    3782:3782:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5264,"2":5265,"3":5266}}
-    5264:5264:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1478:1478 -> a
-    5265:5265:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    5265:5265:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1478 -> a
-    5266:5266:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    5266:5266:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1478 -> a
-    5260:5260:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1478:1478 -> a
-    5267:5269:boolean verifyValidPositionInfo(boolean):1530:1532 -> a
-    5270:5270:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    5270:5270:boolean verifyValidPositionInfo(boolean):1533 -> a
-    5271:5271:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    5271:5271:boolean verifyValidPositionInfo(boolean):1534 -> a
-    5272:5273:boolean verifyValidPositionInfo(boolean):1535:1536 -> a
-    5274:5274:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
-    5274:5274:boolean com.android.tools.r8.ir.code.Position.isSyntheticNone():137 -> a
-    5274:5274:boolean verifyValidPositionInfo(boolean):1536 -> a
-    5275:5275:boolean verifyValidPositionInfo(boolean):1532:1532 -> a
+    774:794:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):439:459 -> a
+    774:794:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
+    795:811:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):448:464 -> a
+    795:811:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):538 -> a
+    812:813:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):544:545 -> a
+    814:814:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):618:618 -> a
+    815:817:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):634:636 -> a
+    818:819:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1454:1455 -> a
+    820:823:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1461:1464 -> a
+    824:825:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1469:1470 -> a
+    826:826:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2298,"2":2299,"3":2300}}
+    2298:2298:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1470:1470 -> a
+    2299:2299:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1470:1470 -> a
+    2300:2300:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1470:1470 -> a
+    2297:2297:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1471:1471 -> a
+    2301:2309:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1475:1483 -> a
+    2310:2310:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5284,"2":5285,"3":5286}}
+    5284:5284:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1483:1483 -> a
+    5285:5285:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    5285:5285:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1483 -> a
+    5286:5286:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    5286:5286:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1483 -> a
+    3793:3796:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1483:1486 -> a
+    3797:3797:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5287,"2":5288,"3":5289}}
+    5287:5287:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1486:1486 -> a
+    5288:5288:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    5288:5288:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1486 -> a
+    5289:5289:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    5289:5289:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1486 -> a
+    5283:5283:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1486:1486 -> a
+    5290:5292:boolean verifyValidPositionInfo(boolean):1538:1540 -> a
+    5293:5293:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    5293:5293:boolean verifyValidPositionInfo(boolean):1541 -> a
+    5294:5294:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    5294:5294:boolean verifyValidPositionInfo(boolean):1542 -> a
+    5295:5296:boolean verifyValidPositionInfo(boolean):1543:1544 -> a
+    5297:5297:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
+    5297:5297:boolean com.android.tools.r8.ir.code.Position.isSyntheticNone():137 -> a
+    5297:5297:boolean verifyValidPositionInfo(boolean):1544 -> a
+    5298:5298:boolean verifyValidPositionInfo(boolean):1540:1540 -> a
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> a0
     1:1:java.util.List inValues():110:110 -> a1
     boolean isStaticFieldInstruction() -> a2
@@ -46369,34 +45892,35 @@
     6:7:com.android.tools.r8.ir.code.BasicBlock getBlock():306:307 -> g
     com.android.tools.r8.ir.code.Load asLoad() -> g0
     boolean isArgument() -> g1
-    int maxInValueRegister() -> g2
+    boolean isUnusedArgument() -> g2
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> h0
     boolean isArithmeticBinop() -> h1
-    int maxOutValueRegister() -> h2
+    int maxInValueRegister() -> h2
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():686:686 -> i
     com.android.tools.r8.ir.code.Monitor asMonitor() -> i0
     boolean isArrayAccess() -> i1
-    int opcode() -> i2
+    int maxOutValueRegister() -> i2
     com.android.tools.r8.ir.code.Instruction asInstruction() -> j
     com.android.tools.r8.ir.code.Move asMove() -> j0
     boolean isArrayGet() -> j1
-    1:1:com.android.tools.r8.ir.code.ValueType outType():214:214 -> j2
+    int opcode() -> j2
     com.android.tools.r8.ir.code.MoveException asMoveException() -> k0
     boolean isArrayPut() -> k1
-    boolean throwsOnNullInput() -> k2
+    1:1:com.android.tools.r8.ir.code.ValueType outType():214:214 -> k2
     com.android.tools.r8.ir.code.Add asAdd() -> l
     com.android.tools.r8.ir.code.Mul asMul() -> l0
     boolean isAssume() -> l1
+    boolean throwsOnNullInput() -> l2
     com.android.tools.r8.ir.code.And asAnd() -> m
     com.android.tools.r8.ir.code.Neg asNeg() -> m0
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> m1
-    1:1:boolean isAssumeWithDynamicTypeAssumption():768 -> m1
-    2:2:boolean isAssumeWithDynamicTypeAssumption():768:768 -> m1
+    1:1:boolean isAssumeWithDynamicTypeAssumption():776 -> m1
+    2:2:boolean isAssumeWithDynamicTypeAssumption():776:776 -> m1
     com.android.tools.r8.ir.code.Argument asArgument() -> n
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> n0
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> n1
-    1:1:boolean isAssumeWithNonNullAssumption():772 -> n1
-    2:2:boolean isAssumeWithNonNullAssumption():772:772 -> n1
+    1:1:boolean isAssumeWithNonNullAssumption():780 -> n1
+    2:2:boolean isAssumeWithNonNullAssumption():780:780 -> n1
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> o
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> o0
     boolean isBinop() -> o1
@@ -46419,29 +45943,29 @@
     com.android.tools.r8.ir.code.Binop asBinop() -> u
     com.android.tools.r8.ir.code.RecordFieldValues asRecordFieldValues() -> u0
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> u1
-    1:1:boolean isCreatingArray():1424 -> u1
-    2:2:boolean isCreatingArray():1425:1425 -> u1
+    1:1:boolean isCreatingArray():1432 -> u1
+    2:2:boolean isCreatingArray():1433:1433 -> u1
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> u1
-    3:3:boolean isCreatingArray():1426 -> u1
+    3:3:boolean isCreatingArray():1434 -> u1
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> u1
-    4:4:boolean isCreatingArray():1427 -> u1
+    4:4:boolean isCreatingArray():1435 -> u1
     5:5:boolean com.android.tools.r8.ir.code.Instruction.isRecordFieldValues():0:0 -> u1
-    5:5:boolean isCreatingArray():1428 -> u1
+    5:5:boolean isCreatingArray():1436 -> u1
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> v
     com.android.tools.r8.ir.code.Rem asRem() -> v0
-    1:1:boolean isCreatingInstanceOrArray():1432:1432 -> v1
+    1:1:boolean isCreatingInstanceOrArray():1440:1440 -> v1
     com.android.tools.r8.ir.code.Cmp asCmp() -> w
     com.android.tools.r8.ir.code.Return asReturn() -> w0
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> w1
-    1:1:boolean isDebugInstruction():1224 -> w1
+    1:1:boolean isDebugInstruction():1232 -> w1
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> w1
-    2:2:boolean isDebugInstruction():1225 -> w1
+    2:2:boolean isDebugInstruction():1233 -> w1
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> w1
-    3:3:boolean isDebugInstruction():1226 -> w1
+    3:3:boolean isDebugInstruction():1234 -> w1
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> w1
-    4:4:boolean isDebugInstruction():1227 -> w1
+    4:4:boolean isDebugInstruction():1235 -> w1
     5:5:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> w1
-    5:5:boolean isDebugInstruction():1228 -> w1
+    5:5:boolean isDebugInstruction():1236 -> w1
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> x
     com.android.tools.r8.ir.code.Shl asShl() -> x0
     boolean isDebugPosition() -> x1
@@ -46451,59 +45975,59 @@
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> z
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> z0
     boolean isFieldInstruction() -> z1
-com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.jq:
+com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.Lp:
     com.android.tools.r8.ir.code.Position position -> b
     com.android.tools.r8.ir.code.Value outValue -> a
-    1:1:void <init>():1624:1624 -> <init>
+    1:1:void <init>():1632:1632 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
-    1:2:com.android.tools.r8.ir.code.Instruction amend(com.android.tools.r8.ir.code.Instruction):1634:1635 -> a
-    3:4:com.android.tools.r8.ir.code.Instruction$BuilderBase setOutValue(com.android.tools.r8.ir.code.Value):1641:1642 -> a
-    5:5:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1650:1650 -> a
-    6:7:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setOutValue(com.android.tools.r8.ir.code.Value):1641:1642 -> a
-    6:7:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1650 -> a
-    8:9:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Position):1654:1655 -> a
-    1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1659:1659 -> b
-    2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1654:1655 -> b
-    2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1659 -> b
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.pq:
+    1:2:com.android.tools.r8.ir.code.Instruction amend(com.android.tools.r8.ir.code.Instruction):1642:1643 -> a
+    3:4:com.android.tools.r8.ir.code.Instruction$BuilderBase setOutValue(com.android.tools.r8.ir.code.Value):1649:1650 -> a
+    5:5:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1658:1658 -> a
+    6:7:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setOutValue(com.android.tools.r8.ir.code.Value):1649:1650 -> a
+    6:7:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1658 -> a
+    8:9:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Position):1662:1663 -> a
+    1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1667:1667 -> b
+    2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1662:1663 -> b
+    2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1667 -> b
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.Rp:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption NONE -> a
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption CLASS_ALREADY_INITIALIZED -> b
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption IGNORE_RECEIVER_FIELD_ASSIGNMENTS -> c
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption INVOKED_METHOD_DOES_NOT_HAVE_SIDE_EFFECTS -> d
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption RECEIVER_NOT_NULL -> e
-    1:30:void <clinit>():1546:1575 -> <clinit>
-    1:1:void <init>():1544:1544 -> <init>
+    1:30:void <clinit>():1554:1583 -> <clinit>
+    1:1:void <init>():1552:1552 -> <init>
     boolean canAssumeClassIsAlreadyInitialized() -> a
     boolean canAssumeInvokedMethodDoesNotHaveSideEffects() -> b
     boolean canAssumeReceiverIsNotNull() -> c
-    1:1:com.android.tools.r8.ir.code.Instruction$SideEffectAssumption join(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1601:1601 -> d
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.kq:
-    1:1:void <init>():1549:1549 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.lq:
-    1:1:void <init>():1558:1558 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.mq:
-    1:1:void <init>():1567:1567 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.nq:
-    1:1:void <init>():1576:1576 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$5 -> com.android.tools.r8.internal.oq:
+    1:1:com.android.tools.r8.ir.code.Instruction$SideEffectAssumption join(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1609:1609 -> d
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.Mp:
+    1:1:void <init>():1557:1557 -> <init>
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.Np:
+    1:1:void <init>():1566:1566 -> <init>
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.Op:
+    1:1:void <init>():1575:1575 -> <init>
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.Pp:
+    1:1:void <init>():1584:1584 -> <init>
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$5 -> com.android.tools.r8.internal.Qp:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption val$other -> f
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption this$0 -> g
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1601:1601 -> <init>
-    1:2:boolean canAssumeClassIsAlreadyInitialized():1605:1606 -> a
-    1:2:boolean canAssumeInvokedMethodDoesNotHaveSideEffects():1611:1612 -> b
-    1:2:boolean canAssumeReceiverIsNotNull():1617:1618 -> c
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.sq:
+    1:1610:void <init>(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):0:1609 -> <init>
+    1:2:boolean canAssumeClassIsAlreadyInitialized():1613:1614 -> a
+    1:2:boolean canAssumeInvokedMethodDoesNotHaveSideEffects():1619:1620 -> b
+    1:2:boolean canAssumeReceiverIsNotNull():1625:1626 -> c
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.Up:
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> e
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> f
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.tq:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.Vp:
     void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions) -> a
     com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass) -> a
     com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
     com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString) -> a
     com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position) -> a
+    boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer) -> a
     void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set) -> a
-    boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType) -> a
     boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
     void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo) -> a
     void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int) -> a
@@ -46514,27 +46038,29 @@
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean) -> a
     com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions) -> a
-    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
-    2:2:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):90:90 -> a
-    3:3:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):94:94 -> a
-    4:4:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):133:133 -> a
-    5:5:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):132:132 -> a
-    6:6:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):187:187 -> a
-    7:7:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):191:191 -> a
-    8:10:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode):269:271 -> a
+    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    2:2:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):92:92 -> a
+    3:3:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):96:96 -> a
+    4:4:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):117:117 -> a
+    5:5:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):116:116 -> a
+    6:6:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):144:144 -> a
+    7:7:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):143:143 -> a
+    8:8:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):198:198 -> a
+    9:9:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):202:202 -> a
+    10:12:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode):280:282 -> a
     void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString) -> b
-    1:1:void replaceCurrentInstructionWithConstFalse(com.android.tools.r8.ir.code.IRCode):119:119 -> b
-    2:2:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):221:221 -> b
-    1:1:void replaceCurrentInstructionWithConstTrue(com.android.tools.r8.ir.code.IRCode):127:127 -> c
+    1:1:void replaceCurrentInstructionWithConstFalse(com.android.tools.r8.ir.code.IRCode):130:130 -> b
+    2:2:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):232:232 -> b
+    1:1:void replaceCurrentInstructionWithConstTrue(com.android.tools.r8.ir.code.IRCode):138:138 -> c
     void unsetInsertionPosition() -> h
     void removeOrReplaceByDebugLocalRead() -> i
-    1:1:void removeInstructionIgnoreOutValue():68:68 -> k
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.uq:
+    1:1:void removeInstructionIgnoreOutValue():70:70 -> k
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.Wp:
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> g
     boolean isPhi() -> h
     com.android.tools.r8.ir.code.Instruction asInstruction() -> j
     com.android.tools.r8.ir.code.Phi asPhi() -> k
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.Lt:
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.gt:
     boolean $assertionsDisabled -> n
     int[] keys -> m
     1:1:void <clinit>():28:28 -> <clinit>
@@ -46542,158 +46068,158 @@
     boolean isIntSwitch() -> H1
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> S
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:1:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):49:49 -> a
-    2:2:int com.android.tools.r8.ir.code.IntSwitch.getKey(int):212:212 -> a
-    2:2:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):50 -> a
-    3:3:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):50:50 -> a
-    4:4:long numberOfTargetsIfPacked(int[]):74:74 -> a
-    5:5:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):85:85 -> a
-    6:6:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
-    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):90 -> a
-    7:7:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
-    7:7:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149 -> a
-    7:7:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):90 -> a
-    8:8:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> a
-    8:8:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):90 -> a
-    9:9:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
-    9:9:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):92 -> a
-    10:10:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> a
-    10:10:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):93 -> a
-    11:11:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
-    11:11:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142 -> a
-    11:11:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):93 -> a
-    12:14:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:144 -> a
-    12:14:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):93 -> a
-    15:15:int com.android.tools.r8.ir.code.IntSwitch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):109:109 -> a
-    15:15:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):94 -> a
-    16:16:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):99:99 -> a
-    17:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):203:204 -> a
-    19:19:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165:165 -> a
-    19:19:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    19:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
-    20:20:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
-    20:20:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165 -> a
-    20:20:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    20:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
-    21:21:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170:170 -> a
-    21:21:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    21:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
-    22:22:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> a
-    22:22:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
-    22:22:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    22:22:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
-    23:23:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
-    23:23:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142 -> a
-    23:23:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
-    23:23:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    23:23:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
-    24:26:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:144 -> a
-    24:26:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
-    24:26:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    24:26:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
-    27:27:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175:175 -> a
-    27:27:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    27:27:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
-    28:28:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
-    28:28:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
-    28:28:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    28:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
-    29:29:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
-    29:29:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149 -> a
-    29:29:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
-    29:29:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    29:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
-    30:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):205:207 -> a
-    33:34:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):228:229 -> a
-    35:35:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165:165 -> a
-    35:35:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    35:35:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
-    36:36:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
-    36:36:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165 -> a
-    36:36:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    36:36:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
-    37:37:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170:170 -> a
-    37:37:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    37:37:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
-    38:38:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
-    38:38:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142 -> a
-    38:38:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
-    38:38:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    38:38:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
-    39:41:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:144 -> a
-    39:41:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
-    39:41:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    39:41:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
-    42:42:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175:175 -> a
-    42:42:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    42:42:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
-    43:43:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
-    43:43:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
-    43:43:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    43:43:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
-    44:44:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
-    44:44:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149 -> a
-    44:44:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
-    44:44:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    44:44:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
-    45:68:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):231:254 -> a
-    69:72:void print(com.android.tools.r8.utils.CfgPrinter):284:287 -> a
-    73:73:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):293:293 -> a
-    74:77:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):298:301 -> a
-    78:78:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165:165 -> a
-    78:78:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    78:78:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
-    79:79:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]) -> a
-    79:79:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165 -> a
-    79:79:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    79:79:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
-    80:80:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170:170 -> a
-    80:80:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    80:80:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
-    81:81:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> a
-    81:81:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
-    81:81:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    81:81:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
-    82:82:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
-    82:82:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142 -> a
-    82:82:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
-    82:82:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    82:82:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
-    83:85:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:144 -> a
-    83:85:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
-    83:85:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    83:85:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
-    86:86:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175:175 -> a
-    86:86:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    86:86:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
-    87:87:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
-    87:87:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
-    87:87:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    87:87:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
-    88:88:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
-    88:88:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149 -> a
-    88:88:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
-    88:88:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    88:88:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
-    89:106:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):302:319 -> a
+    1:230:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):0:229 -> a
+    231:231:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165:165 -> a
+    231:231:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    231:231:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
+    232:232:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
+    232:232:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165 -> a
+    232:232:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    232:232:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
+    233:233:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170:170 -> a
+    233:233:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    233:233:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
+    234:234:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
+    234:234:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142 -> a
+    234:234:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
+    234:234:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    234:234:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
+    235:237:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:144 -> a
+    235:237:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
+    235:237:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    235:237:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
+    238:238:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175:175 -> a
+    238:238:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    238:238:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
+    239:239:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
+    239:239:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
+    239:239:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    239:239:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
+    240:240:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
+    240:240:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149 -> a
+    240:240:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
+    240:240:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    240:240:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):230 -> a
+    241:264:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):231:254 -> a
+    265:265:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):49:49 -> a
+    266:266:int com.android.tools.r8.ir.code.IntSwitch.getKey(int):212:212 -> a
+    266:266:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):50 -> a
+    267:267:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):50:50 -> a
+    268:268:long numberOfTargetsIfPacked(int[]):74:74 -> a
+    269:269:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):85:85 -> a
+    270:270:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
+    270:270:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):90 -> a
+    271:271:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
+    271:271:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149 -> a
+    271:271:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):90 -> a
+    272:272:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> a
+    272:272:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):90 -> a
+    273:273:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
+    273:273:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):92 -> a
+    274:274:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> a
+    274:274:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):93 -> a
+    275:275:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
+    275:275:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142 -> a
+    275:275:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):93 -> a
+    276:278:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:144 -> a
+    276:278:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):93 -> a
+    279:279:int com.android.tools.r8.ir.code.IntSwitch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):109:109 -> a
+    279:279:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):94 -> a
+    280:280:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):99:99 -> a
+    281:282:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):203:204 -> a
+    283:283:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165:165 -> a
+    283:283:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    283:283:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
+    284:284:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
+    284:284:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165 -> a
+    284:284:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    284:284:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
+    285:285:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170:170 -> a
+    285:285:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    285:285:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
+    286:286:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> a
+    286:286:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
+    286:286:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    286:286:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
+    287:287:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
+    287:287:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142 -> a
+    287:287:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
+    287:287:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    287:287:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
+    288:290:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:144 -> a
+    288:290:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
+    288:290:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    288:290:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
+    291:291:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175:175 -> a
+    291:291:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    291:291:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
+    292:292:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
+    292:292:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
+    292:292:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    292:292:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
+    293:293:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
+    293:293:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149 -> a
+    293:293:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
+    293:293:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    293:293:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204 -> a
+    294:296:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):205:207 -> a
+    297:300:void print(com.android.tools.r8.utils.CfgPrinter):284:287 -> a
+    301:301:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):293:293 -> a
+    302:305:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):298:301 -> a
+    306:306:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165:165 -> a
+    306:306:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    306:306:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
+    307:307:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
+    307:307:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode):165 -> a
+    307:307:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    307:307:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
+    308:308:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170:170 -> a
+    308:308:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    308:308:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
+    309:309:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> a
+    309:309:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
+    309:309:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    309:309:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
+    310:310:boolean com.android.tools.r8.ir.code.IntSwitch.canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
+    310:310:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142 -> a
+    310:310:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
+    310:310:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    310:310:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
+    311:313:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:144 -> a
+    311:313:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170 -> a
+    311:313:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    311:313:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
+    314:314:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175:175 -> a
+    314:314:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    314:314:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
+    315:315:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
+    315:315:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
+    315:315:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    315:315:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
+    316:316:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
+    316:316:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149 -> a
+    316:316:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
+    316:316:boolean com.android.tools.r8.ir.code.IntSwitch.emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    316:316:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):301 -> a
+    317:334:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):302:319 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
     1:2:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):130:131 -> b
     1:1:int getKey(int):212:212 -> f
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:7:boolean valid():61:67 -> p2
-    1:1:int getFirstKey():183:183 -> q2
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():220:221 -> r2
-    3:3:int com.android.tools.r8.ir.code.IntSwitch.getKey(int):212:212 -> r2
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222 -> r2
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222:222 -> r2
-    1:1:int[] getKeys():216:216 -> s2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:7:boolean valid():61:67 -> q2
+    1:1:int getFirstKey():183:183 -> r2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():220:221 -> s2
+    3:3:int com.android.tools.r8.ir.code.IntSwitch.getKey(int):212:212 -> s2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222 -> s2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222:222 -> s2
+    1:1:int[] getKeys():216:216 -> t2
     1:4:java.lang.String toString():270:273 -> toString
     5:5:int com.android.tools.r8.ir.code.IntSwitch.getKey(int):212:212 -> toString
     5:5:java.lang.String toString():274 -> toString
     6:11:java.lang.String toString():274:279 -> toString
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.Cu:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.Wt:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):224:224 -> <init>
@@ -46717,30 +46243,29 @@
     42:42:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):314:314 -> a
     43:43:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> a
     43:43:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):316 -> a
-    44:53:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):316:325 -> a
-    54:54:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> a
-    54:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):326 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    55:57:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):327:329 -> a
-    58:58:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> a
-    58:58:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):329 -> a
-    59:59:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):329:329 -> a
-    60:60:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> a
-    60:60:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):330 -> a
-    61:62:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):331:332 -> a
-    63:76:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):351:364 -> a
-    77:77:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):362:362 -> a
-    78:78:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":445,"2":446,"3":447}}
-    445:445:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):362:362 -> a
+    44:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):316:326 -> a
+    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> a
+    55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):326 -> a
+    56:58:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):327:329 -> a
+    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> a
+    59:59:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):329 -> a
+    60:60:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):329:329 -> a
+    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> a
+    61:61:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):330 -> a
+    62:63:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):331:332 -> a
+    64:77:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):351:364 -> a
+    78:78:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):362:362 -> a
+    79:79:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":446,"2":447,"3":448}}
     446:446:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):362:362 -> a
     447:447:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):362:362 -> a
-    440:444:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):362:366 -> a
-    448:464:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):372:388 -> a
-    465:471:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):386:392 -> a
-    472:476:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):473:477 -> a
-    477:477:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):475:475 -> a
-    478:478:boolean outTypeKnownToBeBoolean(java.util.Set):482:482 -> a
+    448:448:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):362:362 -> a
+    441:445:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):362:366 -> a
+    449:465:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):372:388 -> a
+    466:472:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):386:392 -> a
+    473:477:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView) -> a
+    478:478:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):475:475 -> a
+    479:479:boolean outTypeKnownToBeBoolean(java.util.Set):482:482 -> a
     1:1:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):301:301 -> b
     2:2:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> b
     2:2:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):302 -> b
@@ -46753,23 +46278,21 @@
     2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):339:340 -> c
     4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> c
     4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):340 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> c
     5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):341 -> c
     6:6:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):341:341 -> c
     7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> c
     7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):342 -> c
-    8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):342:343 -> c
-    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> c
-    10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):344 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:com.android.tools.r8.ir.code.Value getArgument(int):275:275 -> c
-    12:12:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> c
-    12:12:com.android.tools.r8.ir.code.Value getArgument(int):275 -> c
-    13:13:com.android.tools.r8.ir.code.Value getArgument(int):275:275 -> c
-    14:14:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> c
-    14:14:com.android.tools.r8.ir.code.Value getArgument(int):276 -> c
-    15:15:com.android.tools.r8.ir.code.Value getArgument(int):276:276 -> c
+    8:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):342:344 -> c
+    11:11:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> c
+    11:11:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):344 -> c
+    12:12:com.android.tools.r8.ir.code.Value getArgument(int):275:275 -> c
+    13:13:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> c
+    13:13:com.android.tools.r8.ir.code.Value getArgument(int):275 -> c
+    14:14:com.android.tools.r8.ir.code.Value getArgument(int):275:275 -> c
+    15:15:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> c
+    15:15:com.android.tools.r8.ir.code.Value getArgument(int):276 -> c
+    16:16:com.android.tools.r8.ir.code.Value getArgument(int):276:276 -> c
     1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):429:429 -> d
     2:2:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> d
     2:2:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):436 -> d
@@ -46799,48 +46322,47 @@
     15:15:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):444 -> d
     16:17:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):444:445 -> d
     boolean instructionTypeCanThrow() -> d1
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> g2
-    1:1:int maxInValueRegister():402 -> g2
-    2:3:int maxInValueRegister():402:403 -> g2
-    4:4:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> g2
-    4:4:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():411 -> g2
-    4:4:int maxInValueRegister():404 -> g2
-    5:5:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():411:411 -> g2
-    5:5:int maxInValueRegister():404 -> g2
-    6:6:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> g2
-    6:6:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():414 -> g2
-    6:6:int maxInValueRegister():404 -> g2
-    7:8:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():414:415 -> g2
-    7:8:int maxInValueRegister():404 -> g2
-    9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> g2
-    9:9:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():418 -> g2
-    9:9:int maxInValueRegister():404 -> g2
-    10:10:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():418:418 -> g2
-    10:10:int maxInValueRegister():404 -> g2
-    11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> g2
-    11:11:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():419 -> g2
-    11:11:int maxInValueRegister():404 -> g2
-    12:13:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():419:420 -> g2
-    12:13:int maxInValueRegister():404 -> g2
-    int maxOutValueRegister() -> h2
-    1:1:java.util.List arguments():271:271 -> l2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> m2
-    1:1:com.android.tools.r8.ir.code.Value getLastArgument():289 -> m2
-    2:2:com.android.tools.r8.ir.code.Value getLastArgument():289:289 -> m2
-    com.android.tools.r8.graph.DexType getReturnType() -> n2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> o2
-    java.lang.String getTypeString() -> p2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> q2
-    1:1:boolean hasArguments():263 -> q2
-    2:2:boolean hasArguments():263:263 -> q2
-    1:1:int requiredArgumentRegisters():294:294 -> r2
-    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> r2
-    2:2:int requiredArgumentRegisters():295 -> r2
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.Bu:
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> h2
+    1:1:int maxInValueRegister():402 -> h2
+    2:3:int maxInValueRegister():402:403 -> h2
+    4:4:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> h2
+    4:4:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():411 -> h2
+    4:4:int maxInValueRegister():404 -> h2
+    5:5:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():411:411 -> h2
+    5:5:int maxInValueRegister():404 -> h2
+    6:6:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> h2
+    6:6:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():414 -> h2
+    6:6:int maxInValueRegister():404 -> h2
+    7:8:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():414:415 -> h2
+    7:8:int maxInValueRegister():404 -> h2
+    9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> h2
+    9:9:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():418 -> h2
+    9:9:int maxInValueRegister():404 -> h2
+    10:10:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():418:418 -> h2
+    10:10:int maxInValueRegister():404 -> h2
+    11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> h2
+    11:11:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():419 -> h2
+    11:11:int maxInValueRegister():404 -> h2
+    12:13:boolean com.android.tools.r8.ir.code.Invoke.argumentsAreConsecutiveInputArguments():419:420 -> h2
+    12:13:int maxInValueRegister():404 -> h2
+    int maxOutValueRegister() -> i2
+    1:1:java.util.List arguments():271:271 -> m2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> n2
+    1:1:com.android.tools.r8.ir.code.Value getLastArgument():289 -> n2
+    2:2:com.android.tools.r8.ir.code.Value getLastArgument():289:289 -> n2
+    com.android.tools.r8.graph.DexType getReturnType() -> o2
+    com.android.tools.r8.ir.code.Invoke$Type getType() -> p2
+    java.lang.String getTypeString() -> q2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> r2
+    1:1:boolean hasArguments():263 -> r2
+    2:2:boolean hasArguments():263:263 -> r2
+    1:2:int requiredArgumentRegisters():294:295 -> s2
+    3:3:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> s2
+    3:3:int requiredArgumentRegisters():295 -> s2
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.Vt:
     com.android.tools.r8.ir.code.Invoke$Type STATIC -> f
+    boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Invoke$Type SUPER -> g
-    boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.code.Invoke$Type VIRTUAL -> h
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> i
     com.android.tools.r8.ir.code.Invoke$Type DIRECT -> d
@@ -46848,19 +46370,18 @@
     int dexOpcode -> b
     com.android.tools.r8.ir.code.Invoke$Type MULTI_NEW_ARRAY -> j
     int dexOpcodeRange -> c
-    com.android.tools.r8.ir.code.Invoke$Type CUSTOM -> k
-    com.android.tools.r8.ir.code.Invoke$Type POLYMORPHIC -> l
-    com.android.tools.r8.ir.code.Invoke$Type[] $VALUES -> m
+    com.android.tools.r8.ir.code.Invoke$Type POLYMORPHIC -> k
+    com.android.tools.r8.ir.code.Invoke$Type[] $VALUES -> l
     1:11:void <clinit>():41:41 -> <clinit>
     1:3:void <init>(java.lang.String,int,int,int):55:57 -> <init>
     1:13:com.android.tools.r8.ir.code.Invoke$Type fromInvokeSpecial(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):97:109 -> a
-    14:14:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    14:14:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     14:14:com.android.tools.r8.ir.code.Invoke$Type fromInvokeSpecial(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):109 -> a
     15:48:com.android.tools.r8.ir.code.Invoke$Type fromInvokeSpecial(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):110:143 -> a
     49:50:int getDexOpcode():171:172 -> a
     1:2:int getDexOpcodeRange():176:177 -> b
     1:1:boolean isVirtual():197:197 -> c
-com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.Du:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.Xt:
     com.android.tools.r8.graph.DexCallSite callSite -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():26:26 -> <clinit>
@@ -46898,18 +46419,17 @@
     77:80:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):183:186 -> a
     81:81:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeCustom):184:184 -> a
     81:81:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):155:155 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):155 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):155:155 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    int opcode() -> i2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():102:102 -> n2
-    1:1:java.lang.String getTypeString():116:116 -> p2
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():106:106 -> s2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():102:102 -> o2
+    1:1:java.lang.String getTypeString():116:116 -> q2
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():106:106 -> t2
     1:1:java.lang.String toString():121:121 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.Gu:
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.au:
     boolean isInterface -> m
     boolean $assertionsDisabled -> n
     int $r8$clinit -> o
@@ -46929,17 +46449,16 @@
     37:50:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180:193 -> a
     51:51:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):189:189 -> a
     51:51:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):65 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):116:116 -> b
     1:5:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):198:202 -> f
     6:6:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> f
     6:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):206 -> f
     7:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):208:215 -> f
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():70:70 -> o2
-    1:1:java.lang.String getTypeString():75:75 -> p2
-    1:1:boolean getInterfaceBit():60:60 -> s2
-com.android.tools.r8.ir.code.InvokeDirect$Builder -> com.android.tools.r8.internal.Fu:
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():70:70 -> p2
+    1:1:java.lang.String getTypeString():75:75 -> q2
+    1:1:boolean getInterfaceBit():60:60 -> t2
+com.android.tools.r8.ir.code.InvokeDirect$Builder -> com.android.tools.r8.internal.Zt:
     1:1:void <init>():218:218 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:3:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):287:289 -> a
@@ -46952,7 +46471,7 @@
     2:2:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> b
     2:2:com.android.tools.r8.ir.code.InvokeDirect build():222 -> b
     3:3:com.android.tools.r8.ir.code.InvokeDirect build():222:222 -> b
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.Ju:
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.du:
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
@@ -46966,16 +46485,15 @@
     46:46:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):141:141 -> a
     47:47:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):194:194 -> a
     47:47:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> o2
-    1:1:java.lang.String getTypeString():57:57 -> p2
-    boolean getInterfaceBit() -> s2
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.Lu:
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> p2
+    1:1:java.lang.String getTypeString():57:57 -> q2
+    boolean getInterfaceBit() -> t2
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.fu:
     com.android.tools.r8.graph.DexMethod method -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():42:42 -> <clinit>
@@ -47004,7 +46522,6 @@
     37:38:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):202:203 -> a
     39:39:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> a
     39:39:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):203 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:40:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):203:203 -> a
     41:49:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):214:222 -> a
     50:50:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):233:233 -> a
@@ -47015,9 +46532,9 @@
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):243:243 -> f
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):125:125 -> g
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> g
-    2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1264 -> g
+    2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1272 -> g
     2:2:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):128 -> g
-    3:3:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1264:1264 -> g
+    3:3:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1272:1272 -> g
     3:3:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):128 -> g
     4:4:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:119 -> g
     4:4:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):129 -> g
@@ -47037,17 +46554,17 @@
     36:44:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):156:164 -> g
     45:52:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):163:170 -> g
     com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> h
-    1:1:com.android.tools.r8.graph.DexType getReturnType():86:86 -> n2
-    boolean getInterfaceBit() -> s2
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():90:90 -> t2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():86:86 -> o2
+    boolean getInterfaceBit() -> t2
     1:1:java.lang.String toString():100:100 -> toString
-com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.Ku:
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():90:90 -> u2
+com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.eu:
     java.util.List arguments -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod method -> c
     1:1:void <clinit>():280:280 -> <clinit>
     1:5:void <init>():280:284 -> <init>
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.Mu:
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.gu:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:33 -> <init>
@@ -47088,12 +46605,12 @@
     5:5:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.code.Value.getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1154:1154 -> h
     5:5:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):85 -> h
     6:6:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):87:87 -> h
-    boolean throwsOnNullInput() -> k2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> u2
-    1:1:java.lang.Iterable getNonReceiverArguments():37 -> u2
-    2:2:java.lang.Iterable getNonReceiverArguments():37:37 -> u2
-    1:2:com.android.tools.r8.ir.code.Value getReceiver():63:64 -> v2
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.Nu:
+    boolean throwsOnNullInput() -> l2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> v2
+    1:1:java.lang.Iterable getNonReceiverArguments():37 -> v2
+    2:2:java.lang.Iterable getNonReceiverArguments():37:37 -> v2
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():63:64 -> w2
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.hu:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():25:25 -> <clinit>
@@ -47112,7 +46629,6 @@
     10:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):180:185 -> a
     16:16:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeMultiNewArray):199:199 -> a
     16:16:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75 -> b
@@ -47122,15 +46638,15 @@
     29:29:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):146 -> b
     30:40:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):147:157 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    int opcode() -> i2
-    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.InvokeMultiNewArray.getArrayType():60:60 -> n2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> n2
-    1:1:java.lang.String getTypeString():70:70 -> p2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> s2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> t2
-    1:1:boolean instructionInstanceCanThrowNegativeArraySizeException():162 -> t2
-    2:8:boolean instructionInstanceCanThrowNegativeArraySizeException():162:168 -> t2
-com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.Ou:
+    int opcode() -> j2
+    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.InvokeMultiNewArray.getArrayType():60:60 -> o2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> o2
+    1:1:java.lang.String getTypeString():70:70 -> q2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> t2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> u2
+    1:1:boolean instructionInstanceCanThrowNegativeArraySizeException():162 -> u2
+    2:8:boolean instructionInstanceCanThrowNegativeArraySizeException():162:168 -> u2
+com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.iu:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():28:28 -> <clinit>
@@ -47147,7 +46663,6 @@
     24:24:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):133 -> a
     25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeNewArray):204:204 -> a
     25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     26:31:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):207:212 -> a
     32:32:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):613:613 -> a
     32:32:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):148 -> a
@@ -47163,13 +46678,13 @@
     29:29:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):187 -> b
     30:36:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):188:194 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    int opcode() -> i2
-    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.InvokeNewArray.getArrayType():53:53 -> n2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():49 -> n2
-    1:1:java.lang.String getTypeString():63:63 -> p2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():53:53 -> s2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.InvokeNewArray.getArrayType():53:53 -> o2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():49 -> o2
+    1:1:java.lang.String getTypeString():63:63 -> q2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():53:53 -> t2
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.Pu:
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.ju:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexProto proto -> l
     1:1:void <clinit>():29:29 -> <clinit>
@@ -47197,7 +46712,6 @@
     195:195:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):157:157 -> a
     199:199:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):209:209 -> a
     199:199:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):50 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):112:112 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):112 -> b
@@ -47205,13 +46719,13 @@
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> b0
     com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> g
     com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> h
-    int opcode() -> i2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():55:55 -> n2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():60:60 -> o2
-    1:1:java.lang.String getTypeString():65:65 -> p2
-    boolean getInterfaceBit() -> s2
-    1:1:com.android.tools.r8.graph.DexProto getProto():69:69 -> u2
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.Uu:
+    int opcode() -> j2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():55:55 -> o2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():60:60 -> p2
+    1:1:java.lang.String getTypeString():65:65 -> q2
+    boolean getInterfaceBit() -> t2
+    1:1:com.android.tools.r8.graph.DexProto getProto():69:69 -> v2
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.ou:
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
     boolean isInterface -> l
@@ -47241,7 +46755,6 @@
     72:82:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):223:233 -> a
     83:83:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):214:214 -> a
     83:83:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):62 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):101:101 -> b
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> c0
     1:7:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):116:122 -> h
@@ -47253,11 +46766,11 @@
     11:11:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> h
     11:11:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127 -> h
     12:20:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127:135 -> h
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> o2
-    1:1:java.lang.String getTypeString():72:72 -> p2
-    1:1:boolean getInterfaceBit():52:52 -> s2
-com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.Tu:
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> p2
+    1:1:java.lang.String getTypeString():72:72 -> q2
+    1:1:boolean getInterfaceBit():52:52 -> t2
+com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.nu:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():236:236 -> <clinit>
     1:1:void <init>():236:236 -> <init>
@@ -47268,7 +46781,7 @@
     4:5:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):293:294 -> a
     4:5:com.android.tools.r8.ir.code.InvokeMethod$Builder setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-    6:6:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1646:1646 -> a
+    6:6:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
     6:6:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):293 -> a
     6:6:com.android.tools.r8.ir.code.InvokeMethod$Builder setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -47279,7 +46792,7 @@
     8:9:com.android.tools.r8.ir.code.InvokeMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:5:com.android.tools.r8.ir.code.InvokeStatic build():240:244 -> b
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.Vu:
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.pu:
     boolean isInterface -> m
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():26:26 -> <clinit>
@@ -47293,17 +46806,16 @@
     30:30:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):134:134 -> a
     31:31:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeSuper):219:219 -> a
     31:31:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> d0
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> o2
-    1:1:java.lang.String getTypeString():57:57 -> p2
-    1:1:boolean getInterfaceBit():37:37 -> s2
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.Yu:
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> p2
+    1:1:java.lang.String getTypeString():57:57 -> q2
+    1:1:boolean getInterfaceBit():37:37 -> t2
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.su:
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
     1:1:void <clinit>():30:30 -> <clinit>
@@ -47325,14 +46837,13 @@
     59:59:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):170:170 -> a
     60:60:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):224:224 -> a
     60:60:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> b
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> e0
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():57:57 -> o2
-    1:1:java.lang.String getTypeString():62:62 -> p2
-    boolean getInterfaceBit() -> s2
-com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.Xu:
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():57:57 -> p2
+    1:1:java.lang.String getTypeString():62:62 -> q2
+    boolean getInterfaceBit() -> t2
+com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.ru:
     1:1:void <init>():174:174 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:3:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):287:289 -> a
@@ -47342,7 +46853,7 @@
     4:5:com.android.tools.r8.ir.code.InvokeMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:com.android.tools.r8.ir.code.InvokeVirtual build():178:178 -> b
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.gw:
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.zv:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -47356,67 +46867,67 @@
     1:1:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):32:32 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> f0
-    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> l2
-com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.nB:
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> m2
+com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.wA:
     com.android.tools.r8.ir.code.IRCode code -> b
     1:2:void <init>(com.android.tools.r8.ir.code.IRCode):13:14 -> <init>
     1:1:java.lang.Object get():9:9 -> b
     1:1:com.android.tools.r8.ir.code.DominatorTree get():19:19 -> d
     1:1:com.android.tools.r8.ir.code.DominatorTree lambda$get$0():19:19 -> e
-com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.iC:
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.sB:
     java.util.Set seenBlocks -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.IRCode code -> b
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> d
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> c
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):31:31 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):34:34 -> <init>
-    3:18:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):28:43 -> <init>
-    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):57:57 -> a
-    2:2:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):63:63 -> a
-    3:3:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):68:68 -> a
-    4:4:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):78:78 -> a
-    5:5:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):85:85 -> a
-    6:6:boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):91:91 -> a
-    7:7:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):97:97 -> a
-    8:8:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):102:102 -> a
-    9:9:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):114:114 -> a
-    10:10:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):126:126 -> a
-    11:11:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):137:137 -> a
-    12:12:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):144:144 -> a
-    13:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):149:149 -> a
-    14:14:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):155:155 -> a
-    15:15:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):166:166 -> a
-    16:16:void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):181:181 -> a
-    17:20:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):191:194 -> a
-    21:31:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):227:237 -> a
-    1:1:void add(java.lang.Object):22:22 -> add
-    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):172:172 -> add
-    2:2:void add(java.lang.Object):22 -> add
-    1:1:boolean hasVisitedBlock(com.android.tools.r8.ir.code.BasicBlock):48:48 -> b
-    2:2:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):108:108 -> b
-    1:1:boolean hasNext():199:199 -> hasNext
-    1:4:boolean hasPrevious():242:245 -> hasPrevious
-    1:1:void removeOrReplaceByDebugLocalRead():187:187 -> i
-    1:1:java.util.Set getSeenBlocks():52:52 -> l
-    1:9:com.android.tools.r8.ir.code.Instruction next():204:212 -> m
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):32:32 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):35:35 -> <init>
+    3:18:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):29:44 -> <init>
+    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):58:58 -> a
+    2:2:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):64:64 -> a
+    3:3:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):69:69 -> a
+    4:4:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):79:79 -> a
+    5:5:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):86:86 -> a
+    6:6:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):95:95 -> a
+    7:7:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):102:102 -> a
+    8:8:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):107:107 -> a
+    9:9:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):119:119 -> a
+    10:10:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):131:131 -> a
+    11:11:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):142:142 -> a
+    12:12:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):149:149 -> a
+    13:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):154:154 -> a
+    14:14:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):160:160 -> a
+    15:15:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):171:171 -> a
+    16:16:void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):186:186 -> a
+    17:20:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):196:199 -> a
+    21:31:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):232:242 -> a
+    1:1:void add(java.lang.Object):23:23 -> add
+    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):177:177 -> add
+    2:2:void add(java.lang.Object):23 -> add
+    1:1:boolean hasVisitedBlock(com.android.tools.r8.ir.code.BasicBlock):49:49 -> b
+    2:2:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):113:113 -> b
+    1:1:boolean hasNext():204:204 -> hasNext
+    1:4:boolean hasPrevious():247:250 -> hasPrevious
+    1:1:void removeOrReplaceByDebugLocalRead():192:192 -> i
+    1:1:java.util.Set getSeenBlocks():53:53 -> l
+    1:9:com.android.tools.r8.ir.code.Instruction next():209:217 -> m
     10:10:com.android.tools.r8.ir.code.Instruction next():0:0 -> m
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":234,"2":235,"3":236}}
-    234:234:com.android.tools.r8.ir.code.Instruction next():213:213 -> m
-    235:235:com.android.tools.r8.ir.code.Instruction next():213:213 -> m
-    236:236:com.android.tools.r8.ir.code.Instruction next():213:213 -> m
-    224:233:com.android.tools.r8.ir.code.Instruction next():214:223 -> m
-    1:1:java.lang.Object next():22:22 -> next
-    1:1:int nextIndex():268:268 -> nextIndex
-    1:1:java.lang.Object previous():22:22 -> previous
-    2:15:com.android.tools.r8.ir.code.Instruction previous():250:263 -> previous
-    1:1:int previousIndex():273:273 -> previousIndex
-    1:1:void remove():278:278 -> remove
-    1:1:void set(java.lang.Object):22:22 -> set
-    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):283:283 -> set
-    2:2:void set(java.lang.Object):22 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.EC:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":239,"2":240,"3":241}}
+    239:239:com.android.tools.r8.ir.code.Instruction next():218:218 -> m
+    240:240:com.android.tools.r8.ir.code.Instruction next():218:218 -> m
+    241:241:com.android.tools.r8.ir.code.Instruction next():218:218 -> m
+    229:238:com.android.tools.r8.ir.code.Instruction next():219:228 -> m
+    1:1:java.lang.Object next():23:23 -> next
+    1:1:int nextIndex():273:273 -> nextIndex
+    1:1:java.lang.Object previous():23:23 -> previous
+    2:15:com.android.tools.r8.ir.code.Instruction previous():255:268 -> previous
+    1:1:int previousIndex():278:278 -> previousIndex
+    1:1:void remove():283:283 -> remove
+    1:1:void set(java.lang.Object):23:23 -> set
+    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):288:288 -> set
+    2:2:void set(java.lang.Object):23 -> set
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.NB:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):23:23 -> <init>
     boolean hasInvariantOutType() -> V0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -47432,11 +46943,11 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Load asLoad() -> g0
-    int maxInValueRegister() -> g2
-    1:1:int maxOutValueRegister():62:62 -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> l2
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.SC:
+    int maxInValueRegister() -> h2
+    1:1:int maxOutValueRegister():62:62 -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> m2
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.aC:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -47480,11 +46991,11 @@
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> d
     1:5:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):44:48 -> d
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> h0
-    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> q2
-com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.RC:
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> r2
+com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.ZB:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():65:65 -> <clinit>
-com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.sE:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.xD:
     com.android.tools.r8.ir.code.MemberType BOOLEAN_OR_BYTE -> c
     com.android.tools.r8.ir.code.MemberType OBJECT -> b
     com.android.tools.r8.ir.code.MemberType SHORT -> e
@@ -47516,7 +47027,7 @@
     28:28:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.fromTypeDescriptorChar(char):82:82 -> a
     28:28:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
     1:1:com.android.tools.r8.ir.code.MemberType[] values():11:11 -> b
-com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.WF:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.TE:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Monitor$Type type -> i
     1:1:void <clinit>():21:21 -> <clinit>
@@ -47546,16 +47057,16 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean instructionTypeCanThrow() -> d1
     1:1:com.android.tools.r8.ir.code.Value object():45:45 -> e
-    int maxInValueRegister() -> g2
-    1:1:int maxOutValueRegister():86:86 -> h2
+    int maxInValueRegister() -> h2
     com.android.tools.r8.ir.code.Monitor asMonitor() -> i0
-    int opcode() -> i2
-    boolean throwsOnNullInput() -> k2
-    1:1:boolean isEnter():49:49 -> l2
-com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.UF:
+    1:1:int maxOutValueRegister():86:86 -> i2
+    int opcode() -> j2
+    boolean throwsOnNullInput() -> l2
+    1:1:boolean isEnter():49:49 -> m2
+com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.RE:
     int[] $SwitchMap$com$android$tools$r8$ir$code$Monitor$Type -> a
     1:1:void <clinit>():118:118 -> <clinit>
-com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.VF:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.SE:
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> d
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> b
     com.android.tools.r8.ir.code.Monitor$Type EXIT -> c
@@ -47563,7 +47074,7 @@
     2:2:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
     1:1:com.android.tools.r8.ir.code.Monitor$Type[] values():23:23 -> a
-com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.XF:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.UE:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
@@ -47585,14 +47096,14 @@
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):104 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:72 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
     com.android.tools.r8.ir.code.Move asMove() -> j0
-    1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> l2
-    1:1:com.android.tools.r8.ir.code.Value src():42:42 -> m2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> m2
+    1:1:com.android.tools.r8.ir.code.Value src():42:42 -> n2
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.ZF:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.WE:
     com.android.tools.r8.graph.DexType exceptionType -> i
     boolean $assertionsDisabled -> k
     com.android.tools.r8.utils.InternalOptions options -> j
@@ -47605,7 +47116,7 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:48 -> a
     4:6:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):85:87 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     7:7:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88 -> a
     8:8:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):91:91 -> a
     9:9:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):89:89 -> a
@@ -47619,12 +47130,12 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64 -> b
     3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:68 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:int maxInValueRegister():53:53 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
+    1:1:int maxInValueRegister():53:53 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
     com.android.tools.r8.ir.code.MoveException asMoveException() -> k0
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():126:126 -> l2
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.bG:
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():126:126 -> m2
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.YE:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -47645,11 +47156,11 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
-    int opcode() -> i2
+    int opcode() -> j2
     com.android.tools.r8.ir.code.Mul asMul() -> l0
-    boolean isCommutative() -> m2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> q2
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.PG:
+    boolean isCommutative() -> n2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> r2
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.MF:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():21:21 -> <clinit>
@@ -47677,12 +47188,12 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isNeg():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
-    int opcode() -> i2
+    int opcode() -> j2
     com.android.tools.r8.ir.code.Neg asNeg() -> m0
-com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.OG:
+com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.LF:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():57:57 -> <clinit>
-com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.ZG:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.WF:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -47715,13 +47226,13 @@
     1:4:boolean instructionInstanceCanThrow():83:86 -> b1
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean instructionTypeCanThrow() -> d1
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Value size():55:55 -> l2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Value size():55:55 -> m2
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> n0
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.aH:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.XF:
     long size -> j
     short[] data -> k
     int element_width -> i
@@ -47757,12 +47268,12 @@
     8:8:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):123:123 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean instructionTypeCanThrow() -> d1
-    int maxInValueRegister() -> g2
-    1:1:int maxOutValueRegister():86:86 -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Value src():50:50 -> l2
+    int maxInValueRegister() -> h2
+    1:1:int maxOutValueRegister():86:86 -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Value src():50:50 -> m2
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> o0
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.cH:
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.ZF:
     int $r8$clinit -> l
     com.android.tools.r8.graph.DexType clazz -> i
     boolean allowSpilling -> j
@@ -47791,22 +47302,22 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> b
     1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):216:223 -> d
     boolean instructionTypeCanThrow() -> d1
-    1:1:int maxInValueRegister():85:85 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Value dest():64:64 -> l2
-    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> m2
-    1:1:boolean isSpillingAllowed():211:211 -> n2
-    1:1:void markNoSpilling():207:207 -> o2
+    1:1:int maxInValueRegister():85:85 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Value dest():64:64 -> m2
+    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> n2
+    1:1:boolean isSpillingAllowed():211:211 -> o2
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> p0
+    1:1:void markNoSpilling():207:207 -> p2
     1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.code.NewInstance$Builder -> com.android.tools.r8.internal.bH:
+com.android.tools.r8.ir.code.NewInstance$Builder -> com.android.tools.r8.internal.YF:
     com.android.tools.r8.graph.DexType type -> c
     1:1:void <init>():236:236 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.NewInstance$Builder setType(com.android.tools.r8.graph.DexType):241:241 -> a
     1:1:com.android.tools.r8.ir.code.NewInstance build():247:247 -> b
-com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.dH:
+com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.aG:
     com.android.tools.r8.graph.DexType clazz -> i
     int ordinal -> j
     boolean $assertionsDisabled -> k
@@ -47828,15 +47339,15 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean instructionTypeCanThrow() -> d1
-    1:1:int maxInValueRegister():90:90 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:int getOrdinal():55:55 -> l2
+    1:1:int maxInValueRegister():90:90 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:int getOrdinal():55:55 -> m2
     com.android.tools.r8.ir.code.NewUnboxedEnumInstance asNewUnboxedEnumInstance() -> q0
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.eH:
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.bG:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):19:21 -> a
-com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.cI:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.YG:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():19:19 -> <clinit>
@@ -47863,12 +47374,12 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isNot():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
-    int opcode() -> i2
+    int opcode() -> j2
     com.android.tools.r8.ir.code.Not asNot() -> r0
-com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.bI:
+com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.XG:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():68:68 -> <clinit>
-com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.lI:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.kH:
     com.android.tools.r8.ir.code.NumericType to -> j
     com.android.tools.r8.ir.code.NumericType from -> i
     1:3:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:38 -> <init>
@@ -47926,17 +47437,17 @@
     858:858:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
     859:859:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):138:142 -> b
-    int opcode() -> i2
+    int opcode() -> j2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> s0
-com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.kI:
+com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.jH:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():62:62 -> <clinit>
-com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.qI:
+com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.oH:
     int nextValueNumber -> a
     1:2:void <init>():6:7 -> <init>
     1:1:int next():10:10 -> a
     1:1:int peek():14:14 -> b
-com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.vI:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.tH:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> h
     com.android.tools.r8.ir.code.NumericType FLOAT -> g
     com.android.tools.r8.ir.code.NumericType LONG -> f
@@ -47963,10 +47474,10 @@
     53:59:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):45:51 -> a
     60:60:boolean isWide():62:62 -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] values():10:10 -> b
-com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.uI:
+com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.sH:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():20:20 -> <clinit>
-com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.lL:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.hK:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -47982,11 +47493,11 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    int opcode() -> i2
-    boolean isCommutative() -> m2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> q2
+    int opcode() -> j2
+    boolean isCommutative() -> n2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> r2
     com.android.tools.r8.ir.code.Or asOr() -> t0
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.hM:
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.dL:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
     java.util.List operands -> s
@@ -48079,7 +47590,6 @@
     142:160:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):278:296 -> a
     161:161:void com.android.tools.r8.ir.code.Phi.addDefinitionsUser(java.util.Map):353:353 -> a
     161:161:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):296 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     162:171:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):303:312 -> a
     172:179:void print(com.android.tools.r8.utils.CfgPrinter):341:348 -> a
     180:180:void addDefinitionsUser(java.util.Map):353:353 -> a
@@ -48114,18 +47624,18 @@
     6:6:void removeDeadPhi():324:324 -> k0
     1:1:boolean removeTrivialPhi():240:240 -> l0
     1:1:void setIsStackPhi(boolean):376:376 -> m0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.hM$a:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.dL$a:
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> b
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> c
     1:2:void <clinit>():39:40 -> <clinit>
     1:1:void <init>(java.lang.String,int):38:38 -> <init>
-com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.iM:
+com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.eL:
     boolean $assertionsDisabled -> x
     1:1:void <clinit>():455:455 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):463:463 -> <init>
     1:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):468:475 -> a
     1:10:com.android.tools.r8.ir.analysis.type.TypeElement computePhiType(com.android.tools.r8.graph.AppView):481:490 -> c
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.tM:
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.oL:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value):20:21 -> <init>
@@ -48145,10 +47655,10 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> b
     1:5:void addInValue(com.android.tools.r8.ir.code.Value):36:40 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:int maxInValueRegister():61:61 -> g2
-    1:1:int maxOutValueRegister():66:66 -> h2
-    int opcode() -> i2
-com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.zM:
+    1:1:int maxInValueRegister():61:61 -> h2
+    1:1:int maxOutValueRegister():66:66 -> i2
+    int opcode() -> j2
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.tL:
     boolean removeInnerFramesIfThrowingNpe -> e
     boolean $assertionsDisabled -> f
     int line -> b
@@ -48163,30 +47673,34 @@
     2:8:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):122:128 -> a
     9:9:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
     9:9:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):128 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):127:127 -> a
     11:11:com.android.tools.r8.ir.code.Position getOutermostCallerMatchingOrElse(java.util.function.Predicate,com.android.tools.r8.ir.code.Position):156:156 -> a
     12:12:com.android.tools.r8.ir.code.Position getOutermostCallerMatchingOrElse(java.util.function.Predicate,com.android.tools.r8.ir.code.Position,boolean):161:161 -> a
     13:13:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.getCallerPosition():74:74 -> a
     13:13:com.android.tools.r8.ir.code.Position getOutermostCallerMatchingOrElse(java.util.function.Predicate,com.android.tools.r8.ir.code.Position,boolean):163 -> a
     14:19:com.android.tools.r8.ir.code.Position getOutermostCallerMatchingOrElse(java.util.function.Predicate,com.android.tools.r8.ir.code.Position,boolean):163:168 -> a
-    20:22:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):175:177 -> a
-    23:23:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.getCallerPosition():74:74 -> a
-    23:23:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):178 -> a
-    24:24:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):178:178 -> a
-    25:29:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):176:180 -> a
+    20:23:com.android.tools.r8.ir.code.Position replaceOutermostCallerPosition(com.android.tools.r8.ir.code.Position):184:187 -> a
+    24:24:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.getCallerPosition():74:74 -> a
+    24:24:com.android.tools.r8.ir.code.Position replaceOutermostCallerPosition(com.android.tools.r8.ir.code.Position):189 -> a
+    25:25:com.android.tools.r8.ir.code.Position replaceOutermostCallerPosition(com.android.tools.r8.ir.code.Position):189:189 -> a
+    26:28:com.android.tools.r8.ir.code.Position replaceOutermostCallerPosition(com.android.tools.r8.ir.code.Position):188:190 -> a
     1:1:com.android.tools.r8.ir.code.Position getCallerPosition():74:74 -> b
     2:6:void specifyBasePosition(com.android.tools.r8.utils.structural.StructuralSpecification):109:113 -> b
+    7:9:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):175:177 -> b
+    10:10:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.getCallerPosition():74:74 -> b
+    10:10:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):178 -> b
+    11:11:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):178:178 -> b
+    12:16:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):176:180 -> b
     int getCompareToId() -> c
     com.android.tools.r8.graph.DexString getFile() -> d
     1:1:int getLine():78:78 -> e
-    1:1:boolean equals(java.lang.Object):185:185 -> equals
+    1:1:boolean equals(java.lang.Object):195:195 -> equals
     1:1:com.android.tools.r8.graph.DexMethod getMethod():82:82 -> f
     1:1:com.android.tools.r8.ir.code.Position getOutermostCaller():148:148 -> g
     com.android.tools.r8.graph.DexMethod getOutlineCallee() -> h
-    1:1:int hashCode():190:190 -> hashCode
+    1:1:int hashCode():200:200 -> hashCode
     2:2:int com.android.tools.r8.utils.structural.HashCodeVisitor.run(com.android.tools.r8.utils.structural.StructuralItem):28:28 -> hashCode
-    2:2:int hashCode():190 -> hashCode
+    2:2:int hashCode():200 -> hashCode
     com.android.tools.r8.utils.Int2StructuralItemArrayMap getOutlinePositions() -> i
     1:1:boolean hasCallerPosition():70:70 -> k
     boolean hasFile() -> l
@@ -48196,121 +47710,120 @@
     1:1:boolean isSome():141:141 -> q
     1:1:com.android.tools.r8.ir.code.Position none():86:86 -> r
     1:1:com.android.tools.r8.ir.code.Position syntheticNone():117:117 -> s
-    1:19:java.lang.String com.android.tools.r8.ir.code.Position.toString(boolean):194:212 -> toString
-    1:19:java.lang.String toString():217 -> toString
-com.android.tools.r8.ir.code.Position$1 -> com.android.tools.r8.internal.uM:
-com.android.tools.r8.ir.code.Position$OutlineCallerPosition -> com.android.tools.r8.internal.wM:
+    1:19:java.lang.String com.android.tools.r8.ir.code.Position.toString(boolean):204:222 -> toString
+    1:19:java.lang.String toString():227 -> toString
+com.android.tools.r8.ir.code.Position$OutlineCallerPosition -> com.android.tools.r8.internal.qL:
     boolean isOutline -> i
     com.android.tools.r8.graph.DexMethod outlineCallee -> h
     com.android.tools.r8.utils.Int2StructuralItemArrayMap outlinePositions -> g
-    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.utils.Int2StructuralItemArrayMap,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.code.Position$1):464:464 -> <init>
-    2:5:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.utils.Int2StructuralItemArrayMap,com.android.tools.r8.graph.DexMethod,boolean):485:488 -> <init>
+    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.utils.Int2StructuralItemArrayMap,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.code.Position$1):474:474 -> <init>
+    2:5:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.utils.Int2StructuralItemArrayMap,com.android.tools.r8.graph.DexMethod,boolean):495:498 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
-    1:7:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():504:510 -> a
+    1:7:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():514:520 -> a
     int getCompareToId() -> c
-    1:1:void lambda$specify$0(com.android.tools.r8.utils.structural.StructuralSpecification):471:471 -> c
-    1:4:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):471:474 -> d
-    1:1:com.android.tools.r8.graph.DexMethod getOutlineCallee():521:521 -> h
-    1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap getOutlinePositions():526:526 -> i
+    1:1:void lambda$specify$0(com.android.tools.r8.utils.structural.StructuralSpecification):481:481 -> c
+    1:4:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):481:484 -> d
+    1:1:com.android.tools.r8.graph.DexMethod getOutlineCallee():531:531 -> h
+    1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap getOutlinePositions():536:536 -> i
     boolean isNone() -> m
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():531:531 -> n
-    1:1:boolean isOutline():516:516 -> o
-    1:1:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder builder():535:535 -> v
-com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder -> com.android.tools.r8.internal.vM:
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():541:541 -> n
+    1:1:boolean isOutline():526:526 -> o
+    1:1:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder builder():545:545 -> v
+com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder -> com.android.tools.r8.internal.pL:
     boolean isOutline -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder outlinePositionsBuilder -> g
     com.android.tools.r8.graph.DexMethod outlineCallee -> h
-    1:1:void <clinit>():538:538 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Position$1):538:538 -> <init>
-    2:2:void <init>():546:546 -> <init>
-    3:3:void <init>():542:542 -> <init>
-    1:1:com.android.tools.r8.ir.code.Position build():538:538 -> a
-    2:2:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder addOutlinePosition(int,com.android.tools.r8.ir.code.Position):559:559 -> a
-    3:3:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder setIsOutline(boolean):564:564 -> a
-    1:1:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder setOutlineCallee(com.android.tools.r8.graph.DexMethod):554:554 -> b
+    1:1:void <clinit>():548:548 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Position$1):548:548 -> <init>
+    2:2:void <init>():556:556 -> <init>
+    3:3:void <init>():552:552 -> <init>
+    1:1:com.android.tools.r8.ir.code.Position build():548:548 -> a
+    2:2:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder addOutlinePosition(int,com.android.tools.r8.ir.code.Position):569:569 -> a
+    3:3:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder setIsOutline(boolean):574:574 -> a
+    1:1:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder setOutlineCallee(com.android.tools.r8.graph.DexMethod):564:564 -> b
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
-    1:8:com.android.tools.r8.ir.code.Position$OutlineCallerPosition build():574:581 -> e
-    1:1:boolean hasOutlinePositions():569:569 -> f
-com.android.tools.r8.ir.code.Position$OutlinePosition -> com.android.tools.r8.internal.yM:
-    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.ir.code.Position$1):413:413 -> <init>
-    2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean):420:420 -> <init>
+    1:8:com.android.tools.r8.ir.code.Position$OutlineCallerPosition build():584:591 -> e
+    1:1:boolean hasOutlinePositions():579:579 -> f
+com.android.tools.r8.ir.code.Position$OutlinePosition -> com.android.tools.r8.internal.sL:
+    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.ir.code.Position$1):423:423 -> <init>
+    2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean):430:430 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
-    1:1:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():435:435 -> a
+    1:1:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():445:445 -> a
     int getCompareToId() -> c
-    1:1:void lambda$getStructuralMapping$0(com.android.tools.r8.utils.structural.StructuralSpecification):440:440 -> c
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():440:440 -> n
-    1:1:com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder builder():444:444 -> v
-com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder -> com.android.tools.r8.internal.xM:
-    1:1:void <init>(com.android.tools.r8.ir.code.Position$1):447:447 -> <init>
-    2:2:void <init>():450:450 -> <init>
-    1:1:com.android.tools.r8.ir.code.Position build():447:447 -> a
+    1:1:void lambda$getStructuralMapping$0(com.android.tools.r8.utils.structural.StructuralSpecification):450:450 -> c
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():450:450 -> n
+    1:1:com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder builder():454:454 -> v
+com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder -> com.android.tools.r8.internal.rL:
+    1:1:void <init>(com.android.tools.r8.ir.code.Position$1):457:457 -> <init>
+    2:2:void <init>():460:460 -> <init>
+    1:1:com.android.tools.r8.ir.code.Position build():457:457 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
-    1:1:com.android.tools.r8.ir.code.Position$OutlinePosition build():459:459 -> e
-com.android.tools.r8.ir.code.Position$PositionBuilder -> com.android.tools.r8.internal.zM$a:
+    1:1:com.android.tools.r8.ir.code.Position$OutlinePosition build():469:469 -> e
+com.android.tools.r8.ir.code.Position$PositionBuilder -> com.android.tools.r8.internal.tL$a:
     boolean noCheckOfPosition -> e
     boolean noCheckOfMethod -> f
     com.android.tools.r8.graph.DexMethod method -> b
     com.android.tools.r8.ir.code.Position callerPosition -> c
     int line -> a
     boolean removeInnerFramesIfThrowingNpe -> d
-    1:4:void <init>():222:225 -> <init>
+    1:4:void <init>():232:235 -> <init>
     com.android.tools.r8.ir.code.Position build() -> a
-    1:2:com.android.tools.r8.ir.code.Position$PositionBuilder setLine(int):236:237 -> a
-    3:4:com.android.tools.r8.ir.code.Position$PositionBuilder setMethod(com.android.tools.r8.graph.DexMethod):245:246 -> a
-    5:6:com.android.tools.r8.ir.code.Position$PositionBuilder setCallerPosition(com.android.tools.r8.ir.code.Position):250:251 -> a
-    1:2:com.android.tools.r8.ir.code.Position$PositionBuilder disableMethodCheck():265:266 -> b
+    1:2:com.android.tools.r8.ir.code.Position$PositionBuilder setLine(int):246:247 -> a
+    3:4:com.android.tools.r8.ir.code.Position$PositionBuilder setMethod(com.android.tools.r8.graph.DexMethod):255:256 -> a
+    5:6:com.android.tools.r8.ir.code.Position$PositionBuilder setCallerPosition(com.android.tools.r8.ir.code.Position):260:261 -> a
+    1:2:com.android.tools.r8.ir.code.Position$PositionBuilder disableMethodCheck():275:276 -> b
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
-    1:2:com.android.tools.r8.ir.code.Position$PositionBuilder setRemoveInnerFramesIfThrowingNpe(boolean):255:256 -> d
-com.android.tools.r8.ir.code.Position$SourcePosition -> com.android.tools.r8.internal.zM$b:
+    1:2:com.android.tools.r8.ir.code.Position$PositionBuilder setRemoveInnerFramesIfThrowingNpe(boolean):265:266 -> d
+com.android.tools.r8.ir.code.Position$SourcePosition -> com.android.tools.r8.internal.tL$b:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexString file -> g
     com.android.tools.r8.ir.code.Position$SourcePosition NO_POSITION -> h
-    1:5:void <clinit>():272:276 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.Position$1):272:272 -> <init>
-    2:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.graph.DexString):291:293 -> <init>
+    1:5:void <clinit>():282:286 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.Position$1):282:282 -> <init>
+    2:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.graph.DexString):301:303 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
-    1:5:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():313:317 -> a
+    1:5:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():323:327 -> a
     int getCompareToId() -> c
-    1:1:void lambda$specify$0(com.android.tools.r8.utils.structural.StructuralSpecification):282:282 -> c
-    1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):282:282 -> d
-    2:2:com.android.tools.r8.graph.DexString getFile():303:303 -> d
-    1:1:boolean hasFile():298:298 -> l
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():322:322 -> n
-    1:1:com.android.tools.r8.ir.code.Position$SourcePosition access$000():272:272 -> v
-    1:1:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder builder():326:326 -> w
-com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder -> com.android.tools.r8.internal.zM$b$a:
+    1:1:void lambda$specify$0(com.android.tools.r8.utils.structural.StructuralSpecification):292:292 -> c
+    1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):292:292 -> d
+    2:2:com.android.tools.r8.graph.DexString getFile():313:313 -> d
+    1:1:boolean hasFile():308:308 -> l
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():332:332 -> n
+    1:1:com.android.tools.r8.ir.code.Position$SourcePosition access$000():282:282 -> v
+    1:1:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder builder():336:336 -> w
+com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder -> com.android.tools.r8.internal.tL$b$a:
     com.android.tools.r8.graph.DexString file -> g
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():329:329 -> <clinit>
-    1:1:void <init>():329:329 -> <init>
-    1:1:com.android.tools.r8.ir.code.Position build():329:329 -> a
-    2:2:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder setFile(com.android.tools.r8.graph.DexString):340:340 -> a
+    1:1:void <clinit>():339:339 -> <clinit>
+    1:1:void <init>():339:339 -> <init>
+    1:1:com.android.tools.r8.ir.code.Position build():339:339 -> a
+    2:2:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder setFile(com.android.tools.r8.graph.DexString):350:350 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
-    1:3:com.android.tools.r8.ir.code.Position$SourcePosition build():346:348 -> e
-com.android.tools.r8.ir.code.Position$SyntheticPosition -> com.android.tools.r8.internal.zM$c:
+    1:3:com.android.tools.r8.ir.code.Position$SourcePosition build():356:358 -> e
+com.android.tools.r8.ir.code.Position$SyntheticPosition -> com.android.tools.r8.internal.tL$c:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
-    1:1:void <clinit>():359:359 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.ir.code.Position$1):354:354 -> <init>
-    2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean):367:367 -> <init>
+    1:1:void <clinit>():369:369 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.ir.code.Position$1):364:364 -> <init>
+    2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean):377:377 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
-    1:1:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():382:382 -> a
+    1:1:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():392:392 -> a
     int getCompareToId() -> c
-    1:1:void lambda$getStructuralMapping$0(com.android.tools.r8.utils.structural.StructuralSpecification):387:387 -> c
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():387:387 -> n
-    1:1:com.android.tools.r8.ir.code.Position access$100():354:354 -> v
-    1:1:com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder builder():391:391 -> w
-com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder -> com.android.tools.r8.internal.zM$c$a:
+    1:1:void lambda$getStructuralMapping$0(com.android.tools.r8.utils.structural.StructuralSpecification):397:397 -> c
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():397:397 -> n
+    1:1:com.android.tools.r8.ir.code.Position access$100():364:364 -> v
+    1:1:com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder builder():401:401 -> w
+com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder -> com.android.tools.r8.internal.tL$c$a:
     boolean $assertionsDisabled -> g
-    1:1:void <clinit>():394:394 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Position$1):394:394 -> <init>
-    2:2:void <init>():397:397 -> <init>
-    1:1:com.android.tools.r8.ir.code.Position build():394:394 -> a
+    1:1:void <clinit>():404:404 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Position$1):404:404 -> <init>
+    2:2:void <init>():407:407 -> <init>
+    1:1:com.android.tools.r8.ir.code.Position build():404:404 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
-    1:3:com.android.tools.r8.ir.code.Position$SyntheticPosition build():406:408 -> e
-com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.internal.iN:
+    1:3:com.android.tools.r8.ir.code.Position$SyntheticPosition build():416:418 -> e
+com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.internal.ZL:
     1:3:java.lang.Object previousUntil(java.util.function.Predicate):18:20 -> b
-com.android.tools.r8.ir.code.RecordFieldValues -> com.android.tools.r8.internal.QQ:
+com.android.tools.r8.ir.code.RecordFieldValues -> com.android.tools.r8.internal.zP:
     com.android.tools.r8.graph.DexField[] fields -> i
     1:2:void <init>(com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.code.Value,java.util.List):28:29 -> <init>
     boolean hasInvariantOutType() -> V0
@@ -48335,12 +47848,12 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81 -> b
     3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):84:85 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.graph.DexField[] getFields():33:33 -> l2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.graph.DexField[] getFields():33:33 -> m2
     com.android.tools.r8.ir.code.RecordFieldValues asRecordFieldValues() -> u0
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.cT:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.ER:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -48366,11 +47879,11 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
-    int opcode() -> i2
-    boolean isCommutative() -> m2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> q2
+    int opcode() -> j2
+    boolean isCommutative() -> n2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> r2
     com.android.tools.r8.ir.code.Rem asRem() -> v0
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.zU:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.SS:
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     1:1:void <clinit>():21:21 -> <clinit>
@@ -48403,32 +47916,32 @@
     17:22:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):88:93 -> b
     23:24:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.code.Return.getReturnType():50:51 -> b
     23:24:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95 -> b
-    25:26:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.code.Return.getReturnType():50:51 -> b
-    25:26:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    27:29:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement):450:452 -> b
-    27:29:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    int maxInValueRegister() -> g2
-    1:1:int maxOutValueRegister():105:105 -> h2
-    int opcode() -> i2
-    1:1:boolean isReturnVoid():46:46 -> m2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():59:60 -> n2
+    25:25:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95:95 -> b
+    26:27:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.code.Return.getReturnType():50:51 -> b
+    26:27:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95 -> b
+    28:28:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95:95 -> b
+    29:31:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement):460:462 -> b
+    29:31:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95 -> b
+    int maxInValueRegister() -> h2
+    1:1:int maxOutValueRegister():105:105 -> i2
+    int opcode() -> j2
+    1:1:boolean isReturnVoid():46:46 -> n2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():59:60 -> o2
     com.android.tools.r8.ir.code.Return asReturn() -> w0
-com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.yU:
+com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.RS:
     1:1:void <init>():138:138 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.Return build():142:142 -> b
-com.android.tools.r8.ir.code.SafeCheckCast -> com.android.tools.r8.internal.TU:
+com.android.tools.r8.ir.code.SafeCheckCast -> com.android.tools.r8.internal.lT:
     int $r8$clinit -> m
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):16:16 -> <init>
     1:1:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):25:25 -> a
     boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> b
     1:1:com.android.tools.r8.code.CheckCast createCheckCast(int):30:30 -> c
-com.android.tools.r8.ir.code.SafeCheckCast$Builder -> com.android.tools.r8.internal.SU:
+com.android.tools.r8.ir.code.SafeCheckCast$Builder -> com.android.tools.r8.internal.kT:
     1:1:void <init>():48:48 -> <init>
     1:1:com.android.tools.r8.ir.code.CheckCast build():52:52 -> b
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.vV:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.LT:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -48445,11 +47958,11 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:3:boolean com.android.tools.r8.ir.code.Binop.fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33 -> h
-    int opcode() -> i2
-    boolean isCommutative() -> m2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> q2
+    int opcode() -> j2
+    boolean isCommutative() -> n2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> r2
     com.android.tools.r8.ir.code.Shl asShl() -> x0
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.xV:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.NT:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -48466,13 +47979,13 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:3:boolean com.android.tools.r8.ir.code.Binop.fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33 -> h
-    int opcode() -> i2
-    boolean isCommutative() -> m2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> q2
+    int opcode() -> j2
+    boolean isCommutative() -> n2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> r2
     com.android.tools.r8.ir.code.Shr asShr() -> y0
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.NV:
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.mU:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.UW:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.qV:
     int height -> r
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> s
     boolean $assertionsDisabled -> t
@@ -48490,7 +48003,7 @@
     62:62:java.lang.String toString():59:59 -> toString
     63:63:java.lang.String toString():59:59 -> toString
     60:60:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.VW:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.rV:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():14:14 -> <clinit>
@@ -48501,7 +48014,7 @@
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> g0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> v
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.lX:
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.HV:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():35:35 -> <clinit>
@@ -48533,7 +48046,6 @@
     233:233:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):217:217 -> a
     234:236:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.conversion.CfBuilder.resolveField(com.android.tools.r8.graph.DexField):229:231 -> a
     234:236:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):217 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     237:237:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):217:217 -> a
     238:238:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):222:222 -> a
     239:239:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):227:227 -> a
@@ -48541,7 +48053,6 @@
     241:241:boolean outTypeKnownToBeBoolean(java.util.Set):243:243 -> a
     242:242:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.StaticGet):319:319 -> a
     242:242:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):63 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):167:167 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):167 -> b
@@ -48552,21 +48063,20 @@
     boolean instructionTypeCanBeCanonicalized() -> c1
     1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):248:256 -> d
     boolean instructionTypeCanThrow() -> d1
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Value dest():67:67 -> m2
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
     1:1:java.lang.String toString():182:182 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():72:72 -> value
     boolean isFieldGet() -> y1
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> z0
-com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.kX:
+com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.GV:
     com.android.tools.r8.graph.DexField field -> c
     1:1:void <init>():260:260 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.StaticGet$Builder setField(com.android.tools.r8.graph.DexField):269:269 -> a
     1:1:com.android.tools.r8.ir.code.StaticGet build():275:275 -> b
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.nX:
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.JV:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):36:36 -> <init>
@@ -48599,24 +48109,22 @@
     211:211:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):224:224 -> a
     212:214:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.conversion.CfBuilder.resolveField(com.android.tools.r8.graph.DexField):229:231 -> a
     212:214:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):224 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     215:215:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):224:224 -> a
     216:216:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):234:234 -> a
     217:217:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.StaticPut):324:324 -> a
     217:217:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     boolean isStaticFieldInstruction() -> a2
     boolean isStaticPut() -> b
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):174:178 -> b
     1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):240:248 -> d
     boolean instructionTypeCanThrow() -> d1
     int getValueIndex() -> f
-    int maxInValueRegister() -> g2
-    1:1:int maxOutValueRegister():148:148 -> h2
-    int opcode() -> i2
+    int maxInValueRegister() -> h2
+    1:1:int maxOutValueRegister():148:148 -> i2
+    int opcode() -> j2
     1:1:java.lang.String toString():189:189 -> toString
     1:2:com.android.tools.r8.ir.code.Value value():56:57 -> value
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.pX:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.KV:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):25:25 -> <init>
@@ -48636,11 +48144,11 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):113:114 -> d
-    1:1:int maxInValueRegister():59:59 -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Value src():39:39 -> l2
-com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.OX:
+    1:1:int maxInValueRegister():59:59 -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Value src():39:39 -> m2
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.iW:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexString[] keys -> m
     1:1:void <clinit>():17:17 -> <clinit>
@@ -48657,15 +48165,15 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):109:109 -> b
     boolean isStringSwitch() -> c2
     1:1:com.android.tools.r8.graph.DexString getKey(int):80:80 -> f
-    1:1:int maxInValueRegister():119:119 -> g2
-    1:1:int maxOutValueRegister():124:124 -> h2
-    int opcode() -> i2
-    1:4:boolean valid():62:65 -> p2
+    1:1:int maxInValueRegister():119:119 -> h2
+    1:1:int maxOutValueRegister():124:124 -> i2
+    int opcode() -> j2
+    1:4:boolean valid():62:65 -> q2
     1:4:java.lang.String toString():85:88 -> toString
     5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.code.StringSwitch.getKey(int):80:80 -> toString
     5:5:java.lang.String toString():89 -> toString
     6:11:java.lang.String toString():89:94 -> toString
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.sY:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.KW:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
@@ -48701,14 +48209,14 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):72:72 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):88:88 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):52:52 -> f
-    int opcode() -> i2
-    boolean isCommutative() -> m2
-    1:6:int maxInOutValueRegisterSize():131:136 -> o2
-    7:9:boolean com.android.tools.r8.ir.code.Sub.negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):123:125 -> o2
-    7:9:int maxInOutValueRegisterSize():136 -> o2
-    10:12:int maxInOutValueRegisterSize():136:138 -> o2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> q2
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.DY:
+    int opcode() -> j2
+    boolean isCommutative() -> n2
+    1:6:int maxInOutValueRegisterSize():131:136 -> p2
+    7:9:boolean com.android.tools.r8.ir.code.Sub.negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):123:125 -> p2
+    7:9:int maxInOutValueRegisterSize():136 -> p2
+    10:12:int maxInOutValueRegisterSize():136:138 -> p2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> r2
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.VW:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
@@ -48725,10 +48233,10 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:5:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):44:48 -> f
-    int maxInValueRegister() -> g2
-    1:1:int maxOutValueRegister():85:85 -> h2
-    int opcode() -> i2
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.EY:
+    int maxInValueRegister() -> h2
+    1:1:int maxOutValueRegister():85:85 -> i2
+    int opcode() -> j2
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.WW:
     int fallthroughBlockIndex -> k
     boolean $assertionsDisabled -> l
     int[] targetBlockIndices -> j
@@ -48743,18 +48251,18 @@
     2:2:int[] com.android.tools.r8.ir.code.Switch.targetBlockIndices():43:43 -> e
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):35 -> e
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):35:35 -> e
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():54:54 -> l2
-    1:1:int getFallthroughBlockIndex():58:58 -> m2
-    1:1:int numberOfKeys():71:71 -> n2
-    1:1:int[] targetBlockIndices():43:43 -> o2
-    1:2:boolean valid():28:29 -> p2
-    3:3:int com.android.tools.r8.ir.code.Switch.getTargetBlockIndex(int):39:39 -> p2
-    3:3:boolean valid():29 -> p2
-    4:4:int com.android.tools.r8.ir.code.Switch.getFallthroughBlockIndex():58:58 -> p2
-    4:4:boolean valid():29 -> p2
-    5:5:boolean valid():29:29 -> p2
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():54:54 -> m2
+    1:1:int getFallthroughBlockIndex():58:58 -> n2
+    1:1:int numberOfKeys():71:71 -> o2
+    1:1:int[] targetBlockIndices():43:43 -> p2
+    1:2:boolean valid():28:29 -> q2
+    3:3:int com.android.tools.r8.ir.code.Switch.getTargetBlockIndex(int):39:39 -> q2
+    3:3:boolean valid():29 -> q2
+    4:4:int com.android.tools.r8.ir.code.Switch.getFallthroughBlockIndex():58:58 -> q2
+    4:4:boolean valid():29 -> q2
+    5:5:boolean valid():29:29 -> q2
     1:1:com.android.tools.r8.ir.code.Value value():24:24 -> value
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.iZ:
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.yX:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -48764,7 +48272,7 @@
     2:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):81:81 -> a
     3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:86 -> a
     4:8:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):91:95 -> a
-    9:9:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> a
+    9:9:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> a
     9:9:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):99 -> a
     10:14:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):104:108 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():335:335 -> a
@@ -48772,21 +48280,21 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
     boolean instructionTypeCanThrow() -> d1
     boolean isThrow() -> e2
-    int maxInValueRegister() -> g2
-    1:1:int maxOutValueRegister():49:49 -> h2
-    int opcode() -> i2
-    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> m2
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.d10:
+    int maxInValueRegister() -> h2
+    1:1:int maxOutValueRegister():49:49 -> i2
+    int opcode() -> j2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> n2
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.tZ:
     1:1:com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier create(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):16:16 -> a
     com.android.tools.r8.ir.analysis.type.TypeElement getOutType() -> c
     com.android.tools.r8.graph.DebugLocalInfo getLocalInfo() -> i
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.c10:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.sZ:
     com.android.tools.r8.ir.analysis.type.TypeElement val$type -> c
     com.android.tools.r8.graph.DebugLocalInfo val$local -> b
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.analysis.type.TypeElement):16:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():25:25 -> c
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():20:20 -> i
-com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.B10:
+com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.RZ:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):29:29 -> <init>
     boolean hasInvariantOutType() -> V0
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -48797,10 +48305,10 @@
     5:5:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):85:85 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54:54 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    int opcode() -> i2
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.Q10:
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    int opcode() -> j2
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.g00:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean hasInvariantOutType() -> V0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
@@ -48809,10 +48317,26 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isUnop() -> f2
-    int maxInValueRegister() -> g2
-    int maxOutValueRegister() -> h2
-    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> l2
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.e20:
+    int maxInValueRegister() -> h2
+    int maxOutValueRegister() -> i2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> m2
+com.android.tools.r8.ir.code.UnusedArgument -> com.android.tools.r8.internal.o00:
+    1:1:void <init>(com.android.tools.r8.ir.code.Value):26:26 -> <init>
+    boolean hasInvariantOutType() -> V0
+    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    1:1:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):36:36 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41:41 -> a
+    3:3:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):46:46 -> a
+    4:4:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):51:51 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):56:56 -> a
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):72:72 -> a
+    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):82:82 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
+    1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):77:77 -> d
+    1:1:int maxInValueRegister():97:97 -> h2
+    1:1:int maxOutValueRegister():102:102 -> i2
+    int opcode() -> j2
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.u00:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     com.android.tools.r8.ir.code.Ushr asUshr() -> G0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -48830,10 +48354,10 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:3:boolean com.android.tools.r8.ir.code.Binop.fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33 -> h
-    int opcode() -> i2
-    boolean isCommutative() -> m2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> q2
-com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.o20:
+    int opcode() -> j2
+    boolean isCommutative() -> n2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> r2
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.D00:
     com.android.tools.r8.ir.regalloc.LiveIntervals liveIntervals -> j
     com.android.tools.r8.ir.analysis.type.TypeElement type -> o
     int needsRegister -> k
@@ -49002,14 +48526,12 @@
     1540:1540:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1203:1203 -> a
     1541:1541:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):83:83 -> a
     1541:1541:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1203 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1542:1542:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1203:1203 -> a
     1:1:com.android.tools.r8.ir.code.ValueType outType():790:790 -> a0
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> b
     1:5:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):467:471 -> b
-    6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> b
+    6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> b
     6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):471 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:8:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):474:475 -> b
     9:10:void addUser(com.android.tools.r8.ir.code.Instruction):494:495 -> b
     11:12:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):533:534 -> b
@@ -49074,22 +48596,22 @@
     789:789:java.lang.String toString():761:761 -> toString
     790:790:java.lang.String toString():762:762 -> toString
     764:787:java.lang.String toString():763:786 -> toString
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getPreviousConsecutive():330:330 -> u
-    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():319 -> u
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():319:319 -> u
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getPreviousConsecutive():330:330 -> u
+    2:2:com.android.tools.r8.ir.code.Value getStartOfConsecutive():319 -> u
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1094:1094 -> v
     1:11:com.android.tools.r8.utils.LongInterval getValueRange():960:970 -> w
     1:1:boolean hasAnyUsers():406:406 -> x
     1:1:boolean hasDebugUsers():410:410 -> y
     1:1:boolean hasLocalInfo():271:271 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.m20:
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.B00:
     com.android.tools.r8.graph.DebugLocalInfo local -> a
     java.util.Set users -> b
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):159:159 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):157:160 -> <init>
-com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.p20:
+com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.E00:
     1:1:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):13:13 -> a
-com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.w20:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.L00:
     com.android.tools.r8.ir.code.ValueType LONG -> e
     com.android.tools.r8.ir.code.ValueType DOUBLE -> f
     com.android.tools.r8.ir.code.ValueType INT -> c
@@ -49141,14 +48663,14 @@
     15:15:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():144:144 -> d
     1:1:com.android.tools.r8.ir.code.ValueType[] values():16:16 -> e
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():34:34 -> n
-com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.v20:
+com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.K00:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> a
     1:1:void <clinit>():142:142 -> <clinit>
     2:2:void <clinit>():105:105 -> <clinit>
     3:3:void <clinit>():54:54 -> <clinit>
-com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.y20:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.N00:
     com.android.tools.r8.ir.code.ValueTypeConstraint INT -> c
     com.android.tools.r8.ir.code.ValueTypeConstraint OBJECT -> b
     com.android.tools.r8.ir.code.ValueTypeConstraint LONG -> g
@@ -49182,16 +48704,16 @@
     57:57:com.android.tools.r8.ir.code.ValueTypeConstraint fromNumericType(com.android.tools.r8.ir.code.NumericType):120:120 -> a
     58:59:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):133:134 -> a
     60:60:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBoolean():0:0 -> a
-    60:60:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():378 -> a
+    60:60:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():388 -> a
     60:60:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):136 -> a
     61:61:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isByte():0:0 -> a
-    61:61:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():379 -> a
+    61:61:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():389 -> a
     61:61:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):136 -> a
     62:62:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isShort():0:0 -> a
-    62:62:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():380 -> a
+    62:62:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():390 -> a
     62:62:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):136 -> a
     63:63:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isChar():0:0 -> a
-    63:63:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():381 -> a
+    63:63:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFineGrainedType():391 -> a
     63:63:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):136 -> a
     64:64:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     64:64:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):136 -> a
@@ -49209,7 +48731,7 @@
     78:80:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):155:157 -> a
     81:81:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):137:137 -> a
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint[] values():13:13 -> b
-com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.x20:
+com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.M00:
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueTypeConstraint -> d
@@ -49218,9 +48740,9 @@
     2:2:void <clinit>():115:115 -> <clinit>
     3:3:void <clinit>():63:63 -> <clinit>
     4:4:void <clinit>():46:46 -> <clinit>
-com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.z30:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.L10:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.O40:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.Z20:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     com.android.tools.r8.ir.code.Xor asXor() -> H0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -49237,10 +48759,10 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    int opcode() -> i2
-    boolean isCommutative() -> m2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> q2
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.internal.e3:
+    int opcode() -> j2
+    boolean isCommutative() -> n2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> r2
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.internal.c3:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -49252,14 +48774,13 @@
     19:19:void clear():63:63 -> a
     1:1:int getElementWidth(int):51:51 -> b
     1:1:long getSize(int):55:55 -> c
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1 -> com.android.tools.r8.internal.c3:
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$PayloadData -> com.android.tools.r8.internal.d3:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$PayloadData -> com.android.tools.r8.internal.b3:
     long size -> b
     short[] data -> c
     int element_width -> a
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1):17:17 -> <init>
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.H6:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.C6:
     com.android.tools.r8.ir.code.Position currentPosition -> h
     java.util.Map newInstanceLabels -> q
     java.util.List thisInitializers -> p
@@ -49344,179 +48865,179 @@
     198:200:void com.android.tools.r8.ir.conversion.CfBuilder.emitLabel(com.android.tools.r8.cf.code.CfLabel):671:673 -> a
     198:200:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():326 -> a
     198:200:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    201:201:boolean com.android.tools.r8.ir.code.CatchHandlers.isEmpty():55:55 -> a
-    201:201:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():328 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    201:201:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():328:328 -> a
     201:201:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    202:202:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():330:330 -> a
+    202:202:boolean com.android.tools.r8.ir.code.CatchHandlers.isEmpty():55:55 -> a
+    202:202:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():328 -> a
     202:202:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    203:205:void com.android.tools.r8.ir.conversion.CfBuilder.emitLabel(com.android.tools.r8.cf.code.CfLabel):671:673 -> a
-    203:205:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():331 -> a
-    203:205:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    206:211:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():335:340 -> a
-    206:211:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    212:214:void com.android.tools.r8.ir.conversion.CfBuilder.emitLabel(com.android.tools.r8.cf.code.CfLabel):671:673 -> a
-    212:214:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():340 -> a
-    212:214:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    215:223:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():342:350 -> a
-    215:223:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    224:225:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
-    224:225:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
-    224:225:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():350 -> a
-    224:225:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    226:227:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():350:351 -> a
-    226:227:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    228:230:int com.android.tools.r8.ir.conversion.CfBuilder.stackHeightAtBlockEntry(com.android.tools.r8.ir.code.BasicBlock):297:299 -> a
-    228:230:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():354 -> a
-    228:230:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    231:232:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.setHeight(int):126:127 -> a
-    231:232:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():354 -> a
-    231:232:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    233:233:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):474:474 -> a
-    233:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    233:233:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    234:234:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):402:402 -> a
-    234:234:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):475 -> a
+    203:203:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():330:330 -> a
+    203:203:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    204:206:void com.android.tools.r8.ir.conversion.CfBuilder.emitLabel(com.android.tools.r8.cf.code.CfLabel):671:673 -> a
+    204:206:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():331 -> a
+    204:206:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    207:212:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():335:340 -> a
+    207:212:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    213:215:void com.android.tools.r8.ir.conversion.CfBuilder.emitLabel(com.android.tools.r8.cf.code.CfLabel):671:673 -> a
+    213:215:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():340 -> a
+    213:215:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    216:224:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():342:350 -> a
+    216:224:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    225:226:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
+    225:226:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
+    225:226:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():350 -> a
+    225:226:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    227:228:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():350:351 -> a
+    227:228:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    229:231:int com.android.tools.r8.ir.conversion.CfBuilder.stackHeightAtBlockEntry(com.android.tools.r8.ir.code.BasicBlock):297:299 -> a
+    229:231:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():354 -> a
+    229:231:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    232:233:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.setHeight(int):126:127 -> a
+    232:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():354 -> a
+    232:233:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    234:234:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):474:474 -> a
     234:234:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
     234:234:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    235:235:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):391:391 -> a
-    235:235:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):403 -> a
+    235:235:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):402:402 -> a
     235:235:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):475 -> a
     235:235:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
     235:235:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    236:236:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    236:236:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):392 -> a
+    236:236:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):391:391 -> a
     236:236:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):403 -> a
     236:236:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):475 -> a
     236:236:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
     236:236:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    237:237:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
-    237:237:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):393 -> a
+    237:237:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    237:237:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):392 -> a
     237:237:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):403 -> a
     237:237:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):475 -> a
     237:237:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
     237:237:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    238:238:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):395:395 -> a
+    238:238:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
+    238:238:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):393 -> a
     238:238:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):403 -> a
     238:238:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):475 -> a
     238:238:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
     238:238:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    239:241:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):479:481 -> a
-    239:241:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    239:241:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    242:244:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):581:583 -> a
-    242:244:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):481 -> a
-    242:244:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    242:244:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    245:245:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    245:245:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):583 -> a
-    245:245:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):481 -> a
-    245:245:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    245:245:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    246:277:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):584:615 -> a
-    246:277:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):481 -> a
-    246:277:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    246:277:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    278:288:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):482:492 -> a
-    278:288:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    278:288:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    289:290:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.pop(com.android.tools.r8.ir.code.Value):121:122 -> a
-    289:290:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):492 -> a
-    289:290:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    289:290:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    291:293:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):495:497 -> a
-    291:293:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    291:293:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    294:296:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.push(com.android.tools.r8.ir.code.Value):115:117 -> a
-    294:296:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):498 -> a
-    294:296:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    294:296:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    297:298:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):500:501 -> a
-    297:298:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    297:298:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    299:301:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.push(com.android.tools.r8.ir.code.Value):115:117 -> a
-    299:301:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):502 -> a
-    299:301:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    299:301:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    302:302:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
-    302:302:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):506 -> a
-    302:302:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    302:302:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    303:308:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):507:512 -> a
-    303:308:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    303:308:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    309:316:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):521:528 -> a
-    309:316:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):514 -> a
-    309:316:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    309:316:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    317:317:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
-    317:317:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):529 -> a
-    317:317:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):514 -> a
-    317:317:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    317:317:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    318:328:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):530:540 -> a
-    318:328:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):514 -> a
-    318:328:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    318:328:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    329:329:void com.android.tools.r8.ir.conversion.CfBuilder.add(com.android.tools.r8.cf.code.CfInstruction):688:688 -> a
-    329:329:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):540 -> a
-    329:329:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):514 -> a
-    329:329:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
-    329:329:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    330:330:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):541:541 -> a
+    239:239:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):395:395 -> a
+    239:239:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):403 -> a
+    239:239:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):475 -> a
+    239:239:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    239:239:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    240:242:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):479:481 -> a
+    240:242:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    240:242:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    243:245:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):581:583 -> a
+    243:245:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):481 -> a
+    243:245:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    243:245:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    246:246:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    246:246:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):583 -> a
+    246:246:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):481 -> a
+    246:246:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    246:246:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    247:278:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):584:615 -> a
+    247:278:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):481 -> a
+    247:278:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    247:278:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    279:289:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):482:492 -> a
+    279:289:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    279:289:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    290:291:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.pop(com.android.tools.r8.ir.code.Value):121:122 -> a
+    290:291:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):492 -> a
+    290:291:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    290:291:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    292:294:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):495:497 -> a
+    292:294:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    292:294:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    295:297:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.push(com.android.tools.r8.ir.code.Value):115:117 -> a
+    295:297:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):498 -> a
+    295:297:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    295:297:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    298:299:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):500:501 -> a
+    298:299:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    298:299:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    300:302:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.push(com.android.tools.r8.ir.code.Value):115:117 -> a
+    300:302:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):502 -> a
+    300:302:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    300:302:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    303:303:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
+    303:303:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):506 -> a
+    303:303:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    303:303:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    304:309:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):507:512 -> a
+    304:309:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    304:309:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    310:317:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):521:528 -> a
+    310:317:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):514 -> a
+    310:317:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    310:317:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    318:318:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
+    318:318:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):529 -> a
+    318:318:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):514 -> a
+    318:318:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    318:318:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    319:329:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):530:540 -> a
+    319:329:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):514 -> a
+    319:329:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
+    319:329:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    330:330:void com.android.tools.r8.ir.conversion.CfBuilder.add(com.android.tools.r8.cf.code.CfInstruction):688:688 -> a
+    330:330:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):540 -> a
     330:330:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):514 -> a
     330:330:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
     330:330:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    331:331:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):515:515 -> a
+    331:331:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):541:541 -> a
+    331:331:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):514 -> a
     331:331:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
     331:331:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    332:332:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():357:357 -> a
+    332:332:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):515:515 -> a
+    332:332:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():355 -> a
     332:332:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    333:333:boolean com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.isEmpty():111:111 -> a
-    333:333:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():357 -> a
+    333:333:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():357:357 -> a
     333:333:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    334:359:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():357:382 -> a
-    334:359:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
-    360:360:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):185:185 -> a
-    361:369:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):213:221 -> a
-    361:369:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):185 -> a
-    370:370:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):186:186 -> a
-    371:371:com.android.tools.r8.graph.CfCode$StackMapStatus com.android.tools.r8.graph.CfCode.verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):838:838 -> a
-    371:371:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):186 -> a
-    372:372:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):186:186 -> a
-    373:374:void updateLocals(com.android.tools.r8.cf.code.CfLabel):546:547 -> a
-    375:380:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.graph.DebugLocalInfo.endingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):74:79 -> a
-    375:380:void updateLocals(com.android.tools.r8.cf.code.CfLabel):547 -> a
-    381:381:void updateLocals(com.android.tools.r8.cf.code.CfLabel):548:548 -> a
-    382:387:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.graph.DebugLocalInfo.startingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):88:93 -> a
-    382:387:void updateLocals(com.android.tools.r8.cf.code.CfLabel):549 -> a
-    388:403:void updateLocals(com.android.tools.r8.cf.code.CfLabel):550:565 -> a
-    404:409:void updateLocals(com.android.tools.r8.cf.code.CfLabel):564:569 -> a
-    410:413:boolean localsChanged():573:576 -> a
-    414:415:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):619:620 -> a
-    416:421:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):629:634 -> a
-    416:421:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):622 -> a
-    422:422:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo.getDexType():70:70 -> a
-    422:422:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):634 -> a
-    422:422:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):622 -> a
-    423:454:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):633:664 -> a
-    423:454:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):622 -> a
-    455:455:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):623:623 -> a
-    456:456:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):639:639 -> a
-    456:456:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):622 -> a
-    457:457:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):680:680 -> a
-    458:458:int getLocalRegister(com.android.tools.r8.ir.code.Value):684:684 -> a
-    459:459:void add(com.android.tools.r8.cf.code.CfInstruction):688:688 -> a
+    334:334:boolean com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.isEmpty():111:111 -> a
+    334:334:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():357 -> a
+    334:334:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    335:360:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():357:382 -> a
+    335:360:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):184 -> a
+    361:361:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):185:185 -> a
+    362:370:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):213:221 -> a
+    362:370:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):185 -> a
+    371:371:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):186:186 -> a
+    372:372:com.android.tools.r8.graph.CfCode$StackMapStatus com.android.tools.r8.graph.CfCode.verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):838:838 -> a
+    372:372:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):186 -> a
+    373:373:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):186:186 -> a
+    374:375:void updateLocals(com.android.tools.r8.cf.code.CfLabel):546:547 -> a
+    376:381:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.graph.DebugLocalInfo.endingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):74:79 -> a
+    376:381:void updateLocals(com.android.tools.r8.cf.code.CfLabel):547 -> a
+    382:382:void updateLocals(com.android.tools.r8.cf.code.CfLabel):548:548 -> a
+    383:388:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.graph.DebugLocalInfo.startingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):88:93 -> a
+    383:388:void updateLocals(com.android.tools.r8.cf.code.CfLabel):549 -> a
+    389:404:void updateLocals(com.android.tools.r8.cf.code.CfLabel):550:565 -> a
+    405:410:void updateLocals(com.android.tools.r8.cf.code.CfLabel):564:569 -> a
+    411:414:boolean localsChanged():573:576 -> a
+    415:416:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):619:620 -> a
+    417:422:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):629:634 -> a
+    417:422:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):622 -> a
+    423:423:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo.getDexType():70:70 -> a
+    423:423:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):634 -> a
+    423:423:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):622 -> a
+    424:455:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):633:664 -> a
+    424:455:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):622 -> a
+    456:456:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):623:623 -> a
+    457:457:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):639:639 -> a
+    457:457:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):622 -> a
+    458:458:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):680:680 -> a
+    459:459:int getLocalRegister(com.android.tools.r8.ir.code.Value):684:684 -> a
+    460:460:void add(com.android.tools.r8.cf.code.CfInstruction):688:688 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):680:680 -> b
-com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.internal.F6:
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.G6:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.B6:
     int height -> b
     boolean $assertionsDisabled -> c
     int maxHeight -> a
     1:1:void <clinit>():106:106 -> <clinit>
     1:3:void <init>():106:108 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):106:106 -> <init>
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.A8:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.r8:
     int currentInstructionIndex -> o
     com.android.tools.r8.graph.CfCode code -> h
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
@@ -49547,123 +49068,116 @@
     void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
     1:3:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):303:305 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     4:4:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):305 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:7:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):305:305 -> a
-    9:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):307:308 -> a
-    11:12:boolean com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.isEmpty():89:90 -> a
-    11:12:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):309 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:14:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):311:312 -> a
-    15:15:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> a
-    15:15:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):312 -> a
-    16:34:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):313:331 -> a
-    35:35:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):338:338 -> a
-    36:36:boolean com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.validFor(int):85:85 -> a
-    36:36:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):338 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    37:40:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):339:342 -> a
-    41:42:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):101:102 -> a
-    41:42:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
-    43:43:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    43:43:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):102 -> a
-    43:43:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
-    44:44:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):103:103 -> a
+    9:11:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):307:309 -> a
+    12:13:boolean com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.isEmpty():89:90 -> a
+    12:13:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):309 -> a
+    14:15:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):311:312 -> a
+    16:16:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> a
+    16:16:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):312 -> a
+    17:35:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):313:331 -> a
+    36:36:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):338:338 -> a
+    37:37:boolean com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.validFor(int):85:85 -> a
+    37:37:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):338 -> a
+    38:41:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):339:342 -> a
+    42:43:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):101:102 -> a
+    42:43:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
+    44:44:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    44:44:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):102 -> a
     44:44:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
-    45:45:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.<init>():104:104 -> a
-    45:45:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):103 -> a
+    45:45:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):103:103 -> a
     45:45:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
-    46:74:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):105:133 -> a
-    46:74:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
-    75:82:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340:347 -> a
-    83:83:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():420:420 -> a
-    83:83:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):751 -> a
-    84:89:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):754:759 -> a
-    90:95:void com.android.tools.r8.ir.conversion.CfSourceCode.buildExceptionalExitMethodSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):445:450 -> a
-    90:95:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):509 -> a
-    96:107:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):512:523 -> a
-    108:115:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):520:527 -> a
-    116:125:void com.android.tools.r8.ir.conversion.CfSourceCode.setLocalVariableLists():763:772 -> a
-    116:125:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):528 -> a
-    126:128:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):530:532 -> a
-    129:131:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState$Snapshot.exceptionTransfer(com.android.tools.r8.graph.DexType):326:328 -> a
-    129:131:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):532 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    132:132:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):533:533 -> a
-    133:133:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
-    133:133:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
-    133:133:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):533 -> a
-    134:135:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):533:534 -> a
-    136:136:boolean com.android.tools.r8.ir.conversion.CfSourceCode.localsChanged():776:776 -> a
-    136:136:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):538 -> a
-    137:140:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):540:543 -> a
-    141:141:void com.android.tools.r8.ir.conversion.CfSourceCode.endLocals(com.android.tools.r8.ir.conversion.IRBuilder):780:780 -> a
-    141:141:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):562 -> a
-    142:142:boolean com.android.tools.r8.ir.conversion.CfSourceCode.localsChanged():776:776 -> a
-    142:142:void com.android.tools.r8.ir.conversion.CfSourceCode.endLocals(com.android.tools.r8.ir.conversion.IRBuilder):780 -> a
+    46:46:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.<init>():104:104 -> a
+    46:46:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):103 -> a
+    46:46:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
+    47:75:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):105:133 -> a
+    47:75:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
+    76:83:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340:347 -> a
+    84:84:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():420:420 -> a
+    84:84:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):751 -> a
+    85:90:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):754:759 -> a
+    91:96:void com.android.tools.r8.ir.conversion.CfSourceCode.buildExceptionalExitMethodSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):445:450 -> a
+    91:96:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):509 -> a
+    97:108:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):512:523 -> a
+    109:116:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):520:527 -> a
+    117:126:void com.android.tools.r8.ir.conversion.CfSourceCode.setLocalVariableLists():763:772 -> a
+    117:126:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):528 -> a
+    127:129:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):530:532 -> a
+    130:132:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState$Snapshot.exceptionTransfer(com.android.tools.r8.graph.DexType):326:328 -> a
+    130:132:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):532 -> a
+    133:133:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):533:533 -> a
+    134:134:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
+    134:134:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
+    134:134:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):533 -> a
+    135:136:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):533:534 -> a
+    137:137:boolean com.android.tools.r8.ir.conversion.CfSourceCode.localsChanged():776:776 -> a
+    137:137:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):538 -> a
+    138:141:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):540:543 -> a
+    142:142:void com.android.tools.r8.ir.conversion.CfSourceCode.endLocals(com.android.tools.r8.ir.conversion.IRBuilder):780:780 -> a
     142:142:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):562 -> a
-    143:146:void com.android.tools.r8.ir.conversion.CfSourceCode.endLocals(com.android.tools.r8.ir.conversion.IRBuilder):780:783 -> a
-    143:146:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):562 -> a
-    147:154:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):545:552 -> a
-    155:155:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
-    155:155:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
-    155:155:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):552 -> a
-    156:161:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):552:557 -> a
-    162:162:void com.android.tools.r8.ir.conversion.CfSourceCode.build(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.conversion.IRBuilder):581:581 -> a
-    162:162:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):565 -> a
-    163:169:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):567:573 -> a
-    170:170:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):789:789 -> a
-    170:170:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    171:171:boolean com.android.tools.r8.ir.conversion.CfSourceCode.localsChanged():776:776 -> a
-    171:171:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):789 -> a
+    143:143:boolean com.android.tools.r8.ir.conversion.CfSourceCode.localsChanged():776:776 -> a
+    143:143:void com.android.tools.r8.ir.conversion.CfSourceCode.endLocals(com.android.tools.r8.ir.conversion.IRBuilder):780 -> a
+    143:143:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):562 -> a
+    144:147:void com.android.tools.r8.ir.conversion.CfSourceCode.endLocals(com.android.tools.r8.ir.conversion.IRBuilder):780:783 -> a
+    144:147:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):562 -> a
+    148:155:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):545:552 -> a
+    156:156:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
+    156:156:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
+    156:156:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):552 -> a
+    157:162:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):552:557 -> a
+    163:163:void com.android.tools.r8.ir.conversion.CfSourceCode.build(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.conversion.IRBuilder):581:581 -> a
+    163:163:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):565 -> a
+    164:170:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):567:573 -> a
+    171:171:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):789:789 -> a
     171:171:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    172:177:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):789:794 -> a
-    172:177:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    178:178:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":203,"2":204,"3":205}}
-    203:203:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):794:794 -> a
-    203:203:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    172:172:boolean com.android.tools.r8.ir.conversion.CfSourceCode.localsChanged():776:776 -> a
+    172:172:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):789 -> a
+    172:172:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    173:178:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):789:794 -> a
+    173:178:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    179:179:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":204,"2":205,"3":206}}
     204:204:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):794:794 -> a
     204:204:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
     205:205:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):794:794 -> a
     205:205:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    179:179:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):794:794 -> a
-    179:179:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    180:192:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):806:818 -> a
-    180:192:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
-    180:192:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    193:193:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):816:816 -> a
-    193:193:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
-    193:193:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    194:194:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):814:814 -> a
+    206:206:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):794:794 -> a
+    206:206:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    180:180:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):794:794 -> a
+    180:180:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    181:193:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):806:818 -> a
+    181:193:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
+    181:193:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    194:194:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):816:816 -> a
     194:194:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
     194:194:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    195:195:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):812:812 -> a
+    195:195:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):814:814 -> a
     195:195:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
     195:195:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    196:196:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):810:810 -> a
+    196:196:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):812:812 -> a
     196:196:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
     196:196:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    197:197:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):808:808 -> a
+    197:197:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):810:810 -> a
     197:197:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
     197:197:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    198:202:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796:800 -> a
-    198:202:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
-    206:209:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):455:458 -> a
-    210:212:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):471:471 -> a
-    216:240:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):475:499 -> a
-    241:242:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):585:586 -> a
-    243:247:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):122:126 -> a
-    243:247:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
-    248:263:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):130:145 -> a
-    248:263:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    248:263:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
-    264:264:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":287,"2":288,"3":289,"4":290,"5":291}}
-    287:287:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145:145 -> a
-    287:287:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    287:287:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    198:198:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):808:808 -> a
+    198:198:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
+    198:198:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    199:203:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796:800 -> a
+    199:203:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    207:210:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):455:458 -> a
+    211:213:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):471:471 -> a
+    217:241:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):475:499 -> a
+    242:243:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):585:586 -> a
+    244:248:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):122:126 -> a
+    244:248:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    249:264:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):130:145 -> a
+    249:264:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
+    249:264:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    265:265:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":288,"2":289,"3":290,"4":291,"5":292}}
     288:288:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145:145 -> a
     288:288:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
     288:288:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
@@ -49676,93 +49190,98 @@
     291:291:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145:145 -> a
     291:291:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
     291:291:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
-    265:265:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145:145 -> a
-    265:265:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    265:265:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
-    266:266:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    266:266:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    266:266:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145 -> a
-    266:266:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    266:266:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
-    267:267:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145:145 -> a
-    267:267:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    267:267:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
-    268:268:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):588:588 -> a
-    269:269:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
-    269:269:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    269:269:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
-    270:270:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":292,"2":293,"3":294}}
-    292:292:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
+    292:292:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145:145 -> a
     292:292:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
     292:292:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    266:266:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145:145 -> a
+    266:266:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
+    266:266:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    267:267:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    267:267:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    267:267:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145 -> a
+    267:267:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
+    267:267:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    268:268:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145:145 -> a
+    268:268:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
+    268:268:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    269:269:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):588:588 -> a
+    270:270:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
+    270:270:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
+    270:270:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    271:271:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":293,"2":294,"3":295}}
     293:293:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
     293:293:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
     293:293:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
     294:294:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
     294:294:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
     294:294:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
-    271:271:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
-    271:271:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    271:271:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
-    272:272:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    272:272:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    272:272:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131 -> a
+    295:295:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
+    295:295:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
+    295:295:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    272:272:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
     272:272:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
     272:272:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
-    273:273:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
+    273:273:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    273:273:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    273:273:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131 -> a
     273:273:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
     273:273:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
-    295:296:int getLabelOffset(com.android.tools.r8.cf.code.CfLabel):597:598 -> a
-    297:310:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):602:615 -> a
-    311:314:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):614:617 -> a
-    315:317:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isFirstFrameInBlock():624:626 -> a
-    315:317:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):618 -> a
-    318:318:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    318:318:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isFirstFrameInBlock():626 -> a
-    318:318:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):618 -> a
-    319:319:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    274:274:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
+    274:274:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
+    274:274:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    296:297:int getLabelOffset(com.android.tools.r8.cf.code.CfLabel):597:598 -> a
+    298:311:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):602:615 -> a
+    312:315:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):614:617 -> a
+    316:318:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isFirstFrameInBlock():624:626 -> a
+    316:318:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):618 -> a
+    319:319:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
     319:319:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isFirstFrameInBlock():626 -> a
     319:319:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):618 -> a
-    320:320:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):619:619 -> a
-    321:344:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.CfFrame$FrameType):635:658 -> a
-    345:345:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):672:672 -> a
-    346:359:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):678:691 -> a
-    360:360:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1106,"2":1107,"3":1108,"4":1109,"5":1110,"6":1111}}
-    1106:1106:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
-    1107:1107:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
-    1108:1108:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
-    1109:1109:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
-    1110:1110:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
-    1111:1111:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
-    1051:1051:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
-    1052:1105:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):688:741 -> a
-    1112:1113:boolean isControlFlow(com.android.tools.r8.cf.code.CfInstruction):823:824 -> a
-    1114:1114:boolean hasValidTypesFromStackMap():866:866 -> a
-    1115:1119:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):903:907 -> a
-    1120:1122:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):906:908 -> a
-    1123:1123:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):903:903 -> a
+    320:320:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    320:320:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isFirstFrameInBlock():626 -> a
+    320:320:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):618 -> a
+    321:321:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):619:619 -> a
+    322:345:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.CfFrame$FrameType):635:658 -> a
+    346:346:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):672:672 -> a
+    347:360:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):678:691 -> a
+    361:361:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1097,"2":1098,"3":1099,"4":1100,"5":1101,"6":1102}}
+    1097:1097:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
+    1098:1098:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
+    1099:1099:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
+    1100:1100:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
+    1101:1101:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
+    1102:1102:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
+    1052:1052:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):691:691 -> a
+    1053:1053:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):688:688 -> a
+    1054:1055:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition(int):263:264 -> a
+    1054:1055:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):701 -> a
+    1056:1096:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):701:741 -> a
+    1103:1104:boolean isControlFlow(com.android.tools.r8.cf.code.CfInstruction):823:824 -> a
+    1105:1105:boolean hasValidTypesFromStackMap():866:866 -> a
+    1106:1110:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):903:907 -> a
+    1111:1113:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):906:908 -> a
+    1114:1114:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):903:903 -> a
     void setUp() -> b
     1:1:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):831:831 -> b
     2:2:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():420:420 -> b
     2:2:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):834 -> b
     3:5:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):837:839 -> b
-    6:6:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):838:838 -> b
-    7:8:boolean com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.isEmpty():89:90 -> b
-    7:8:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):840 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):843:843 -> b
-    10:18:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):872:872 -> b
-    27:40:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):881:894 -> b
-    41:41:boolean lambda$getCanonicalDebugPositionAtOffset$0(com.android.tools.r8.cf.code.CfInstruction):876:876 -> b
+    6:8:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):838:840 -> b
+    9:10:boolean com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.isEmpty():89:90 -> b
+    9:10:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):840 -> b
+    11:11:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):843:843 -> b
+    12:20:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):872:872 -> b
+    29:42:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):881:894 -> b
+    43:43:boolean lambda$getCanonicalDebugPositionAtOffset$0(com.android.tools.r8.cf.code.CfInstruction):876:876 -> b
     1:3:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):388:390 -> c
     4:13:void com.android.tools.r8.ir.conversion.CfSourceCode.setLocalVariableLists():763:772 -> c
     4:13:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):391 -> c
     14:34:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):392:412 -> c
     35:47:void com.android.tools.r8.ir.conversion.CfSourceCode.buildMethodEnterSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):428:440 -> c
     35:47:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):413 -> c
-    48:50:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1343:1345 -> c
+    48:50:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1299:1301 -> c
     48:50:void com.android.tools.r8.ir.conversion.CfSourceCode.buildMethodEnterSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):440 -> c
     48:50:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):413 -> c
     51:52:void com.android.tools.r8.ir.conversion.CfSourceCode.buildMethodEnterSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):440:441 -> c
@@ -49786,7 +49305,6 @@
     1:1:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):351:351 -> h
     2:2:boolean com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList.validFor(int):180:180 -> h
     2:2:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):351 -> h
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:6:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):352:355 -> h
     7:7:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():878:878 -> h
     8:11:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():875:878 -> h
@@ -49798,16 +49316,16 @@
     397:397:int[] getTargets(int):366:366 -> i
     376:392:int[] getTargets(int):367:383 -> i
     393:394:int[] getTargets(int):363:364 -> i
-com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.x8:
+com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.o8:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():806:806 -> <clinit>
-com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.y8:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.p8:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap locals -> c
     int endOffset -> b
     int startOffset -> a
     1:4:void <init>(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):145:148 -> <init>
     1:19:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):158:176 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.z8:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.q8:
     java.util.List guards -> c
     boolean $assertionsDisabled -> e
     int endOffset -> b
@@ -49815,13 +49333,13 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList offsets -> d
     1:1:void <clinit>():70:70 -> <clinit>
     1:5:void <init>(int,int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):77:81 -> <init>
-com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.B8:
+com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.s8:
     1:1:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.conversion.CfSourceUtils.getLastInstruction(java.util.List):24:24 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):14 -> a
     2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
     2:2:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):15 -> a
     3:6:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):16:19 -> a
-com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.O8:
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.E8:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> a
     com.android.tools.r8.ir.code.Position position -> b
     boolean $assertionsDisabled -> c
@@ -49926,8 +49444,7 @@
     6:6:void com.android.tools.r8.ir.conversion.CfState.updateState(com.android.tools.r8.ir.conversion.CfState$Snapshot):183:183 -> e
     6:6:com.android.tools.r8.ir.conversion.CfState$Slot pop():188 -> e
     1:1:java.lang.String toString():236:236 -> toString
-com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.internal.E8:
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.F8:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.v8:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> c
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> d
     boolean $assertionsDisabled -> e
@@ -49955,7 +49472,7 @@
     436:436:java.lang.String toString():419:419 -> toString
     437:437:java.lang.String toString():419:419 -> toString
     421:434:java.lang.String toString():420:433 -> toString
-com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.G8:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.w8:
     int stackHeight -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():476:476 -> <clinit>
@@ -49964,34 +49481,58 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():499:499 -> c
     1:1:int stackHeight():488:488 -> d
     1:1:java.lang.String toString():504:504 -> toString
-com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.H8:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.x8:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():437:437 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$SlotType):442:444 -> <init>
     1:2:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):464:465 -> a
-    3:3:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> a
-    3:3:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> a
+    3:3:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239:239 -> a
     3:3:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):465 -> a
-    4:5:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):465:466 -> a
-    6:6:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> a
-    6:6:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> a
-    6:6:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):466 -> a
-    7:7:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):466:466 -> a
+    4:4:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> a
+    4:4:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> a
+    4:4:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):465 -> a
+    5:6:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition(int):263:264 -> a
+    5:6:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259 -> a
+    5:6:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> a
+    5:6:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):465 -> a
+    7:8:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):465:466 -> a
+    9:9:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239:239 -> a
+    9:9:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):466 -> a
+    10:10:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> a
+    10:10:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> a
+    10:10:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):466 -> a
+    11:12:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition(int):263:264 -> a
+    11:12:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259 -> a
+    11:12:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> a
+    11:12:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):466 -> a
+    13:13:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):466:466 -> a
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):454:454 -> b
-    2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> b
-    2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> b
+    2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239:239 -> b
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):454 -> b
-    3:3:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState$Push.peek():459:459 -> b
+    3:3:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> b
+    3:3:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> b
     3:3:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):454 -> b
-    4:4:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):454:454 -> b
+    4:5:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition(int):263:264 -> b
+    4:5:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259 -> b
+    4:5:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> b
+    4:5:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):454 -> b
+    6:6:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState$Push.peek():459:459 -> b
+    6:6:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):454 -> b
+    7:7:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):454:454 -> b
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():459:459 -> c
     1:1:int stackHeight():449:449 -> d
-    2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> d
-    2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> d
+    2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239:239 -> d
     2:2:int stackHeight():449 -> d
+    3:3:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> d
+    3:3:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> d
+    3:3:int stackHeight():449 -> d
+    4:5:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition(int):263:264 -> d
+    4:5:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259 -> d
+    4:5:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> d
+    4:5:int stackHeight():449 -> d
     1:1:java.lang.String toString():472:472 -> toString
-com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.I8:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.y8:
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> d
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> e
@@ -50003,10 +49544,9 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$SlotType access$100(com.android.tools.r8.ir.conversion.CfState$Slot):239:239 -> a
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState$Slot.stackSlot(int,com.android.tools.r8.ir.conversion.CfState$SlotType):255:255 -> a
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot access$300(int,com.android.tools.r8.ir.conversion.CfState$SlotType):239 -> a
-    3:4:int stackPosition(int):263:264 -> a
-    5:5:boolean isPrecise():284:284 -> a
-    6:6:boolean com.android.tools.r8.ir.conversion.CfState$SlotType.isPrecise():0:0 -> a
-    6:6:boolean isPrecise():284 -> a
+    3:3:boolean isPrecise():284:284 -> a
+    4:4:boolean com.android.tools.r8.ir.conversion.CfState$SlotType.isPrecise():0:0 -> a
+    4:4:boolean isPrecise():284 -> a
     1:2:java.lang.String toString():270:271 -> toString
     3:3:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":276,"2":277,"3":278}}
@@ -50014,12 +49554,12 @@
     277:277:java.lang.String toString():272:272 -> toString
     278:278:java.lang.String toString():272:272 -> toString
     275:275:java.lang.String toString():272:272 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.L8:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.B8:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.CfState$1):14:14 -> <init>
     com.android.tools.r8.ir.code.ValueType getImprecise() -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
-com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.J8:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.z8:
     com.android.tools.r8.ir.code.ValueType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):56:57 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():67:67 -> a
@@ -50030,7 +49570,7 @@
     75:75:java.lang.String toString():72:72 -> toString
     76:76:java.lang.String toString():72:72 -> toString
     73:73:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.K8:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.A8:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):27:28 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():38:38 -> a
@@ -50041,7 +49581,7 @@
     46:46:java.lang.String toString():43:43 -> toString
     47:47:java.lang.String toString():43:43 -> toString
     44:44:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.M8:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.C8:
     com.android.tools.r8.ir.conversion.CfState$Snapshot parent -> a
     int updates -> b
     1:1:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,int,com.android.tools.r8.ir.conversion.CfState$1):288:288 -> <init>
@@ -50055,7 +49595,7 @@
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):306:306 -> b
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():310:310 -> c
     1:1:int stackHeight():298:298 -> d
-com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.N8:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.D8:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():508:508 -> <clinit>
@@ -50064,7 +49604,7 @@
     2:3:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):530:531 -> a
     1:1:int maxLocal():520:520 -> b
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.ir.conversion.ClassConverter -> com.android.tools.r8.internal.M9:
+com.android.tools.r8.ir.conversion.ClassConverter -> com.android.tools.r8.internal.C9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> c
     boolean $assertionsDisabled -> e
@@ -50081,28 +49621,27 @@
     68:68:void lambda$internalConvertClasses$0(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass):101:101 -> a
     69:73:void lambda$internalConvertClasses$1(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):117:121 -> a
     1:1:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):139:139 -> b
-com.android.tools.r8.ir.conversion.ClassConverter$DefaultClassConverter -> com.android.tools.r8.internal.K9:
+com.android.tools.r8.ir.conversion.ClassConverter$DefaultClassConverter -> com.android.tools.r8.internal.A9:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):151:151 -> <init>
     void notifyAllClassesConverted() -> a
     1:1:void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):157:157 -> a
-com.android.tools.r8.ir.conversion.ClassConverter$LibraryDesugaredClassConverter -> com.android.tools.r8.internal.L9:
+com.android.tools.r8.ir.conversion.ClassConverter$LibraryDesugaredClassConverter -> com.android.tools.r8.internal.B9:
     java.util.Set alreadyLibraryDesugared -> f
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):175:175 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):168:168 -> <init>
     1:5:void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):183:187 -> a
     6:6:void notifyAllClassesConverted():193:193 -> a
-com.android.tools.r8.ir.conversion.ClassConverterResult -> com.android.tools.r8.internal.P9:
+com.android.tools.r8.ir.conversion.ClassConverterResult -> com.android.tools.r8.internal.E9:
     java.util.Map forcefullyMovedLambdaMethods -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.ir.conversion.ClassConverterResult$1):12:12 -> <init>
     2:3:void <init>(java.util.Map):16:17 -> <init>
     1:1:java.util.Map getForcefullyMovedLambdaMethods():25:25 -> a
-com.android.tools.r8.ir.conversion.ClassConverterResult$1 -> com.android.tools.r8.internal.N9:
-com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.O9:
+com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.D9:
     java.util.Map forcefullyMovedLambdaMethods -> a
     1:3:void <init>():28:30 -> <init>
     1:1:void acceptForcefullyMovedLambdaMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):34:34 -> b
     2:2:com.android.tools.r8.ir.conversion.ClassConverterResult build():38:38 -> b
-com.android.tools.r8.ir.conversion.D8MethodProcessor -> com.android.tools.r8.internal.te:
+com.android.tools.r8.ir.conversion.D8MethodProcessor -> com.android.tools.r8.internal.Ud:
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> f
     java.util.Set scheduled -> c
     java.util.List nonTerminalFutures -> e
@@ -50140,7 +49679,7 @@
     1:1:void newWave():56:56 -> d
     1:6:com.android.tools.r8.utils.Timing lambda$scheduleDesugaredMethodForProcessing$1(com.android.tools.r8.graph.ProgramMethod):111:111 -> e
     7:8:boolean verifyNoPendingMethodProcessing():157:158 -> e
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.og:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.Wf:
     boolean hasBackwardsBranch -> n
     int inRegisterCount -> l
     int outRegisterCount -> m
@@ -50195,7 +49734,7 @@
     111:111:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):601:601 -> a
     111:111:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):441 -> a
     112:125:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):443:456 -> a
-    126:126:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    126:126:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     126:126:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):457 -> a
     127:148:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):459:480 -> a
     149:149:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):0:0 -> a
@@ -50270,39 +49809,37 @@
     921:933:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):763:775 -> a
     934:934:boolean com.android.tools.r8.ir.code.CatchHandlers.isEmpty():55:55 -> a
     934:934:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):775 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    935:935:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):775:775 -> a
-    936:936:boolean com.android.tools.r8.ir.code.CatchHandlers.isEmpty():55:55 -> a
-    936:936:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):776 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    937:971:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):777:811 -> a
-    972:976:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):843:847 -> a
-    972:976:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811 -> a
-    977:977:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811:811 -> a
-    978:978:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):850:850 -> a
-    978:978:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811 -> a
-    979:1003:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):813:837 -> a
-    1004:1008:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):843:847 -> a
-    1004:1008:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):837 -> a
-    1009:1009:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):837:837 -> a
-    1010:1010:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):850:850 -> a
-    1010:1010:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):837 -> a
-    1:1:void com.android.tools.r8.ir.conversion.DexBuilder.needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):524:524 -> b
-    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):84 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):540:540 -> b
-    3:3:void addNothing(com.android.tools.r8.ir.code.Instruction):593:593 -> b
-    4:4:com.android.tools.r8.utils.InternalOptions getOptions():889:889 -> b
+    935:936:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):775:776 -> a
+    937:937:boolean com.android.tools.r8.ir.code.CatchHandlers.isEmpty():55:55 -> a
+    937:937:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):776 -> a
+    938:972:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):777:811 -> a
+    973:977:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):843:847 -> a
+    973:977:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811 -> a
+    978:978:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811:811 -> a
+    979:979:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):850:850 -> a
+    979:979:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811 -> a
+    980:1004:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):813:837 -> a
+    1005:1009:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):843:847 -> a
+    1005:1009:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):837 -> a
+    1010:1010:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):837:837 -> a
+    1011:1011:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):850:850 -> a
+    1011:1011:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):837 -> a
+    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):84:84 -> b
+    2:2:void com.android.tools.r8.ir.conversion.DexBuilder.needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):524:524 -> b
+    2:2:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):84 -> b
+    3:3:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):540:540 -> b
+    4:4:void addNothing(com.android.tools.r8.ir.code.Instruction):593:593 -> b
+    5:5:com.android.tools.r8.utils.InternalOptions getOptions():889:889 -> b
     1:2:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):679:680 -> c
     3:3:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):674:674 -> c
     3:3:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):680 -> c
     4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):680:680 -> c
     5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():893:893 -> c
     1:1:boolean isBuildingForComparison():169:169 -> d
-com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.dg:
+com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.Lf:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():1293:1293 -> <clinit>
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.eg:
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.Mf:
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1062:1062 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -50310,11 +49847,11 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.fg:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.Nf:
     com.android.tools.r8.code.FillArrayData dex -> b
     com.android.tools.r8.ir.code.NewArrayFilledData ir -> a
     1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1539:1541 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.gg:
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.Of:
     com.android.tools.r8.code.Instruction instruction -> e
     1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):969:970 -> <init>
     1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):990:991 -> a
@@ -50323,7 +49860,7 @@
     1:1:int getSize():975:975 -> d
     1:1:int maxSize():985:985 -> e
     1:1:int minSize():980:980 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.hg:
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.Pf:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1095:1095 -> <clinit>
@@ -50348,7 +49885,7 @@
     1:2:int getSize():1109:1110 -> d
     1:1:int maxSize():1121:1121 -> e
     1:1:int minSize():1115:1115 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.ig:
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.Qf:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1226:1226 -> <clinit>
@@ -50466,10 +50003,8 @@
     109:109:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1226:1226 -> a
     109:109:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1247 -> a
     109:109:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1370 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     110:110:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1247:1247 -> a
     110:110:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1370 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     111:111:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1370:1370 -> a
     112:112:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1226:1226 -> a
     112:112:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1247 -> a
@@ -50577,7 +50112,7 @@
     1:1:int getSize():1361:1361 -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.jg:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.Rf:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
@@ -50597,7 +50132,7 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.kg:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.Sf:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1375:1375 -> <clinit>
@@ -50668,7 +50203,7 @@
     1:2:int getSize():1487:1488 -> d
     1:1:int maxSize():1481:1481 -> e
     1:1:int minSize():1475:1475 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.lg:
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.Tf:
     int size -> f
     com.android.tools.r8.code.Instruction[] instructions -> e
     1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):1013:1019 -> <init>
@@ -50678,18 +50213,18 @@
     1:1:int getSize():1049:1049 -> d
     1:1:int maxSize():1044:1044 -> e
     1:1:int minSize():1039:1039 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.mg:
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.Uf:
     com.android.tools.r8.ir.code.IntSwitch ir -> a
     com.android.tools.r8.code.Format31t dex -> b
     1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):1528:1530 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.ng:
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.Vf:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> b
     int end -> d
     int start -> c
     1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1511:1514 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1519:1519 -> a
     1:1:int compareTo(java.lang.Object):1505:1505 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.ch:
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.Kg:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.code.Position currentPosition -> j
     com.android.tools.r8.graph.DexMethod originalMethod -> m
@@ -50784,1929 +50319,1922 @@
     2:2:int instructionOffset(int):288:288 -> e
     1:1:boolean verifyRegister(int):103:103 -> f
     1:1:int instructionIndex(int):283:283 -> g
-com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.oj:
+com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.Wi:
     long value -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():12:12 -> <clinit>
-    1:2:void <init>(long):16:17 -> <init>
-    1:2:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):22:23 -> a
-    3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):28:28 -> a
-    1:5:boolean equals(java.lang.Object):33:37 -> equals
-    1:1:int hashCode():42:42 -> hashCode
-com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.pj:
-    1:1:void <init>():12:12 -> <init>
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:2:void <init>(long):17:18 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):23:23 -> a
+    2:3:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):28:29 -> a
+    4:4:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):34:34 -> a
+    1:5:boolean equals(java.lang.Object):39:43 -> equals
+    1:1:int hashCode():48:48 -> hashCode
+com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.Xi:
+    1:1:void <init>():13:13 -> <init>
+    com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory) -> a
     com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.qj:
-    1:1:void <init>():13:13 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):17:17 -> a
-    2:2:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):22:22 -> a
-    1:1:boolean equals(java.lang.Object):27:27 -> equals
-com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Uj:
+com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.Yi:
+    com.android.tools.r8.graph.DexType type -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexType):23:24 -> <init>
+    1:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):29:30 -> a
+    3:3:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):35:35 -> a
+    4:4:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):40:40 -> a
+    1:1:boolean equals(java.lang.Object):45:45 -> equals
+com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Bj:
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
     void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.DynamicType) -> a
     void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue) -> a
-com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.qn:
-    com.android.tools.r8.ir.conversion.SourceCode source -> v
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.Um:
     java.util.Queue ssaWorklist -> f
     int currentInstructionOffset -> j
+    com.android.tools.r8.ir.code.Value previousLocalValue -> w
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap uninitializedDebugLocalValues -> y
     java.util.List argumentValues -> t
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> i
+    java.util.List impreciseInstructions -> z
     com.android.tools.r8.ir.code.Value receiverValue -> s
-    boolean throwingInstructionInCurrentBlock -> w
+    java.util.List debugLocalEnds -> x
+    int $r8$clinit -> E
     com.android.tools.r8.graph.RewrittenPrototypeDescription prototypeChanges -> r
     com.android.tools.r8.graph.AppView appView -> o
-    java.util.List impreciseInstructions -> A
+    com.android.tools.r8.ir.code.IRMetadata metadata -> C
     java.util.Set processedSubroutineInstructions -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap offsets -> b
     boolean[] processedInstructions -> d
     com.android.tools.r8.ir.code.NumberGenerator valueNumberGenerator -> k
-    boolean $assertionsDisabled -> E
     com.android.tools.r8.graph.ProgramMethod method -> m
     java.util.LinkedList blocks -> g
+    boolean hasImpreciseValues -> A
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap targets -> a
-    boolean hasIncorrectStackMapTypes -> C
     com.android.tools.r8.ir.code.BasicBlock entryBlock -> h
+    com.android.tools.r8.ir.conversion.SourceCode source -> u
     com.android.tools.r8.origin.Origin origin -> q
     java.util.Queue traceBlocksWorklist -> c
-    com.android.tools.r8.ir.code.Value previousLocalValue -> x
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap uninitializedDebugLocalValues -> z
-    java.util.List pendingArgumentInstructions -> u
-    int $r8$clinit -> F
-    java.util.List debugLocalEnds -> y
+    boolean throwingInstructionInCurrentBlock -> v
     com.android.tools.r8.graph.GraphLens codeLens -> p
-    com.android.tools.r8.ir.code.IRMetadata metadata -> D
     com.android.tools.r8.ir.code.NumberGenerator basicBlockNumberGenerator -> l
     com.android.tools.r8.graph.ProgramMethod context -> n
-    boolean hasImpreciseValues -> B
-    1:1:void <clinit>():157:157 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.ir.code.NumberGenerator):481:481 -> <init>
-    2:118:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.ir.code.NumberGenerator):375:491 -> <init>
-    1:4:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):439:442 -> a
-    5:5:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):463:463 -> a
-    5:5:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):445 -> a
-    6:6:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):445:445 -> a
-    7:7:com.android.tools.r8.ir.conversion.IRBuilder createForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.graph.RewrittenPrototypeDescription):457:457 -> a
-    8:9:void addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):533:534 -> a
-    10:17:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):544:551 -> a
-    18:21:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):984:987 -> a
-    18:21:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):552 -> a
-    22:26:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):992:996 -> a
-    22:26:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):988 -> a
-    22:26:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):552 -> a
-    27:28:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558:559 -> a
-    29:29:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():204:204 -> a
-    29:29:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):560 -> a
-    30:37:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):560:567 -> a
-    38:38:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
-    38:38:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):567 -> a
-    39:43:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):568:572 -> a
-    44:44:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):571:571 -> a
-    45:53:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1033:1041 -> a
-    45:53:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    45:53:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    54:54:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():42:42 -> a
-    54:54:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1041 -> a
-    54:54:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    54:54:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    55:56:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1042:1043 -> a
-    55:56:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    55:56:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    57:57:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    57:57:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1043 -> a
-    57:57:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    57:57:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    58:58:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    58:58:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    58:58:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1043 -> a
-    58:58:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    58:58:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    59:64:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1044:1049 -> a
-    59:64:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    59:64:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    65:72:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1045:1052 -> a
-    65:72:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    65:72:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    73:73:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo.defaultForInstruction(com.android.tools.r8.ir.code.Instruction):128:128 -> a
-    73:73:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1053 -> a
-    73:73:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    73:73:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    74:75:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeRegister(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2369:2370 -> a
-    74:75:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1050 -> a
-    74:75:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    74:75:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    76:76:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1054:1054 -> a
-    76:76:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    76:76:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    77:77:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo.isNeverUsed():160:160 -> a
-    77:77:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1056 -> a
-    77:77:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    77:77:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    78:78:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1056:1056 -> a
-    78:78:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1028 -> a
-    78:78:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573 -> a
-    79:79:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
-    79:79:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):576 -> a
-    80:82:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):577:579 -> a
-    83:111:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):578:606 -> a
-    112:113:void com.android.tools.r8.ir.conversion.IRBuilder.addExtraUnusedNullArgument(int):1003:1004 -> a
-    112:113:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):607 -> a
-    114:118:void com.android.tools.r8.ir.conversion.IRBuilder.addNonThisArgument(com.android.tools.r8.ir.code.Argument):1020:1024 -> a
-    114:118:void com.android.tools.r8.ir.conversion.IRBuilder.addExtraUnusedNullArgument(int):1004 -> a
-    114:118:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):607 -> a
-    119:123:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):609:613 -> a
-    124:140:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):623:639 -> a
-    141:142:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2520:2521 -> a
-    141:142:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):641 -> a
-    143:144:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2538:2539 -> a
-    143:144:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2523 -> a
-    143:144:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):641 -> a
-    145:145:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2524:2524 -> a
-    145:145:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):641 -> a
-    146:146:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2528:2528 -> a
-    146:146:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):646 -> a
-    147:148:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2520:2521 -> a
-    147:148:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2528 -> a
-    147:148:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):646 -> a
-    149:150:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2538:2539 -> a
-    149:150:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2523 -> a
-    149:150:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2528 -> a
-    149:150:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):646 -> a
-    151:151:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2524:2524 -> a
-    151:151:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2528 -> a
-    151:151:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):646 -> a
-    152:154:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2528:2530 -> a
-    152:154:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):646 -> a
-    155:156:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2538:2539 -> a
-    155:156:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2533 -> a
-    155:156:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):646 -> a
-    157:157:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2534:2534 -> a
-    157:157:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):646 -> a
-    158:168:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):647:657 -> a
-    169:169:void com.android.tools.r8.ir.conversion.IRBuilder.ensureNormalSuccessorBlock(int,int):2559:2559 -> a
-    169:169:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
-    170:172:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664:666 -> a
-    173:173:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):539:539 -> a
-    173:173:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
-    174:179:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667:672 -> a
-    180:185:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():881:886 -> a
-    180:185:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
-    186:186:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):539:539 -> a
-    186:186:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():886 -> a
-    186:186:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
-    187:191:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():887:891 -> a
-    187:191:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
-    192:216:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):932:956 -> a
-    192:216:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():891 -> a
-    192:216:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
-    217:222:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):955:960 -> a
-    217:222:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():891 -> a
-    217:222:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
-    223:230:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():892:899 -> a
-    223:230:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
-    231:254:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():898:921 -> a
-    231:254:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
-    255:258:void com.android.tools.r8.ir.conversion.IRBuilder.closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2604:2607 -> a
-    255:258:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():921 -> a
-    255:258:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
-    259:260:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():924:925 -> a
-    259:260:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
-    261:261:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():881:881 -> a
-    261:261:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
-    262:262:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676:676 -> a
-    263:264:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():820:821 -> a
-    263:264:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
-    265:270:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):827:832 -> a
-    265:270:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():821 -> a
-    265:270:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
-    271:271:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():306:306 -> a
-    271:271:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):832 -> a
-    271:271:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():821 -> a
-    271:271:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
-    272:278:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):849:855 -> a
-    272:278:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):832 -> a
-    272:278:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():821 -> a
-    272:278:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
-    279:280:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):872:873 -> a
-    279:280:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):856 -> a
-    279:280:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):832 -> a
-    279:280:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():821 -> a
-    279:280:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
+    boolean hasIncorrectStackMapTypes -> B
+    boolean $assertionsDisabled -> D
+    1:1:void <clinit>():155:155 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.ir.code.NumberGenerator):477:477 -> <init>
+    2:116:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.ir.code.NumberGenerator):373:487 -> <init>
+    1:4:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):435:438 -> a
+    5:5:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):459:459 -> a
+    5:5:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):441 -> a
+    6:6:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.GraphLens.lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):460:460 -> a
+    6:6:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):459 -> a
+    6:6:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):441 -> a
+    7:7:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):441:441 -> a
+    8:8:com.android.tools.r8.ir.conversion.IRBuilder createForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.graph.RewrittenPrototypeDescription):453:453 -> a
+    9:10:void addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):528:529 -> a
+    11:18:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):539:546 -> a
+    19:22:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):976:979 -> a
+    19:22:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):547 -> a
+    23:23:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2357:2357 -> a
+    23:23:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):984 -> a
+    23:23:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):980 -> a
+    23:23:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):547 -> a
+    24:27:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):985:988 -> a
+    24:27:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):980 -> a
+    24:27:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):547 -> a
+    28:29:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):553:554 -> a
+    30:30:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():204:204 -> a
+    30:30:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):555 -> a
+    31:38:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):555:562 -> a
+    39:39:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
+    39:39:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):562 -> a
+    40:44:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):563:567 -> a
+    45:47:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):566:568 -> a
+    48:48:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
+    48:48:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):571 -> a
+    49:51:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):572:574 -> a
+    52:79:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):573:600 -> a
+    80:83:void com.android.tools.r8.ir.conversion.IRBuilder.addExtraUnusedArgument(int,com.android.tools.r8.graph.DexType):995:998 -> a
+    80:83:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):601 -> a
+    84:84:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    84:84:void com.android.tools.r8.ir.conversion.IRBuilder.addExtraUnusedArgument(int,com.android.tools.r8.graph.DexType):998 -> a
+    84:84:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):601 -> a
+    85:85:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    85:85:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    85:85:void com.android.tools.r8.ir.conversion.IRBuilder.addExtraUnusedArgument(int,com.android.tools.r8.graph.DexType):998 -> a
+    85:85:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):601 -> a
+    86:88:void com.android.tools.r8.ir.conversion.IRBuilder.addExtraUnusedArgument(int,com.android.tools.r8.graph.DexType):998:1000 -> a
+    86:88:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):601 -> a
+    89:93:void com.android.tools.r8.ir.conversion.IRBuilder.addNonThisArgument(com.android.tools.r8.ir.code.Argument):1016:1020 -> a
+    89:93:void com.android.tools.r8.ir.conversion.IRBuilder.addExtraUnusedArgument(int,com.android.tools.r8.graph.DexType):1000 -> a
+    89:93:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):601 -> a
+    94:94:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):603:603 -> a
+    95:111:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):615:631 -> a
+    112:113:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2476:2477 -> a
+    112:113:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):633 -> a
+    114:115:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2494:2495 -> a
+    114:115:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2479 -> a
+    114:115:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):633 -> a
+    116:116:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2480:2480 -> a
+    116:116:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):633 -> a
+    117:117:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2484:2484 -> a
+    117:117:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):638 -> a
+    118:119:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2476:2477 -> a
+    118:119:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2484 -> a
+    118:119:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):638 -> a
+    120:121:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2494:2495 -> a
+    120:121:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2479 -> a
+    120:121:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2484 -> a
+    120:121:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):638 -> a
+    122:122:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2480:2480 -> a
+    122:122:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2484 -> a
+    122:122:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):638 -> a
+    123:125:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2484:2486 -> a
+    123:125:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):638 -> a
+    126:127:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2494:2495 -> a
+    126:127:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2489 -> a
+    126:127:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):638 -> a
+    128:128:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2490:2490 -> a
+    128:128:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):638 -> a
+    129:139:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):639:649 -> a
+    140:140:void com.android.tools.r8.ir.conversion.IRBuilder.ensureNormalSuccessorBlock(int,int):2515:2515 -> a
+    140:140:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):650 -> a
+    141:143:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656:658 -> a
+    144:144:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):534:534 -> a
+    144:144:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    145:150:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):659:664 -> a
+    151:156:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():873:878 -> a
+    151:156:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):665 -> a
+    157:157:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):534:534 -> a
+    157:157:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():878 -> a
+    157:157:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):665 -> a
+    158:162:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():879:883 -> a
+    158:162:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):665 -> a
+    163:187:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):924:948 -> a
+    163:187:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():883 -> a
+    163:187:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):665 -> a
+    188:193:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):947:952 -> a
+    188:193:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():883 -> a
+    188:193:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):665 -> a
+    194:201:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():884:891 -> a
+    194:201:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):665 -> a
+    202:225:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():890:913 -> a
+    202:225:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):665 -> a
+    226:229:void com.android.tools.r8.ir.conversion.IRBuilder.closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2560:2563 -> a
+    226:229:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():913 -> a
+    226:229:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):665 -> a
+    230:231:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():916:917 -> a
+    230:231:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):665 -> a
+    232:232:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():873:873 -> a
+    232:232:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):665 -> a
+    233:233:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668:668 -> a
+    234:235:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():812:813 -> a
+    234:235:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    236:241:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819:824 -> a
+    236:241:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():813 -> a
+    236:241:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    242:242:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():304:304 -> a
+    242:242:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):824 -> a
+    242:242:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():813 -> a
+    242:242:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    243:249:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):841:847 -> a
+    243:249:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):824 -> a
+    243:249:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():813 -> a
+    243:249:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    250:251:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):864:865 -> a
+    250:251:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):848 -> a
+    250:251:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):824 -> a
+    250:251:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():813 -> a
+    250:251:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    252:252:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    252:252:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):865 -> a
+    252:252:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):848 -> a
+    252:252:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):824 -> a
+    252:252:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():813 -> a
+    252:252:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    253:254:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):866:867 -> a
+    253:254:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):848 -> a
+    253:254:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):824 -> a
+    253:254:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():813 -> a
+    253:254:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    255:255:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):865:865 -> a
+    255:255:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):848 -> a
+    255:255:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):824 -> a
+    255:255:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():813 -> a
+    255:255:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    256:263:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):852:859 -> a
+    256:263:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):824 -> a
+    256:263:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():813 -> a
+    256:263:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    264:270:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):824:830 -> a
+    264:270:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():813 -> a
+    264:270:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    271:271:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):827:827 -> a
+    271:271:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():813 -> a
+    271:271:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    272:278:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():779:785 -> a
+    272:278:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    279:279:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():39:39 -> a
+    279:279:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():786 -> a
+    279:279:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    280:280:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():787:787 -> a
+    280:280:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
     281:281:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    281:281:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):873 -> a
-    281:281:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):856 -> a
-    281:281:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):832 -> a
-    281:281:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():821 -> a
-    281:281:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
-    282:283:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):874:875 -> a
-    282:283:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):856 -> a
-    282:283:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):832 -> a
-    282:283:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():821 -> a
-    282:283:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
-    284:284:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):873:873 -> a
-    284:284:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):856 -> a
-    284:284:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):832 -> a
-    284:284:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():821 -> a
-    284:284:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
-    285:292:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):860:867 -> a
-    285:292:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):832 -> a
-    285:292:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():821 -> a
-    285:292:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
-    293:299:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):832:838 -> a
-    293:299:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():821 -> a
-    293:299:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
-    300:300:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):835:835 -> a
-    300:300:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():821 -> a
-    300:300:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
-    301:307:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():787:793 -> a
-    301:307:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    308:308:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():38:38 -> a
-    308:308:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():794 -> a
-    308:308:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    309:309:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():795:795 -> a
-    309:309:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    310:310:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    310:310:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():796 -> a
-    310:310:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    311:311:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():797:797 -> a
-    311:311:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    312:312:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
-    312:312:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():799 -> a
-    312:312:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    313:318:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():800:805 -> a
-    313:318:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    319:319:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
-    319:319:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():806 -> a
-    319:319:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    320:322:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():807:809 -> a
-    320:322:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    323:323:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
-    323:323:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():810 -> a
-    323:323:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    324:324:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
-    324:324:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():811 -> a
-    324:324:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    325:325:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():38:38 -> a
-    325:325:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():812 -> a
-    325:325:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684 -> a
-    326:327:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):687:688 -> a
-    328:328:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
-    328:328:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):688 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    329:330:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):689:690 -> a
-    331:331:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
-    331:331:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):691 -> a
-    332:337:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):692:697 -> a
-    338:338:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
-    338:338:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    339:340:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):705:706 -> a
-    341:371:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2692:2722 -> a
-    341:371:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):711 -> a
-    372:372:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
-    372:372:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2722 -> a
-    372:372:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):711 -> a
-    373:373:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2722:2722 -> a
-    373:373:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):711 -> a
-    374:388:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2721:2735 -> a
-    374:388:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):711 -> a
-    389:400:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):571:582 -> a
-    389:400:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2739 -> a
-    389:400:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):711 -> a
-    401:401:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2740:2740 -> a
-    401:401:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):711 -> a
-    402:402:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2698:2698 -> a
-    402:402:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):711 -> a
-    403:403:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    403:403:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2698 -> a
-    403:403:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):711 -> a
-    404:404:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    404:404:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    404:404:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2698 -> a
-    404:404:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):711 -> a
-    405:449:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2698:2742 -> a
-    405:449:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):711 -> a
-    450:464:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):714:728 -> a
-    465:465:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1222:1222 -> a
-    465:465:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):731 -> a
-    466:469:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):732:735 -> a
-    470:470:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():763:763 -> a
-    470:470:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):739 -> a
-    471:476:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):739:744 -> a
-    477:477:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():763:763 -> a
-    477:477:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):744 -> a
-    478:480:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):744:746 -> a
-    481:481:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    481:481:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):746 -> a
-    482:482:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):746:746 -> a
-    483:483:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742:742 -> a
-    484:484:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    484:484:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
-    485:485:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742:742 -> a
-    486:499:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737:750 -> a
-    500:511: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
-    500:511:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    500:511:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    512:513:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):817:818 -> a
+    281:281:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():788 -> a
+    281:281:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    282:282:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():789:789 -> a
+    282:282:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    283:283:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
+    283:283:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():791 -> a
+    283:283:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    284:289:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():792:797 -> a
+    284:289:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    290:290:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
+    290:290:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():798 -> a
+    290:290:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    291:293:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():799:801 -> a
+    291:293:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    294:294:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():39:39 -> a
+    294:294:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():802 -> a
+    294:294:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    295:295:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):39:39 -> a
+    295:295:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():803 -> a
+    295:295:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    296:296:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():39:39 -> a
+    296:296:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():804 -> a
+    296:296:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    297:298:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):679:680 -> a
+    299:299:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    299:299:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):680 -> a
+    300:301:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681:682 -> a
+    302:302:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():39:39 -> a
+    302:302:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):683 -> a
+    303:308:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):684:689 -> a
+    309:309:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):39:39 -> a
+    309:309:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):690 -> a
+    310:311:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):697:698 -> a
+    312:342:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2648:2678 -> a
+    312:342:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):703 -> a
+    343:343:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    343:343:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2678 -> a
+    343:343:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):703 -> a
+    344:344:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2678:2678 -> a
+    344:344:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):703 -> a
+    345:359:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2677:2691 -> a
+    345:359:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):703 -> a
+    360:371:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):572:583 -> a
+    360:371:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2695 -> a
+    360:371:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):703 -> a
+    372:372:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2696:2696 -> a
+    372:372:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):703 -> a
+    373:373:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2654:2654 -> a
+    373:373:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):703 -> a
+    374:374:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    374:374:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2654 -> a
+    374:374:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):703 -> a
+    375:375:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    375:375:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    375:375:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2654 -> a
+    375:375:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):703 -> a
+    376:420:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2654:2698 -> a
+    376:420:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):703 -> a
+    421:435:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):706:720 -> a
+    436:436:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1246:1246 -> a
+    436:436:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):723 -> a
+    437:440:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):724:727 -> a
+    441:441:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():755:755 -> a
+    441:441:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):731 -> a
+    442:447:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):731:736 -> a
+    448:448:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():755:755 -> a
+    448:448:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):736 -> a
+    449:451:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):736:738 -> a
+    452:452:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    452:452:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):738 -> a
+    453:453:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):738:738 -> a
+    454:454:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):734:734 -> a
+    455:455:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    455:455:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):734 -> a
+    456:456:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):734:734 -> a
+    457:470:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729:742 -> a
+    471:482: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
+    471:482:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    471:482:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    483:484:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):817:818 -> a
+    483:484:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    483:484:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):138 -> a
+    483:484:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    483:484:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    485:490:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):827:832 -> a
+    485:490:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):818 -> a
+    485:490:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    485:490:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):138 -> a
+    485:490:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    485:490:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    491:492:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):820:821 -> a
+    491:492:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    491:492:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):138 -> a
+    491:492:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    491:492:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    493:494:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):840:841 -> a
+    493:494:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):821 -> a
+    493:494:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    493:494:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):138 -> a
+    493:494:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    493:494:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    495:503:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):147:155 -> a
+    495:503:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    495:503:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    504:505:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):817:818 -> a
+    504:505:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    504:505:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):155 -> a
+    504:505:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    504:505:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    506:511:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):827:832 -> a
+    506:511:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):818 -> a
+    506:511:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    506:511:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):155 -> a
+    506:511:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    506:511:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    512:513:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):820:821 -> a
     512:513:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    512:513:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):138 -> a
+    512:513:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):155 -> a
     512:513:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    512:513:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    514:519:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):827:832 -> a
-    514:519:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):818 -> a
-    514:519:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    514: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):138 -> a
-    514:519:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    514:519:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    520:521:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):820:821 -> a
-    520:521:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    520:521:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):138 -> a
-    520:521:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    520:521:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    522:523:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):840:841 -> a
-    522:523:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):821 -> a
-    522:523:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    522:523:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):138 -> a
-    522:523:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    522:523:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    524:532:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):147:155 -> a
-    524:532:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    524:532:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    533:534:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):817:818 -> a
-    533:534:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    533:534:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):155 -> a
-    533:534:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    533:534:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    535:540:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):827:832 -> a
-    535:540:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):818 -> a
-    535:540:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    535:540:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):155 -> a
-    535:540:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    535:540:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    541:542:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):820:821 -> a
-    541:542:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    541:542:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):155 -> a
-    541:542:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    541:542:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    543:544:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):840:841 -> a
-    543:544:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):821 -> a
-    543:544:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    543:544:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):155 -> a
-    543:544:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    543:544:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    545:549:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):168:172 -> a
-    545:549:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    545:549:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    550:550:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):113:113 -> a
-    550:550:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    551:551:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo.builder(com.android.tools.r8.graph.DexItemFactory):271:271 -> a
-    551:551:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):178 -> a
-    551:551:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
-    551:551:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    552:554:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):178:180 -> a
-    552:554:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
-    552:554:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    555:556:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):119:120 -> a
-    555:556:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):750 -> a
-    557:561:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):753:757 -> a
-    562:563:boolean allPhisAreStackMapPhis(com.android.tools.r8.ir.code.IRCode):767:768 -> a
-    564:564:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):776:776 -> a
-    565:565:void resolveAndBuildSwitch(int,int,int):965:965 -> a
-    566:567:void add(com.android.tools.r8.ir.code.Instruction):979:980 -> a
-    568:570:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1008:1010 -> a
-    571:575:void com.android.tools.r8.ir.conversion.IRBuilder.addNonThisArgument(com.android.tools.r8.ir.code.Argument):1020:1024 -> a
-    571:575:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1010 -> a
-    576:578:void addBooleanNonThisArgument(int):1014:1016 -> a
-    579:583:void com.android.tools.r8.ir.conversion.IRBuilder.addNonThisArgument(com.android.tools.r8.ir.code.Argument):1020:1024 -> a
-    579:583:void addBooleanNonThisArgument(int):1016 -> a
-    584:585:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1093:1094 -> a
-    586:588:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2181:2183 -> a
-    586:588:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1097 -> a
-    589:589:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538:538 -> a
-    589:589:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1070 -> a
-    589:589:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1098 -> a
-    590:590:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    590:590:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538 -> a
-    590:590:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1070 -> a
-    590:590:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1098 -> a
-    591:591:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1070:1070 -> a
-    591:591:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1098 -> a
-    592:592:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1099:1099 -> a
-    593:610:void addDebugPosition(com.android.tools.r8.ir.code.Position):1104:1121 -> a
-    611:614:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1165:1168 -> a
-    615:615:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():763:763 -> a
-    615:615:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1168 -> a
-    616:621:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1169:1174 -> a
-    622:622:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    622:622:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1174 -> a
-    623:623:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1174:1174 -> a
-    624:644:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):162:182 -> a
-    624:644:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1175 -> a
-    645:645:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):177:177 -> a
-    645:645:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1175 -> a
-    646:650:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):171:175 -> a
-    646:650:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1175 -> a
-    651:651:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):173:173 -> a
-    651:651:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1175 -> a
-    652:652:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):169:169 -> a
-    652:652:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1175 -> a
-    653:666:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):167:180 -> a
-    653:666:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1175 -> a
-    667:687:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):162:182 -> a
-    667:687:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1178 -> a
-    688:688:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):177:177 -> a
-    688:688:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1178 -> a
-    689:693:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):171:175 -> a
-    689:693:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1178 -> a
-    694:694:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):173:173 -> a
-    694:694:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1178 -> a
-    695:695:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):169:169 -> a
-    695:695:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1178 -> a
-    696:709:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):167:180 -> a
-    696:709:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1178 -> a
-    710:713:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1180:1183 -> a
-    714:717:void com.android.tools.r8.ir.conversion.IRBuilder.addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):780:783 -> a
-    714:717:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1184 -> a
-    718:718:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1186:1186 -> a
-    719:723:void addArrayLength(int,int):1190:1194 -> a
-    724:729:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1217:1222 -> a
-    724:729:void addCheckCast(int,com.android.tools.r8.graph.DexType):1209 -> a
-    730:730:void com.android.tools.r8.ir.code.CheckCast.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):40:40 -> a
-    730:730:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1222 -> a
-    730:730:void addCheckCast(int,com.android.tools.r8.graph.DexType):1209 -> a
-    731:732:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1223:1224 -> a
-    731:732:void addCheckCast(int,com.android.tools.r8.graph.DexType):1209 -> a
-    733:736:void addConst(com.android.tools.r8.ir.analysis.type.TypeElement,int,long):1237:1240 -> a
-    737:752:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1354:1369 -> a
-    753:754:void addNop():1395:1396 -> a
-    755:765:void com.android.tools.r8.ir.conversion.IRBuilder.addTrivialIf(int,int):1432:1442 -> a
-    755:765:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1475 -> a
-    766:769:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1477:1480 -> a
-    770:777:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1446:1453 -> a
-    770:777:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1481 -> a
-    778:788:void com.android.tools.r8.ir.conversion.IRBuilder.addTrivialIf(int,int):1432:1442 -> a
-    778:788:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1502 -> a
-    789:789:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1504:1504 -> a
-    790:797:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1446:1453 -> a
-    790:797:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1505 -> a
-    798:802:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1510:1514 -> a
-    803:809:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1512:1518 -> a
-    810:814:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1522:1526 -> a
-    815:824: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):1552:1561 -> a
-    825:837: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):1555:1567 -> a
-    838:842:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1577:1581 -> a
-    843:846:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1580:1583 -> a
-    847:848:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1610:1611 -> a
-    849:849:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
-    849:849:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1614 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    850:850:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticPut():129:129 -> a
-    850:850:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298 -> a
-    850:850:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1614 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    851:851:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
-    851:851:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1614 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    852:852:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticGet():133:133 -> a
-    852:852:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298 -> a
-    852:852:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1614 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    853:853:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
-    853:853:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1614 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    854:866:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1615:1627 -> a
-    867:871:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1632:1636 -> a
-    872:875:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1635:1638 -> a
-    876:899:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1649:1672 -> a
-    900:908:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1676:1684 -> a
-    909:909:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isWide():32:32 -> a
-    909:909:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1685 -> a
-    910:916:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1686:1692 -> a
-    917:941:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1713:1737 -> a
-    942:956:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1741:1755 -> a
-    957:957:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1768:1768 -> a
-    958:958:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    958:958:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1768 -> a
-    959:963:void addNewArrayFilledData(int,int,long,short[]):1839:1843 -> a
-    964:968:void addNewUnboxedEnumInstance(int,com.android.tools.r8.graph.DexType,int):1855:1859 -> a
-    969:972:void addStaticGet(int,com.android.tools.r8.graph.DexField):1897:1900 -> a
-    973:979:void addStaticGet(int,com.android.tools.r8.graph.DexField):1898:1904 -> a
-    980:1023:void addSwitch(int,int[],int,int[]):1936:1979 -> a
-    1024:1024:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
-    1024:1024:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    1024:1024:void addSwitch(int,int[],int,int[]):1984 -> a
-    1025:1025:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
-    1025:1025:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    1025:1025:void addSwitch(int,int[],int,int[]):1985 -> a
-    1026:1056: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[]):1992:2022 -> a
-    1026:1056:void addSwitch(int,int[],int,int[]):1986 -> a
-    1057:1057:void addSwitch(int,int[],int,int[]):1987:1987 -> a
-    1058:1059: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):2192:2193 -> a
-    1060:1079: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):2208:2227 -> a
-    1060:1079: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):2196 -> a
-    1080:1090:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2299:2309 -> a
-    1080:1090: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):2232 -> a
-    1080:1090: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):2196 -> a
-    1091:1091:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    1091:1091:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2309 -> a
-    1091:1091: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):2232 -> a
-    1091:1091: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):2196 -> a
-    1092:1093:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2309:2310 -> a
-    1092:1093: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):2232 -> a
-    1092:1093: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):2196 -> a
-    1094:1094:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    1094:1094:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2310 -> a
-    1094:1094: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):2232 -> a
-    1094:1094: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):2196 -> a
-    1095:1095:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2310:2310 -> a
-    1095:1095: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):2232 -> a
-    1095:1095: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):2196 -> a
-    1096:1106:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():161:171 -> a
-    1096:1106:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2310 -> a
-    1096:1106: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):2232 -> a
-    1096:1106: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):2196 -> a
-    1107:1107:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():167:167 -> a
-    1107:1107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2310 -> a
-    1107:1107: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):2232 -> a
-    1107:1107: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):2196 -> a
-    1108:1108:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():165:165 -> a
-    1108:1108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2310 -> a
-    1108:1108: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):2232 -> a
-    1108:1108: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):2196 -> a
-    1109:1109:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():163:163 -> a
-    1109:1109:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2310 -> a
-    1109:1109: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):2232 -> a
-    1109:1109: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):2196 -> a
-    1110:1128:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2311:2329 -> a
-    1110:1128: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):2232 -> a
-    1110:1128: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):2196 -> a
-    1129:1129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2300:2300 -> a
-    1129:1129: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):2232 -> a
-    1129:1129: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):2196 -> a
-    1130:1132:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2291:2293 -> a
-    1130:1132: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):2234 -> a
-    1130:1132: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):2196 -> a
-    1133:1155:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):68:90 -> a
-    1133:1155: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):2235 -> a
-    1133:1155: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):2196 -> a
-    1156:1156:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):88:88 -> a
-    1156:1156: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):2235 -> a
-    1156:1156: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):2196 -> a
-    1157:1157:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):86:86 -> a
-    1157:1157: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):2235 -> a
-    1157:1157: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):2196 -> a
-    1158:1158:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):84:84 -> a
-    1158:1158: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):2235 -> a
-    1158:1158: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):2196 -> a
-    1159:1171:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):70:82 -> a
-    1159:1171: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):2235 -> a
-    1159:1171: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):2196 -> a
-    1172:1172:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):80:80 -> a
-    1172:1172: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):2235 -> a
-    1172:1172: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):2196 -> a
-    1173:1173:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):78:78 -> a
-    1173:1173: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):2235 -> a
-    1173:1173: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):2196 -> a
-    1174:1174: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
-    1174:1174: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):2235 -> a
-    1174:1174: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):2196 -> a
-    1175:1175: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):2236:2236 -> a
-    1175:1175: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):2196 -> a
-    1176:1176:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():763:763 -> a
-    1176:1176: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):2238 -> a
-    1176:1176: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):2196 -> a
-    1177:1198: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):2238:2259 -> a
-    1177:1198: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):2196 -> a
-    1199:1235: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):2250:2286 -> a
-    1199:1235: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):2196 -> a
-    1236:1236:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2334:2334 -> a
-    1236:1236:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1126 -> a
-    1237:1237:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2334:2334 -> a
-    1237:1237:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1127 -> a
-    1238:1238: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):2393:2393 -> a
-    1238:1238:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1128 -> a
-    1239:1241:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1129:1131 -> a
-    1242:1242:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2334:2334 -> a
-    1242:1242:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1228 -> a
-    1243:1243:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2334:2334 -> a
-    1243:1243:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1229 -> a
-    1244:1247:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1230:1233 -> a
-    1248:1248:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2334:2334 -> a
-    1248:1248:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2148 -> a
-    1249:1249: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):2393:2393 -> a
-    1249:1249:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2149 -> a
-    1250:1252:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2150:2152 -> a
-    1253:1253:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2334:2334 -> a
-    1253:1253:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1807 -> a
-    1254:1254: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):2393:2393 -> a
-    1254:1254:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1808 -> a
-    1255:1257:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1809:1811 -> a
-    1258:1261:com.android.tools.r8.ir.code.Value readIntLiteral(long):2354:2357 -> a
-    1262:1263: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):2364:2365 -> a
-    1264:1265:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeRegister(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2369:2370 -> a
-    1264:1265: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):2364 -> a
-    1266:1266:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2397:2397 -> a
-    1266:1266:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2158 -> a
-    1267:1271:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2159:2163 -> a
-    1272:1272:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538:538 -> a
-    1272:1272:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2163 -> a
-    1273:1273:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    1273:1273:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538 -> a
-    1273:1273:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2163 -> a
-    1274:1284:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2164:2174 -> a
-    1285:1289:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2172:2176 -> a
-    1290:1290:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2397:2397 -> a
-    1290:1290: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):2375 -> a
-    1291:1291: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):2376:2376 -> a
-    1292:1294:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2181:2183 -> a
-    1292:1294: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):2388 -> a
-    1295:1296: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):2388:2389 -> a
-    1297:1297:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2419:2419 -> a
-    1298:1302:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2451:2455 -> a
-    1298:1302:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2419 -> a
-    1303:1303:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    1303:1303:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2455 -> a
-    1303:1303:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2419 -> a
-    1304:1304:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2455:2455 -> a
-    1304:1304:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2419 -> a
-    1305:1305:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2452:2452 -> a
-    1305:1305:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2419 -> a
-    1306:1331:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2420:2445 -> a
-    1332:1336:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2434:2438 -> a
-    1337:1343:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2436:2442 -> a
-    1344:1347:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2509:2512 -> a
-    1344:1347:void ensureSuccessorBlock(int,int,boolean):2545 -> a
-    1348:1351:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2500:2503 -> a
-    1348:1351:void ensureSuccessorBlock(int,int,boolean):2546 -> a
-    1352:1352:void ensureSuccessorBlock(int,int,boolean):2547:2547 -> a
-    1353:1353:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):289:289 -> a
-    1353:1353:void ensureSuccessorBlock(int,int,boolean):2549 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1354:1354:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):285:285 -> a
-    1354:1354:void ensureSuccessorBlock(int,int,boolean):2550 -> a
-    1355:1355:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):302:302 -> a
-    1355:1355:void ensureSuccessorBlock(int,int,boolean):2552 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1356:1356:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):298:298 -> a
-    1356:1356:void ensureSuccessorBlock(int,int,boolean):2553 -> a
-    1357:1357:void ensureSuccessorBlock(int,int,boolean):2555:2555 -> a
-    1358:1361:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2594:2597 -> a
-    1362:1362:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2596:2596 -> a
-    1363:1365:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2611:2613 -> a
-    1363:1365:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1366:1366:int com.android.tools.r8.ir.conversion.IRBuilder.getOffset(com.android.tools.r8.ir.code.BasicBlock):2581:2581 -> a
-    1366:1366:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2573 -> a
-    1366:1366:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2613 -> a
-    1366:1366:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1367:1367:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2569:2569 -> a
-    1367:1367:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2573 -> a
-    1367:1367:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2613 -> a
-    1367:1367:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1368:1368:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2614:2614 -> a
-    1368:1368:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1369:1370:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():317:318 -> a
-    1369:1370:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2615 -> a
-    1369:1370:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1371:1371:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2618:2618 -> a
-    1371:1371:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1372:1372:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2569:2569 -> a
-    1372:1372:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2619 -> a
-    1372:1372:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1373:1373:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():306:306 -> a
-    1373:1373:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2620 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1373:1373:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1374:1384:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2623:2633 -> a
-    1374:1384:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1385:1393:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2630:2638 -> a
-    1385:1393:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1394:1399: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):2654:2659 -> a
-    1394:1399:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2638 -> a
-    1394:1399:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1400:1407:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2639:2646 -> a
-    1400:1407:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1408:1410:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():310:312 -> a
-    1408:1410:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2649 -> a
-    1408:1410:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1411:1411:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2649:2649 -> a
-    1411:1411:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
-    1412:1413:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2599:2600 -> a
-    1414:1414:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2748:2748 -> a
+    512:513:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    514:515:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):840:841 -> a
+    514:515:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):821 -> a
+    514:515:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    514:515:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):155 -> a
+    514:515:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    514:515:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    516:520:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):168:172 -> a
+    516:520:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    516:520:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    521:521:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):113:113 -> a
+    521:521:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    522:522:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo.builder(com.android.tools.r8.graph.DexItemFactory):271:271 -> a
+    522:522:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):178 -> a
+    522:522:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
+    522:522:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    523:525:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):178:180 -> a
+    523:525:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
+    523:525:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    526:527:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):119:120 -> a
+    526:527:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):742 -> a
+    528:532:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):745:749 -> a
+    533:534:boolean allPhisAreStackMapPhis(com.android.tools.r8.ir.code.IRCode):759:760 -> a
+    535:535:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):768:768 -> a
+    536:536:void resolveAndBuildSwitch(int,int,int):957:957 -> a
+    537:538:void add(com.android.tools.r8.ir.code.Instruction):971:972 -> a
+    539:540:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1049:1050 -> a
+    541:543:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2137:2139 -> a
+    541:543:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1053 -> a
+    544:544:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538:538 -> a
+    544:544:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1026 -> a
+    544:544:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1054 -> a
+    545:545:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
+    545:545:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538 -> a
+    545:545:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1026 -> a
+    545:545:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1054 -> a
+    546:546:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1026:1026 -> a
+    546:546:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1054 -> a
+    547:547:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1055:1055 -> a
+    548:565:void addDebugPosition(com.android.tools.r8.ir.code.Position):1060:1077 -> a
+    566:569:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1121:1124 -> a
+    570:570:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():755:755 -> a
+    570:570:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1124 -> a
+    571:576:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1125:1130 -> a
+    577:577:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    577:577:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1130 -> a
+    578:578:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1130:1130 -> a
+    579:599:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):160:180 -> a
+    579:599:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1131 -> a
+    600:600:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):175:175 -> a
+    600:600:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1131 -> a
+    601:605:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):169:173 -> a
+    601:605:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1131 -> a
+    606:606:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):171:171 -> a
+    606:606:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1131 -> a
+    607:607:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):167:167 -> a
+    607:607:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1131 -> a
+    608:621:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):165:178 -> a
+    608:621:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1131 -> a
+    622:642:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):160:180 -> a
+    622:642:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1134 -> a
+    643:643:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):175:175 -> a
+    643:643:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1134 -> a
+    644:648:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):169:173 -> a
+    644:648:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1134 -> a
+    649:649:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):171:171 -> a
+    649:649:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1134 -> a
+    650:650:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):167:167 -> a
+    650:650:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1134 -> a
+    651:664:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):165:178 -> a
+    651:664:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1134 -> a
+    665:668:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1136:1139 -> a
+    669:672:void com.android.tools.r8.ir.conversion.IRBuilder.addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):772:775 -> a
+    669:672:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1140 -> a
+    673:673:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1142:1142 -> a
+    674:678:void addArrayLength(int,int):1146:1150 -> a
+    679:684:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1173:1178 -> a
+    679:684:void addCheckCast(int,com.android.tools.r8.graph.DexType):1165 -> a
+    685:685:void com.android.tools.r8.ir.code.CheckCast.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):40:40 -> a
+    685:685:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1178 -> a
+    685:685:void addCheckCast(int,com.android.tools.r8.graph.DexType):1165 -> a
+    686:687:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1179:1180 -> a
+    686:687:void addCheckCast(int,com.android.tools.r8.graph.DexType):1165 -> a
+    688:691:void addConst(com.android.tools.r8.ir.analysis.type.TypeElement,int,long):1193:1196 -> a
+    692:693:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1310:1311 -> a
+    694:694:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2357:2357 -> a
+    694:694:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1313 -> a
+    695:706:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1314:1325 -> a
+    707:708:void addNop():1351:1352 -> a
+    709:719:void com.android.tools.r8.ir.conversion.IRBuilder.addTrivialIf(int,int):1388:1398 -> a
+    709:719:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1431 -> a
+    720:723:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1433:1436 -> a
+    724:731:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1402:1409 -> a
+    724:731:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1437 -> a
+    732:742:void com.android.tools.r8.ir.conversion.IRBuilder.addTrivialIf(int,int):1388:1398 -> a
+    732:742:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1458 -> a
+    743:743:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1460:1460 -> a
+    744:751:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1402:1409 -> a
+    744:751:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1461 -> a
+    752:756:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1466:1470 -> a
+    757:763:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1468:1474 -> a
+    764:768:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1478:1482 -> a
+    769:778: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):1508:1517 -> a
+    779:791: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:1523 -> a
+    792:796:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1533:1537 -> a
+    797:800:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1536:1539 -> a
+    801:805:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1566:1570 -> a
+    806:806:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
+    806:806:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1570 -> a
+    807:807:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticPut():129:129 -> a
+    807:807:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298 -> a
+    807:807:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1570 -> a
+    808:808:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
+    808:808:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1570 -> a
+    809:809:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticGet():133:133 -> a
+    809:809:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298 -> a
+    809:809:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1570 -> a
+    810:810:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
+    810:810:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1570 -> a
+    811:823:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1571:1583 -> a
+    824:828:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1588:1592 -> a
+    829:832:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1591:1594 -> a
+    833:856:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1605:1628 -> a
+    857:865:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1632:1640 -> a
+    866:866:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isWide():32:32 -> a
+    866:866:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1641 -> a
+    867:873:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1642:1648 -> a
+    874:898:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1669:1693 -> a
+    899:913:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1697:1711 -> a
+    914:914:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1724:1724 -> a
+    915:915:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    915:915:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1724 -> a
+    916:920:void addNewArrayFilledData(int,int,long,short[]):1795:1799 -> a
+    921:925:void addNewUnboxedEnumInstance(int,com.android.tools.r8.graph.DexType,int):1811:1815 -> a
+    926:929:void addStaticGet(int,com.android.tools.r8.graph.DexField):1853:1856 -> a
+    930:936:void addStaticGet(int,com.android.tools.r8.graph.DexField):1854:1860 -> a
+    937:980:void addSwitch(int,int[],int,int[]):1892:1935 -> a
+    981:981:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    981:981:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    981:981:void addSwitch(int,int[],int,int[]):1940 -> a
+    982:982:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    982:982:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    982:982:void addSwitch(int,int[],int,int[]):1941 -> a
+    983:1013: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[]):1948:1978 -> a
+    983:1013:void addSwitch(int,int[],int,int[]):1942 -> a
+    1014:1014:void addSwitch(int,int[],int,int[]):1943:1943 -> a
+    1015:1016:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2148:2149 -> a
+    1017:1036: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):2164:2183 -> a
+    1017:1036: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):2152 -> a
+    1037:1047:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2255:2265 -> a
+    1037:1047: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):2188 -> a
+    1037:1047: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):2152 -> a
+    1048:1048:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
+    1048:1048:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2265 -> a
+    1048:1048: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):2188 -> a
+    1048:1048: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):2152 -> a
+    1049:1050:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2265:2266 -> a
+    1049:1050: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):2188 -> a
+    1049:1050: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):2152 -> a
+    1051:1051:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
+    1051:1051: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
+    1051:1051: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):2188 -> a
+    1051:1051: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):2152 -> a
+    1052:1052:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2266:2266 -> a
+    1052:1052: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):2188 -> a
+    1052:1052: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):2152 -> a
+    1053:1063:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():161:171 -> a
+    1053:1063: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
+    1053:1063: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):2188 -> a
+    1053:1063: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):2152 -> a
+    1064:1064:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():167:167 -> a
+    1064:1064: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
+    1064:1064: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):2188 -> a
+    1064:1064: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):2152 -> a
+    1065:1065:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():165:165 -> a
+    1065:1065: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
+    1065:1065: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):2188 -> a
+    1065:1065: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):2152 -> a
+    1066:1066:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():163:163 -> a
+    1066:1066: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
+    1066:1066: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):2188 -> a
+    1066:1066: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):2152 -> a
+    1067:1085:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2267:2285 -> a
+    1067:1085: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):2188 -> a
+    1067:1085: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):2152 -> a
+    1086:1086:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2256:2256 -> a
+    1086:1086: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):2188 -> a
+    1086:1086: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):2152 -> a
+    1087:1089:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2247:2249 -> a
+    1087:1089: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):2190 -> a
+    1087:1089: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):2152 -> a
+    1090:1112:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):68:90 -> a
+    1090:1112: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):2191 -> a
+    1090:1112: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):2152 -> a
+    1113:1113:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):88:88 -> a
+    1113:1113: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):2191 -> a
+    1113:1113: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):2152 -> a
+    1114:1114:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):86:86 -> a
+    1114:1114: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):2191 -> a
+    1114:1114: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):2152 -> a
+    1115:1115:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):84:84 -> a
+    1115: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):2191 -> a
+    1115: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):2152 -> a
+    1116:1128:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):70:82 -> a
+    1116:1128: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):2191 -> a
+    1116:1128: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):2152 -> a
+    1129:1129:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):80:80 -> a
+    1129:1129: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):2191 -> a
+    1129:1129: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):2152 -> a
+    1130:1130:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):78:78 -> a
+    1130:1130: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):2191 -> a
+    1130:1130: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):2152 -> a
+    1131:1131: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
+    1131:1131: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):2191 -> a
+    1131:1131: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):2152 -> a
+    1132:1132: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):2192:2192 -> a
+    1132:1132: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):2152 -> a
+    1133:1133:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():755:755 -> a
+    1133: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):2194 -> a
+    1133: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):2152 -> a
+    1134:1155: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):2194:2215 -> a
+    1134:1155: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):2152 -> a
+    1156:1192: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):2206:2242 -> a
+    1156:1192: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):2152 -> a
+    1193:1193:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2290:2290 -> a
+    1193:1193:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1082 -> a
+    1194:1194:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2290:2290 -> a
+    1194:1194:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1083 -> a
+    1195:1195: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):2349:2349 -> a
+    1195:1195:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1084 -> a
+    1196:1198:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1085:1087 -> a
+    1199:1199:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2290:2290 -> a
+    1199:1199:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1184 -> a
+    1200:1200:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2290:2290 -> a
+    1200:1200:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1185 -> a
+    1201:1204:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1186:1189 -> a
+    1205:1205:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2290:2290 -> a
+    1205:1205:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2104 -> a
+    1206:1206: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):2349:2349 -> a
+    1206:1206:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2105 -> a
+    1207:1209:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2106:2108 -> a
+    1210:1210:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2290:2290 -> a
+    1210:1210:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1763 -> a
+    1211:1211: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):2349:2349 -> a
+    1211:1211:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1764 -> a
+    1212:1214:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1765:1767 -> a
+    1215:1218:com.android.tools.r8.ir.code.Value readIntLiteral(long):2310:2313 -> a
+    1219:1220: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):2320:2321 -> a
+    1221:1222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeRegister(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2325:2326 -> a
+    1221:1222: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):2320 -> a
+    1223:1223:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2353:2353 -> a
+    1223:1223:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2114 -> a
+    1224:1228:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2115:2119 -> a
+    1229:1229:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538:538 -> a
+    1229:1229:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2119 -> a
+    1230:1230:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
+    1230:1230:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538 -> a
+    1230:1230:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2119 -> a
+    1231:1241:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2120:2130 -> a
+    1242:1246:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2128:2132 -> a
+    1247:1247:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2353:2353 -> a
+    1247:1247: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):2331 -> a
+    1248:1248:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2357:2357 -> a
+    1248:1248: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):2332 -> a
+    1249:1251:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2137:2139 -> a
+    1249:1251: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):2344 -> a
+    1252:1253: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):2344:2345 -> a
+    1254:1254:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2357:2357 -> a
+    1254:1254:void addBooleanNonThisArgument(int):1010 -> a
+    1255:1256:void addBooleanNonThisArgument(int):1011:1012 -> a
+    1257:1261:void com.android.tools.r8.ir.conversion.IRBuilder.addNonThisArgument(com.android.tools.r8.ir.code.Argument):1016:1020 -> a
+    1257:1261:void addBooleanNonThisArgument(int):1012 -> a
+    1262:1262:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2357:2357 -> a
+    1262:1262:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1004 -> a
+    1263:1264:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1005:1006 -> a
+    1265:1269:void com.android.tools.r8.ir.conversion.IRBuilder.addNonThisArgument(com.android.tools.r8.ir.code.Argument):1016:1020 -> a
+    1265:1269:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1006 -> a
+    1270:1270:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2375:2375 -> a
+    1271:1275:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2407:2411 -> a
+    1271:1275:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2375 -> a
+    1276:1276:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    1276:1276:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2411 -> a
+    1276:1276:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2375 -> a
+    1277:1277:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2411:2411 -> a
+    1277:1277:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2375 -> a
+    1278:1278:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2408:2408 -> a
+    1278:1278:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2375 -> a
+    1279:1304:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2376:2401 -> a
+    1305:1309:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2390:2394 -> a
+    1310:1316:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2392:2398 -> a
+    1317:1320:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2465:2468 -> a
+    1317:1320:void ensureSuccessorBlock(int,int,boolean):2501 -> a
+    1321:1324:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2456:2459 -> a
+    1321:1324:void ensureSuccessorBlock(int,int,boolean):2502 -> a
+    1325:1327:void ensureSuccessorBlock(int,int,boolean):2503:2505 -> a
+    1328:1328:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):287:287 -> a
+    1328:1328:void ensureSuccessorBlock(int,int,boolean):2505 -> a
+    1329:1329:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):283:283 -> a
+    1329:1329:void ensureSuccessorBlock(int,int,boolean):2506 -> a
+    1330:1330:void ensureSuccessorBlock(int,int,boolean):2508:2508 -> a
+    1331:1331:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):300:300 -> a
+    1331:1331:void ensureSuccessorBlock(int,int,boolean):2508 -> a
+    1332:1332:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):296:296 -> a
+    1332:1332:void ensureSuccessorBlock(int,int,boolean):2509 -> a
+    1333:1333:void ensureSuccessorBlock(int,int,boolean):2511:2511 -> a
+    1334:1337:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2550:2553 -> a
+    1338:1338:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2552:2552 -> a
+    1339:1341:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2567:2569 -> a
+    1339:1341:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1342:1342:int com.android.tools.r8.ir.conversion.IRBuilder.getOffset(com.android.tools.r8.ir.code.BasicBlock):2537:2537 -> a
+    1342:1342:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2529 -> a
+    1342:1342:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2569 -> a
+    1342:1342:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1343:1343:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2525:2525 -> a
+    1343:1343:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2529 -> a
+    1343:1343:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2569 -> a
+    1343:1343:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1344:1345:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2570:2571 -> a
+    1344:1345:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1346:1347:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():315:316 -> a
+    1346:1347:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2571 -> a
+    1346:1347:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1348:1348:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2574:2574 -> a
+    1348:1348:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1349:1349:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2525:2525 -> a
+    1349:1349:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2575 -> a
+    1349:1349:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1350:1350:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2576:2576 -> a
+    1350:1350:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1351:1351:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():304:304 -> a
+    1351:1351:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2576 -> a
+    1351:1351:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1352:1362:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2579:2589 -> a
+    1352:1362:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1363:1371:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2586:2594 -> a
+    1363:1371:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1372:1377: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):2610:2615 -> a
+    1372:1377:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2594 -> a
+    1372:1377:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1378:1385:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2595:2602 -> a
+    1378:1385:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1386:1388:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():308:310 -> a
+    1386:1388:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2605 -> a
+    1386:1388:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1389:1389:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2605:2605 -> a
+    1389:1389:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2554 -> a
+    1390:1391:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2555:2556 -> a
+    1392:1392:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2704:2704 -> 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):1198 -> b
+    1:20:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1154 -> 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
-    21:21:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1198 -> b
+    21:21:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1154 -> b
     22:26:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):72:76 -> b
-    22:26:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1198 -> b
+    22:26:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1154 -> b
     27:27:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):74:74 -> b
-    27:27:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1198 -> b
+    27:27:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1154 -> b
     28:28:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):70:70 -> b
-    28:28:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1198 -> b
+    28:28:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1154 -> b
     29:41:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):68:80 -> b
-    29:41:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1198 -> b
-    42:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1198:1202 -> b
-    47:50:void com.android.tools.r8.ir.conversion.IRBuilder.addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):780:783 -> b
-    47:50:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1203 -> b
-    51:51:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1205:1205 -> b
-    52:53:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1074:1075 -> b
-    54:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2181:2183 -> b
-    54:56:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1079 -> b
-    57:65:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1080:1088 -> b
-    66:66:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1135:1135 -> b
-    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2334:2334 -> b
-    67:67:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1136 -> b
-    68:68:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1137:1137 -> b
-    69:69: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):2393:2393 -> b
-    69:69:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1138 -> b
-    70:72:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1139:1141 -> b
-    73:73:void addConstClass(int,com.android.tools.r8.graph.DexType):1264:1264 -> b
-    74:74:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):426:426 -> b
-    74:74:void addConstClass(int,com.android.tools.r8.graph.DexType):1264 -> b
-    75:76:void addConstClass(int,com.android.tools.r8.graph.DexType):1265:1266 -> b
+    29:41:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1154 -> b
+    42:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1154:1158 -> b
+    47:50:void com.android.tools.r8.ir.conversion.IRBuilder.addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):772:775 -> b
+    47:50:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1159 -> b
+    51:51:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1161:1161 -> b
+    52:53:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1030:1031 -> b
+    54:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2137:2139 -> b
+    54:56:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1035 -> b
+    57:65:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1036:1044 -> b
+    66:66:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1091:1091 -> b
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2290:2290 -> b
+    67:67:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1092 -> b
+    68:68:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1093:1093 -> b
+    69:69: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):2349:2349 -> b
+    69:69:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1094 -> b
+    70:72:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1095:1097 -> b
+    73:73:void addConstClass(int,com.android.tools.r8.graph.DexType):1220:1220 -> b
+    74:74:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):436:436 -> b
+    74:74:void addConstClass(int,com.android.tools.r8.graph.DexType):1220 -> b
+    75:76:void addConstClass(int,com.android.tools.r8.graph.DexType):1221:1222 -> b
     77:77:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> b
-    77:77:void addConstClass(int,com.android.tools.r8.graph.DexType):1266 -> b
-    78:78:void addConstClass(int,com.android.tools.r8.graph.DexType):1268:1268 -> b
-    79:83:void addGoto(int):1424:1428 -> b
-    84:87:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1530:1533 -> b
-    88:88:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1696:1696 -> b
-    89:89:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
-    89:89:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1696 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    90:96:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1696:1702 -> b
-    97:97:void checkInvokeArgumentRegisters(int,int):1760:1760 -> b
+    77:77:void addConstClass(int,com.android.tools.r8.graph.DexType):1222 -> b
+    78:78:void addConstClass(int,com.android.tools.r8.graph.DexType):1224:1224 -> b
+    79:83:void addGoto(int):1380:1384 -> b
+    84:87:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1486:1489 -> b
+    88:88:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1652:1652 -> b
+    89:89:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> b
+    89:89:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1652 -> b
+    90:96:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1652:1658 -> b
+    97:97:void checkInvokeArgumentRegisters(int,int):1716:1716 -> b
     98:98:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    98:98:void checkInvokeArgumentRegisters(int,int):1760 -> b
+    98:98:void checkInvokeArgumentRegisters(int,int):1716 -> b
     99:99:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
     99:99:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    99:99:void checkInvokeArgumentRegisters(int,int):1760 -> b
-    100:100:void checkInvokeArgumentRegisters(int,int):1760:1760 -> b
-    101:107:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1829:1835 -> b
-    108:108:void addReturn():1879:1879 -> b
-    109:111:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1884:1886 -> b
-    109:111:void addReturn():1879 -> b
-    112:115:void addStaticPut(int,com.android.tools.r8.graph.DexField):1908:1911 -> b
-    116:116:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2334:2334 -> b
-    116:116:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1815 -> b
-    117:117: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):2393:2393 -> b
-    117:117:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1816 -> b
-    118:121:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1818:1821 -> 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):2338:2341 -> b
-    122:125:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1821 -> b
-    126:129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLongLiteral(long):2347:2350 -> b
-    126:129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2342 -> b
-    126:129:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1821 -> b
-    130:133:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1822:1825 -> b
-    134:134:void addInstruction(com.android.tools.r8.ir.code.Instruction):2415:2415 -> b
-    135:135:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2752:2752 -> b
-    1:1:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1145:1145 -> c
-    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):2334:2334 -> c
-    2:2:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1146 -> 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):2334:2334 -> c
-    3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1147 -> c
-    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):2393:2393 -> c
-    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1148 -> c
-    5:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1149:1151 -> c
-    8:12:void addMoveException(int):1767:1771 -> c
-    13:15:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1776:1778 -> c
-    13:15:void addMoveException(int):1772 -> c
+    99:99:void checkInvokeArgumentRegisters(int,int):1716 -> b
+    100:100:void checkInvokeArgumentRegisters(int,int):1716:1716 -> b
+    101:107:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1785:1791 -> b
+    108:108:void addReturn():1835:1835 -> b
+    109:111:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1840:1842 -> b
+    109:111:void addReturn():1835 -> b
+    112:115:void addStaticPut(int,com.android.tools.r8.graph.DexField):1864:1867 -> b
+    116:116:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2290:2290 -> b
+    116:116:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1771 -> b
+    117:117: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):2349:2349 -> b
+    117:117:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1772 -> b
+    118:121:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1774:1777 -> 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):2294:2297 -> b
+    122:125:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1777 -> b
+    126:129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLongLiteral(long):2303:2306 -> b
+    126:129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2298 -> b
+    126:129:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1777 -> b
+    130:133:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1778:1781 -> b
+    134:134:void addInstruction(com.android.tools.r8.ir.code.Instruction):2371:2371 -> b
+    135:135:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2708:2708 -> b
+    1:1:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1101:1101 -> c
+    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):2290:2290 -> c
+    2:2:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1102 -> 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):2290:2290 -> c
+    3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1103 -> c
+    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):2349:2349 -> c
+    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1104 -> c
+    5:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1105:1107 -> c
+    8:12:void addMoveException(int):1723:1727 -> c
+    13:15:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1732:1734 -> c
+    13:15:void addMoveException(int):1728 -> c
     16:16:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> c
-    16:16:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1778 -> c
-    16:16:void addMoveException(int):1772 -> c
-    17:20:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1778:1781 -> c
-    17:20:void addMoveException(int):1772 -> c
+    16:16:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1734 -> c
+    16:16:void addMoveException(int):1728 -> c
+    17:20:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1734:1737 -> c
+    17:20:void addMoveException(int):1728 -> c
     21:21:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> c
-    21:21:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1781 -> c
-    21:21:void addMoveException(int):1772 -> c
-    22:22:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1781:1781 -> c
-    22:22:void addMoveException(int):1772 -> c
-    23:26:void addInitClass(int,com.android.tools.r8.graph.DexType):1890:1893 -> c
-    27:42:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2460:2475 -> c
-    43:43:void ensureExceptionalSuccessorBlock(int,int):2563:2563 -> c
-    44:45:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2585:2586 -> c
-    46:46:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):539:539 -> c
-    46:46:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2587 -> c
-    47:49:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2588:2590 -> c
-    1:1:void lambda$allPhisAreStackMapPhis$1(com.android.tools.r8.ir.code.Instruction):770:770 -> d
-    2:4:void flushArgumentInstructions():1061:1063 -> d
-    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1155:1155 -> d
-    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):2334:2334 -> d
-    6:6:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1156 -> d
-    7:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1157:1157 -> d
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2393:2393 -> d
-    8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1158 -> d
-    9:11:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1159:1161 -> d
-    12:16:void addMoveResult(int):1787:1791 -> d
-    17:17:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> d
-    17:17:void addMoveResult(int):1793 -> d
-    18:18:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> d
-    18:18:void addMoveResult(int):1793 -> d
-    19:19:void addMoveResult(int):1795:1795 -> d
-    20:20:void addMoveResult(int):1794:1794 -> d
-    21:21:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> d
-    21:21:void addMoveResult(int):1799 -> d
-    22:25:void addMoveResult(int):1800:1803 -> d
-    26:30:void addNewInstance(int,com.android.tools.r8.graph.DexType):1847:1851 -> d
-    31:31:void ensureNormalSuccessorBlock(int,int):2559:2559 -> d
-    1:2:java.util.List getArgumentValues():523:524 -> e
-    3:3:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):690:690 -> e
-    4:4:void resolveAndBuildNewArrayFilledData(int,int):970:970 -> e
-    5:12:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1217:1224 -> e
-    5:12:void addSafeCheckCast(int,com.android.tools.r8.graph.DexType):1213 -> e
-    13:13:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1320:1320 -> e
-    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2334:2334 -> e
-    14:14:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1321 -> e
-    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2334:2334 -> e
-    15:15:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1322 -> e
-    16:16: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):2393:2393 -> e
-    16:16:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1323 -> e
-    17:19:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1325:1327 -> e
-    20:28:void addReturn(int):1863:1871 -> e
-    29:29:void addReturn(int):1870:1870 -> e
-    30:30:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromDexType(com.android.tools.r8.graph.DexType):111:111 -> e
-    30:30:void addReturn(int):1872 -> e
-    31:32:void addReturn(int):1873:1874 -> e
-    33:35:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1884:1886 -> e
-    33:35:void addReturn(int):1874 -> e
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():519:519 -> f
-    2:3:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1331:1332 -> f
-    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):2334:2334 -> f
-    4:4:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1333 -> f
-    5:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1334:1334 -> f
-    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):2393:2393 -> f
-    6:6:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1335 -> f
-    7:9:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1337:1339 -> f
-    10:15:void addThrow(int):2026:2031 -> f
-    1:1:com.android.tools.r8.graph.GraphLens getCodeLens():499:499 -> 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):2334:2334 -> g
-    2:2:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1373 -> 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):2334:2334 -> g
-    3:3:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1374 -> g
-    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):2393:2393 -> g
-    4:4:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1375 -> g
-    5:7:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1376:1378 -> g
-    8:9:void checkRegister(int):2408:2409 -> g
+    21:21:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1737 -> c
+    21:21:void addMoveException(int):1728 -> c
+    22:22:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1737:1737 -> c
+    22:22:void addMoveException(int):1728 -> c
+    23:26:void addInitClass(int,com.android.tools.r8.graph.DexType):1846:1849 -> c
+    27:42:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2416:2431 -> c
+    43:43:void ensureExceptionalSuccessorBlock(int,int):2519:2519 -> c
+    44:45:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2541:2542 -> c
+    46:46:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):534:534 -> c
+    46:46:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2543 -> c
+    47:49:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2544:2546 -> c
+    1:1:java.util.List getArgumentValues():519:519 -> d
+    2:2:void lambda$allPhisAreStackMapPhis$1(com.android.tools.r8.ir.code.Instruction):762:762 -> d
+    3:3:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1111:1111 -> d
+    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):2290:2290 -> d
+    4:4:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1112 -> d
+    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1113:1113 -> 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):2349:2349 -> d
+    6:6:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1114 -> d
+    7:9:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1115:1117 -> d
+    10:14:void addMoveResult(int):1743:1747 -> d
+    15:15:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> d
+    15:15:void addMoveResult(int):1749 -> d
+    16:16:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> d
+    16:16:void addMoveResult(int):1749 -> d
+    17:17:void addMoveResult(int):1751:1751 -> d
+    18:18:void addMoveResult(int):1750:1750 -> d
+    19:19:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> d
+    19:19:void addMoveResult(int):1755 -> d
+    20:23:void addMoveResult(int):1756:1759 -> d
+    24:28:void addNewInstance(int,com.android.tools.r8.graph.DexType):1803:1807 -> d
+    29:29:void ensureNormalSuccessorBlock(int,int):2515:2515 -> d
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():515:515 -> e
+    2:2:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):682:682 -> e
+    3:3:void resolveAndBuildNewArrayFilledData(int,int):962:962 -> e
+    4:11:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1173:1180 -> e
+    4:11:void addSafeCheckCast(int,com.android.tools.r8.graph.DexType):1169 -> e
+    12:12:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1276:1276 -> e
+    13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2290:2290 -> e
+    13:13:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1277 -> e
+    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2290:2290 -> e
+    14:14:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1278 -> e
+    15:15: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):2349:2349 -> e
+    15:15:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1279 -> e
+    16:18:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1281:1283 -> e
+    19:27:void addReturn(int):1819:1827 -> e
+    28:28:void addReturn(int):1826:1826 -> e
+    29:29:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromDexType(com.android.tools.r8.graph.DexType):111:111 -> e
+    29:29:void addReturn(int):1828 -> e
+    30:31:void addReturn(int):1829:1830 -> e
+    32:34:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1840:1842 -> e
+    32:34:void addReturn(int):1830 -> e
+    1:1:com.android.tools.r8.graph.GraphLens getCodeLens():495:495 -> f
+    2:3:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1287:1288 -> f
+    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):2290:2290 -> f
+    4:4:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1289 -> f
+    5:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1290:1290 -> f
+    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):2349:2349 -> f
+    6:6:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1291 -> f
+    7:9:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1293:1295 -> f
+    10:15:void addThrow(int):1982:1987 -> f
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():499:499 -> 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):2290:2290 -> g
+    2:2:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1329 -> 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):2290:2290 -> g
+    3:3:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1330 -> g
+    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):2349:2349 -> g
+    4:4:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1331 -> g
+    5:7:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1332:1334 -> g
+    8:9:void checkRegister(int):2364:2365 -> g
     10:10:void checkRegister(int):0:0 -> g
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16,"2":17,"3":18,"4":19,"5":20}}
-    16:16:void checkRegister(int):2409:2409 -> g
-    17:17:void checkRegister(int):2409:2409 -> g
-    18:18:void checkRegister(int):2409:2409 -> g
-    19:19:void checkRegister(int):2409:2409 -> g
-    20:20:void checkRegister(int):2409:2409 -> g
+    16:16:void checkRegister(int):2365:2365 -> g
+    17:17:void checkRegister(int):2365:2365 -> g
+    18:18:void checkRegister(int):2365:2365 -> g
+    19:19:void checkRegister(int):2365:2365 -> g
+    20:20:void checkRegister(int):2365:2365 -> g
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> g
-    11:11:void checkRegister(int):2409 -> g
-    12:12:void checkRegister(int):2409:2409 -> g
-    13:13:void checkRegister(int):2406:2406 -> g
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():503:503 -> h
-    2:2:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1382:1382 -> 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):2334:2334 -> h
-    3:3:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1383 -> h
-    4:4:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1384:1384 -> h
-    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):2393:2393 -> h
-    5:5:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1385 -> h
-    6:8:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1386:1388 -> h
-    9:13:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2482:2486 -> h
-    14:17:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2500:2503 -> h
-    14:17:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2487 -> h
-    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488:2489 -> h
-    20:26: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):323:329 -> h
-    20:26:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2489 -> h
-    27:28:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):293:294 -> h
-    27: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):330 -> h
-    27:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2489 -> h
-    29: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):332:337 -> h
-    29:34:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2489 -> h
-    35:35:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):298:298 -> h
-    35:35: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):338 -> h
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2489 -> h
-    36:36: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):340:340 -> h
-    36:36:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2489 -> h
-    37:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2491:2494 -> h
-    1:1:com.android.tools.r8.graph.ProgramMethod getProgramMethod():507:507 -> i
-    2:2:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2035:2035 -> 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):2334:2334 -> i
-    3:3:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2036 -> 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):2334:2334 -> i
-    4:4:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2037 -> i
-    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):2393:2393 -> i
-    5:5:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2038 -> i
-    6:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2039:2041 -> i
-    9:9:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2401:2401 -> i
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges():511:511 -> j
-    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2045:2045 -> 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):2334:2334 -> j
-    3:3:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2046 -> j
-    4:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2047:2047 -> j
-    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):2393:2393 -> j
-    5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2048 -> j
-    6:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2049:2051 -> j
-    9:9:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2577:2577 -> j
-    1:1:com.android.tools.r8.ir.code.Value getReceiverValue():528:528 -> k
-    2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1401:1401 -> 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):2334:2334 -> k
-    3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1402 -> 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):2334:2334 -> k
-    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1403 -> k
-    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):2393:2393 -> k
-    5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1404 -> k
-    6:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1406:1408 -> k
-    9:9:boolean isOffsetProcessed(int):2516:2516 -> k
-    10:11:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2520:2521 -> k
-    10:11:boolean isOffsetProcessed(int):2516 -> k
-    12:13:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2538:2539 -> k
-    12:13:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2523 -> k
-    12:13:boolean isOffsetProcessed(int):2516 -> k
-    14:14:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2524:2524 -> k
-    14:14:boolean isOffsetProcessed(int):2516 -> k
-    1:1:boolean isDebugMode():515:515 -> l
-    2:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1412:1413 -> l
-    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):2334:2334 -> l
-    4:4:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1414 -> l
-    5:5:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1415:1415 -> l
-    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):2393:2393 -> l
-    6:6:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1416 -> l
-    7:9:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1418:1420 -> l
-    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1924:1924 -> 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):2334:2334 -> m
-    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1925 -> m
-    3:3:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1926:1926 -> m
-    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):2393:2393 -> m
-    4:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1927 -> m
-    5:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1930:1932 -> m
-    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2055:2055 -> 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):2334:2334 -> n
-    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2056 -> n
-    3:3:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2057:2057 -> n
-    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):2393:2393 -> n
-    4:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2058 -> n
-    5:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2059:2061 -> n
-    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2065:2065 -> 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):2334:2334 -> o
-    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2066 -> o
-    3:3:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2067:2067 -> o
-    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):2393:2393 -> o
-    4:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2068 -> o
-    5:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2069:2071 -> o
-    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2075:2075 -> 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):2334:2334 -> p
-    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2076 -> p
-    3:3:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2077:2077 -> p
-    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):2393:2393 -> p
-    4:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2078 -> p
-    5:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2079:2081 -> p
-    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2085:2085 -> 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):2334:2334 -> q
-    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2086 -> q
-    3:3:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2087:2087 -> q
-    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):2393:2393 -> q
-    4:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2088 -> q
-    5:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2089:2091 -> 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):2334:2334 -> r
-    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1915 -> 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):2334:2334 -> r
-    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1916 -> r
-    3:3: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):2393:2393 -> r
-    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1917 -> r
-    4:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1918:1920 -> r
-    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2095:2095 -> 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):2334:2334 -> s
-    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2096 -> s
-    3:3:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2097:2097 -> s
-    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):2393:2393 -> s
-    4:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2098 -> s
-    5:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2099:2101 -> s
-    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2105:2105 -> 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):2334:2334 -> t
-    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2106 -> t
-    3:3:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2107:2107 -> t
-    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):2393:2393 -> t
-    4:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2108 -> t
-    5:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2109:2111 -> t
+    11:11:void checkRegister(int):2365 -> g
+    12:12:void checkRegister(int):2365:2365 -> g
+    13:13:void checkRegister(int):2362:2362 -> g
+    1:1:com.android.tools.r8.graph.ProgramMethod getProgramMethod():503:503 -> h
+    2:2:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1338:1338 -> 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):2290:2290 -> h
+    3:3:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1339 -> h
+    4:4:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1340:1340 -> h
+    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):2349:2349 -> h
+    5:5:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1341 -> h
+    6:8:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1342:1344 -> h
+    9:13:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2438:2442 -> h
+    14:17:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2456:2459 -> h
+    14:17:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2443 -> h
+    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2444:2445 -> h
+    20:27: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):321:328 -> h
+    20:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2445 -> h
+    28:29:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):291:292 -> h
+    28:29: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
+    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2445 -> h
+    30:36: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):330:336 -> h
+    30:36:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2445 -> h
+    37:37:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):296:296 -> h
+    37:37: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):336 -> h
+    37:37:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2445 -> h
+    38:38: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):338:338 -> h
+    38:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2445 -> h
+    39:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2447:2450 -> h
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges():507:507 -> i
+    2:2:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1991:1991 -> 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):2290:2290 -> i
+    3:3:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1992 -> 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):2290:2290 -> i
+    4:4:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1993 -> i
+    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):2349:2349 -> i
+    5:5:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1994 -> i
+    6:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1995:1997 -> i
+    9:9:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2533:2533 -> i
+    1:1:com.android.tools.r8.ir.code.Value getReceiverValue():523:523 -> j
+    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2001:2001 -> 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):2290:2290 -> j
+    3:3:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2002 -> j
+    4:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2003:2003 -> j
+    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):2349:2349 -> j
+    5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2004 -> j
+    6:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2005:2007 -> j
+    9:9:boolean isOffsetProcessed(int):2472:2472 -> j
+    10:11:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2476:2477 -> j
+    10:11:boolean isOffsetProcessed(int):2472 -> j
+    12:13:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2494:2495 -> j
+    12:13:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2479 -> j
+    12:13:boolean isOffsetProcessed(int):2472 -> j
+    14:14:boolean com.android.tools.r8.ir.conversion.IRBuilder.isIndexProcessed(int):2480:2480 -> j
+    14:14:boolean isOffsetProcessed(int):2472 -> j
+    1:1:boolean isDebugMode():511:511 -> k
+    2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1357:1357 -> 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):2290:2290 -> k
+    3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1358 -> 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):2290:2290 -> k
+    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1359 -> k
+    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):2349:2349 -> k
+    5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1360 -> k
+    6:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1362:1364 -> k
+    1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1368:1369 -> 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):2290:2290 -> l
+    3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1370 -> l
+    4:4:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1371:1371 -> l
+    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):2349:2349 -> l
+    5:5:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1372 -> l
+    6:8:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1374:1376 -> l
+    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1880:1880 -> 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):2290:2290 -> m
+    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1881 -> m
+    3:3:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1882:1882 -> m
+    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):2349:2349 -> m
+    4:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1883 -> m
+    5:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1886:1888 -> m
+    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2011:2011 -> 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):2290:2290 -> n
+    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2012 -> n
+    3:3:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2013:2013 -> n
+    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):2349:2349 -> n
+    4:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2014 -> n
+    5:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2015:2017 -> n
+    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2021:2021 -> 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):2290:2290 -> o
+    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2022 -> o
+    3:3:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2023:2023 -> o
+    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):2349:2349 -> o
+    4:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2024 -> o
+    5:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2025:2027 -> o
+    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2031:2031 -> 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):2290:2290 -> p
+    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2032 -> p
+    3:3:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2033:2033 -> p
+    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):2349:2349 -> p
+    4:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2034 -> p
+    5:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2035:2037 -> p
+    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2041:2041 -> 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):2290:2290 -> q
+    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2042 -> q
+    3:3:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2043:2043 -> q
+    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):2349:2349 -> q
+    4:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2044 -> q
+    5:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2045:2047 -> 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):2290:2290 -> r
+    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1871 -> 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):2290:2290 -> r
+    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1872 -> r
+    3:3: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):2349:2349 -> r
+    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1873 -> r
+    4:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1874:1876 -> r
+    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2051:2051 -> 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):2290:2290 -> s
+    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2052 -> s
+    3:3:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2053:2053 -> s
+    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):2349:2349 -> s
+    4:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2054 -> s
+    5:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2055:2057 -> s
+    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2061:2061 -> 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):2290:2290 -> t
+    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2062 -> t
+    3:3:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2063:2063 -> t
+    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):2349:2349 -> t
+    4:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2064 -> t
+    5:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2065:2067 -> t
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2769,"2":2770,"3":2771}}
-    2769:2769:java.lang.String toString():2761:2761 -> toString
-    2770:2770:java.lang.String toString():2761:2761 -> toString
-    2771:2771:java.lang.String toString():2762:2762 -> toString
-    2764:2768:java.lang.String toString():2763:2767 -> toString
-    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2115:2115 -> 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):2334:2334 -> u
-    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2116 -> 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):2334:2334 -> u
-    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2117 -> u
-    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):2393:2393 -> u
-    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2118 -> u
-    5:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2120:2128 -> u
-    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2132:2132 -> 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):2334:2334 -> v
-    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2133 -> v
-    3:3:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2135:2135 -> v
-    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):2393:2393 -> v
-    4:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2136 -> v
-    5:7:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2137:2139 -> v
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2393:2393 -> v
-    8:8:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2140 -> v
-    9:12:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2141:2144 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.internal.kn:
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.ln:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2725,"2":2726,"3":2727}}
+    2725:2725:java.lang.String toString():2717:2717 -> toString
+    2726:2726:java.lang.String toString():2717:2717 -> toString
+    2727:2727:java.lang.String toString():2718:2718 -> toString
+    2720:2724:java.lang.String toString():2719:2723 -> toString
+    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2071:2071 -> 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):2290:2290 -> u
+    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2072 -> 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):2290:2290 -> u
+    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2073 -> u
+    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):2349:2349 -> u
+    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2074 -> u
+    5:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2076:2084 -> u
+    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2088:2088 -> 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):2290:2290 -> v
+    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2089 -> v
+    3:3:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2091:2091 -> v
+    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):2349:2349 -> v
+    4:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2092 -> v
+    5:7:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2093:2095 -> v
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2349:2349 -> v
+    8:8:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2096 -> v
+    9:12:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2097:2100 -> v
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.Pm:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalPredecessors -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalSuccessors -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalPredecessors -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalSuccessors -> c
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:7:void <init>():276:282 -> <init>
+    1:7:void <init>():274:280 -> <init>
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":378,"2":379,"3":380}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":376,"2":377,"3":378}}
+    376:376:java.lang.String toString():344:344 -> toString
+    377:377:java.lang.String toString():344:344 -> toString
     378:378:java.lang.String toString():346:346 -> toString
-    379:379:java.lang.String toString():346:346 -> toString
-    380:380:java.lang.String toString():348:348 -> toString
-    349:353:java.lang.String toString():348:352 -> toString
-    354:354:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> toString
-    354:354:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> toString
-    354:354:java.lang.String toString():352 -> toString
-    355:359:java.lang.String toString():352:356 -> toString
-    360:360:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> toString
-    360:360:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> toString
-    360:360:java.lang.String toString():356 -> toString
-    361:371:java.lang.String toString():356:366 -> toString
-    372:372:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> toString
-    372:372:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> toString
-    372:372:java.lang.String toString():366 -> toString
-    373:377:java.lang.String toString():366:370 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.mn:
+    347:351:java.lang.String toString():346:350 -> toString
+    352:352:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> toString
+    352:352:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> toString
+    352:352:java.lang.String toString():350 -> toString
+    353:357:java.lang.String toString():350:354 -> toString
+    358:358:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> toString
+    358:358:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> toString
+    358:358:java.lang.String toString():354 -> toString
+    359:369:java.lang.String toString():354:364 -> toString
+    370:370:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> toString
+    370:370:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> toString
+    370:370:java.lang.String toString():364 -> toString
+    371:375:java.lang.String toString():364:368 -> toString
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.Qm:
     com.android.tools.r8.graph.DexType guard -> d
     int targetOffset -> f
     int sourceOffset -> e
-    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,int,int,com.android.tools.r8.ir.conversion.IRBuilder$1):200:200 -> <init>
-    2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,int,int):208:211 -> <init>
-    1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):200:200 -> a
-    1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):200:200 -> b
-    1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):200:200 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.nn:
+    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,int,int,com.android.tools.r8.ir.conversion.IRBuilder$1):198:198 -> <init>
+    2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,int,int):206:209 -> <init>
+    1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):198:198 -> a
+    1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):198:198 -> b
+    1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):198:198 -> c
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.Rm:
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
-    1:4:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position,int,int):227:230 -> <init>
-    1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):215:215 -> a
-    1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):215:215 -> b
-    1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):215:215 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.on:
+    1:4:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position,int,int):225:228 -> <init>
+    1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):213:213 -> a
+    1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):213:213 -> b
+    1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):213:213 -> c
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.Sm:
     java.util.List values -> a
-    1:3:void <init>():238:240 -> <init>
-    1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):246:248 -> a
-    1:9:boolean equals(java.lang.Object):260:268 -> equals
-    1:1:int hashCode():255:255 -> hashCode
-com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.pn:
+    1:3:void <init>():236:238 -> <init>
+    1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):244:246 -> a
+    1:9:boolean equals(java.lang.Object):258:266 -> equals
+    1:1:int hashCode():253:253 -> hashCode
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.Tm:
     int firstInstructionIndex -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:1:void <clinit>():188:188 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.conversion.IRBuilder$1):188:188 -> <init>
-    2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):193:196 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):188:188 -> a
-    1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):188:188 -> b
-com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.internal.yn:
-    com.android.tools.r8.utils.CfgPrinter printer -> n
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> A
+    1:1:void <clinit>():186:186 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.conversion.IRBuilder$1):186:186 -> <init>
+    2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):191:194 -> <init>
+    1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):186:186 -> a
+    1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):186:186 -> b
+com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.internal.dn:
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> E
+    boolean $assertionsDisabled -> N
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> p
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
-    com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> w
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> G
+    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> p
+    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> D
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> G
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis libraryMethodOverrideAnalysis -> g
-    com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer enumValueOptimizer -> z
+    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> B
     com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> j
-    com.android.tools.r8.utils.InternalOptions options -> m
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> q
+    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> w
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer stringBuilderOptimizer -> i
-    com.android.tools.r8.ir.optimize.Inliner inliner -> s
-    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> t
+    java.util.Set prunedMethodsInWave -> J
     com.android.tools.r8.utils.Timing timing -> b
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection instructionDesugaring -> e
-    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> y
-    com.android.tools.r8.graph.DexString highestSortingString -> I
+    java.util.List onWaveDoneActions -> I
     com.android.tools.r8.ir.optimize.outliner.Outliner outliner -> c
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis fieldAccessAnalysis -> f
-    com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> o
-    java.util.concurrent.atomic.AtomicBoolean seenNeverMergePrefix -> N
-    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> l
-    com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> v
-    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> F
-    boolean $assertionsDisabled -> O
+    com.android.tools.r8.ir.optimize.AssertionsRewriter assertionsRewriter -> C
+    java.util.concurrent.atomic.AtomicBoolean seenNotNeverMergePrefix -> L
+    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> t
+    com.android.tools.r8.ir.optimize.AssumeInserter assumeInserter -> A
+    java.util.List neverMergePrefixes -> K
+    com.android.tools.r8.utils.CfgPrinter printer -> m
+    com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> o
+    com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> v
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> k
-    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> E
-    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> q
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> H
-    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> C
-    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> x
-    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> r
-    java.util.List onWaveDoneActions -> J
-    com.android.tools.r8.ir.optimize.AssertionsRewriter assertionsRewriter -> D
+    com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer enumValueOptimizer -> y
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> F
+    com.android.tools.r8.utils.InternalOptions options -> l
+    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> s
+    com.android.tools.r8.ir.optimize.Inliner inliner -> r
+    com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> n
+    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> x
+    com.android.tools.r8.graph.DexString highestSortingString -> H
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> h
-    com.android.tools.r8.ir.optimize.AssumeInserter assumeInserter -> B
-    java.util.Set prunedMethodsInWave -> K
-    java.util.concurrent.atomic.AtomicBoolean seenNotNeverMergePrefix -> M
-    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> u
-    java.util.List neverMergePrefixes -> L
-    1:1:void <clinit>():128:128 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):187:187 -> <init>
-    2:150:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):169:317 -> <init>
-    151:151:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):322:322 -> <init>
-    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$26(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    java.util.concurrent.atomic.AtomicBoolean seenNeverMergePrefix -> M
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> z
+    com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> u
+    1:1:void <clinit>():126:126 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):184:184 -> <init>
+    2:146:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):166:310 -> <init>
+    147:147:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):315:315 -> <init>
+    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$24(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:java.lang.String lambda$new$0(java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":210,"2":211,"3":212}}
-    210:210:java.lang.String lambda$new$0(java.lang.String):206:206 -> a
-    211:211:java.lang.String lambda$new$0(java.lang.String):206:206 -> a
-    212:212:java.lang.String lambda$new$0(java.lang.String):206:206 -> a
-    207:207:java.lang.String lambda$new$0(java.lang.String):206:206 -> a
-    208:208:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageBinaryNameFromJavaType(java.lang.String):380:380 -> a
-    208:208:java.lang.String lambda$new$0(java.lang.String):206 -> a
-    209:209:java.lang.String lambda$new$0(java.lang.String):206:206 -> a
-    213:214:void com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover.run(com.android.tools.r8.graph.AppView):17:18 -> a
-    213:214:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):368 -> a
-    215:228:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):369:382 -> a
-    229:233:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):409:413 -> a
-    229:233:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):384 -> a
-    234:238:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):410:414 -> a
-    234:238:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):384 -> a
-    239:239:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):386:386 -> a
-    240:244:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):409:413 -> a
-    240:244:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):388 -> a
-    245:249:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):410:414 -> a
-    245:249:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):388 -> a
-    250:252:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):391:393 -> a
-    253:253:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    253:253:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):393 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    254:254:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):394:394 -> a
-    255:256:void com.android.tools.r8.ir.conversion.IRConverter.processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):361:362 -> a
-    255:256:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):396 -> a
-    257:263:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):398:404 -> a
-    264:264:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):401:401 -> a
-    265:269:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):336:340 -> a
-    270:270:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$1(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring):338:338 -> a
-    271:273:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):432:432 -> a
-    275:275:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):434:434 -> a
-    276:276:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):461:461 -> a
-    277:280:com.android.tools.r8.ir.conversion.ClassConverter com.android.tools.r8.ir.conversion.ClassConverter.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):48:51 -> a
-    277:280:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):462 -> a
-    281:291:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):463:473 -> a
-    292:300:void com.android.tools.r8.ir.desugar.lambda.D8LambdaDesugaring.rewriteEnclosingLambdaMethodAttributes(com.android.tools.r8.graph.AppView,java.util.Map):17:25 -> a
-    292:300:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):472 -> a
-    301:301:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):475:475 -> a
-    302:304:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):481:483 -> a
-    305:313:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):482:490 -> a
-    314:314:void lambda$prepareDesugaringForD8$5(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.DexProgramClass):485:485 -> a
-    315:315:void lambda$prepareDesugaringForD8$4(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):487:487 -> a
-    316:316:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):498:498 -> a
-    317:319:boolean com.android.tools.r8.graph.DexProgramClass.hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):767:769 -> a
-    317:319:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):498 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    320:351:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):500:531 -> a
-    352:356:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1934:1938 -> a
-    352:356:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):531 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    357:357:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
-    357:357:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1939 -> a
-    357:357:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):531 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    358:358:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):530:530 -> a
-    359:362:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540:543 -> a
-    363:367:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1934:1938 -> a
-    363:367:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):543 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    368:368:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
-    368:368:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1939 -> a
-    368:368:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):543 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    369:375:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):542:548 -> a
-    376:380:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):583:587 -> a
-    376:380:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):551 -> a
-    381:381:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    381:381:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):587 -> a
-    381:381:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):551 -> a
-    382:402:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):588:608 -> a
-    382:402:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):551 -> a
-    403:403:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    403:403:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):608 -> a
-    403:403:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):551 -> a
-    404:404:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    404:404:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    404:404:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):608 -> a
-    404:404:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):551 -> a
-    405:405:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):608:608 -> a
-    405:405:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):551 -> a
-    406:406:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):552:552 -> a
-    407:407:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    407:407:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):552 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    408:418:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):552:562 -> a
-    419:428:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):555:564 -> a
-    429:429:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    429:429:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):564 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    430:430:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):565:565 -> a
-    431:437:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1709:1715 -> a
-    431:437:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):565 -> a
-    438:438:void lambda$optimize$8(java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):653:653 -> a
-    439:439:com.android.tools.r8.utils.Timing lambda$optimize$10(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):678:678 -> a
-    440:440:void lambda$optimize$11(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):713:713 -> a
-    441:441:void lambda$optimize$12(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):733:733 -> a
-    442:442:com.android.tools.r8.utils.Timing lambda$optimize$13(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PostMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):748:748 -> a
-    443:443:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):825:825 -> a
-    444:450:void addWaveDoneAction(com.android.tools.r8.utils.Action):861:867 -> a
-    451:451:void addWaveDoneAction(com.android.tools.r8.utils.Action):865:865 -> a
-    452:452:void addWaveDoneAction(com.android.tools.r8.utils.Action):862:862 -> a
-    453:454:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):876:877 -> a
-    455:455:void lambda$computeReachabilitySensitivity$14(com.android.tools.r8.graph.DexEncodedMethod):881:881 -> a
-    456:459:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):894:897 -> a
-    460:460:void clearDexMethodCompilationState():901:901 -> a
-    461:461:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):905:905 -> a
-    462:471:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):918:927 -> a
-    472:477:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):926:931 -> a
-    478:478:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):968:968 -> a
-    478:478:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):931 -> a
-    479:479:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):931:931 -> a
-    480:480:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):930:930 -> a
-    481:482:void optimizeSynthesizedMethods(java.util.List,java.util.concurrent.ExecutorService):939:940 -> a
-    483:483:void lambda$optimizeSynthesizedMethod$16(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):950:950 -> a
-    484:486:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):957:959 -> a
-    487:487:com.android.tools.r8.utils.Timing lambda$rewriteDesugaredCode$19(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1024:1024 -> a
-    488:493:boolean com.android.tools.r8.ir.conversion.IRConverter.desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1083:1088 -> a
-    488:493:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1034 -> a
-    488:493:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$18(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1007 -> a
-    494:499:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1035:1040 -> a
-    494:499:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$18(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1007 -> a
-    500:500:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):968:968 -> a
-    500:500:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1040 -> a
-    500:500:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$18(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1007 -> a
-    501:501:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1040:1040 -> a
-    501:501:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$18(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1007 -> a
-    502:508:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1036:1042 -> a
-    502:508:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$18(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1007 -> a
-    509:519:com.android.tools.r8.utils.Timing optimize(com.android.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):1100:1110 -> a
-    520:525:void com.android.tools.r8.ir.conversion.IRConverter.printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1924:1929 -> a
-    520:525:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1113 -> a
-    526:551:com.android.tools.r8.utils.Timing optimize(com.android.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):1114:1139 -> a
-    552:552:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4431,"2":4432,"3":4433}}
-    4431:4431:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1139:1139 -> a
-    4432:4432:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1139:1139 -> a
-    4433:4433:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1139:1139 -> a
-    1693:1698:com.android.tools.r8.utils.Timing optimize(com.android.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):1141:1146 -> a
-    1699:1699:com.android.tools.r8.utils.Timing optimize(com.android.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):1144:1144 -> a
-    1700:1700:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4438,"2":4439,"3":4440}}
-    4438:4438:com.android.tools.r8.utils.Timing optimize(com.android.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):1144:1144 -> a
-    4439:4439:com.android.tools.r8.utils.Timing optimize(com.android.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):1144:1144 -> a
-    4440:4440:com.android.tools.r8.utils.Timing optimize(com.android.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):1144:1144 -> a
-    2847:2852:com.android.tools.r8.utils.Timing optimize(com.android.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):1147:1152 -> a
-    2853:2853:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4448,"2":4449,"3":4450}}
-    4448:4448:com.android.tools.r8.utils.Timing optimize(com.android.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):1152:1152 -> a
-    4449:4449:com.android.tools.r8.utils.Timing optimize(com.android.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):1152:1152 -> a
-    4450:4450:com.android.tools.r8.utils.Timing optimize(com.android.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):1152:1152 -> a
-    4008:4020:com.android.tools.r8.utils.Timing optimize(com.android.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):1155:1167 -> a
-    4021:4025:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1535:1539 -> a
-    4021:4025:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1169 -> a
-    4026:4026:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
-    4026:4026:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1539 -> a
-    4026:4026:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1169 -> a
-    4027:4028:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1539:1540 -> a
-    4027:4028:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1169 -> a
-    4029:4029:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    4029:4029:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1540 -> a
-    4029:4029:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1169 -> a
-    4030:4039:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1171:1180 -> a
-    4040:4065:com.android.tools.r8.utils.Timing optimize(com.android.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:1198 -> a
-    4066:4066:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):94:94 -> a
-    4066:4066:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1198 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4067:4093:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1199:1225 -> a
-    4094:4094:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
-    4094:4094:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1225 -> a
-    4095:4095:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1225:1225 -> a
-    4096:4096:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
-    4096:4096:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1225 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4097:4101:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1226:1226 -> a
-    4107:4125:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1232:1250 -> a
-    4126:4126:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):855:855 -> a
-    4126:4126:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1250 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4127:4127:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):849:849 -> a
-    4127:4127:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1250 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4128:4233:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1251:1356 -> a
-    4234:4235:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):90:91 -> a
-    4234:4235:com.android.tools.r8.utils.Timing optimize(com.android.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):1356 -> a
-    4236:4241:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1357:1362 -> a
-    4242:4244:void com.android.tools.r8.ir.conversion.IRConverter.invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):990:992 -> a
-    4242:4244:com.android.tools.r8.utils.Timing optimize(com.android.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):1363 -> a
-    4245:4259:com.android.tools.r8.utils.Timing optimize(com.android.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):1367:1381 -> a
-    4260:4291:com.android.tools.r8.utils.Timing optimize(com.android.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):1380:1411 -> a
-    4292:4339:com.android.tools.r8.utils.Timing optimize(com.android.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):1400:1447 -> a
-    4340:4340:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    4340:4340:com.android.tools.r8.utils.Timing optimize(com.android.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):1447 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4341:4363:com.android.tools.r8.utils.Timing optimize(com.android.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):1448:1470 -> a
-    4364:4369:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1190:1195 -> a
-    4364:4369:com.android.tools.r8.utils.Timing optimize(com.android.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):1470 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4370:4430:com.android.tools.r8.utils.Timing optimize(com.android.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):1470:1530 -> a
-    4451:4451:void lambda$optimize$20(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1239:1239 -> a
-    4452:4452:void lambda$optimize$21(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1243:1243 -> a
-    4453:4454:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$22(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1413:1414 -> a
-    4455:4455:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int):896:896 -> a
-    4455:4455:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$22(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1413 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4456:4456:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int):892:892 -> a
-    4456:4456:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$22(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1413 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4457:4502:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1554:1599 -> a
-    4503:4503:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1561:1561 -> a
-    4503:4503:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1599 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4504:4509:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1600:1605 -> a
-    4510:4510:void lambda$collectOptimizationInfo$23(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1555:1555 -> a
-    4511:4519:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1617:1625 -> a
-    4520:4520:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1621:1621 -> a
-    4521:4522:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1635:1636 -> a
-    4523:4523:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    4523:4523:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1636 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4524:4529:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions):1646:1651 -> a
-    4524:4529:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1637 -> a
-    4530:4530:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1639:1639 -> a
-    4531:4542:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1660:1671 -> a
-    4531:4542:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1640 -> a
-    4543:4549:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1709:1715 -> a
-    4543:4549:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1671 -> a
-    4543:4549:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1640 -> a
-    4550:4552:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1672:1674 -> a
-    4550:4552:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1640 -> a
-    4553:4553:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):968:968 -> a
-    4553:4553:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1674 -> a
-    4553:4553:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1640 -> a
-    4554:4554:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1674:1674 -> a
-    4554:4554:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1640 -> a
-    4555:4561:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1673:1679 -> a
-    4555:4561:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1640 -> a
-    4562:4562:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1684:1684 -> a
-    4563:4572:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1693:1702 -> a
-    4563:4572:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1686 -> a
-    4573:4575:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1687:1689 -> a
-    4576:4584: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1727:1735 -> a
-    4585:4597:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3932:3944 -> a
-    4585:4597: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1735 -> a
-    4598:4598:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
-    4598:4598:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3945 -> a
-    4598:4598: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1735 -> a
-    4599:4600:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3945:3946 -> a
-    4599:4600: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1735 -> a
-    4601:4616: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1737:1752 -> a
-    4617:4617: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1751:1751 -> a
-    4618:4632:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1809:1823 -> a
-    4633:4633:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
-    4633:4633:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongMul(com.android.tools.r8.ir.code.Instruction):1869 -> a
-    4633:4633:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1824 -> a
-    4634:4635:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongMul(com.android.tools.r8.ir.code.Instruction):1870:1871 -> a
-    4634:4635:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1824 -> a
-    4636:4636:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1827:1827 -> a
-    4637:4637:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1876:1876 -> a
-    4637:4637:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1828 -> a
-    4638:4638:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> a
-    4638:4638:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1876 -> a
-    4638:4638:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1828 -> a
-    4639:4639:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1877:1877 -> a
-    4639:4639:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1828 -> a
-    4640:4641:boolean com.android.tools.r8.ir.conversion.IRConverter.isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1881:1882 -> a
-    4640:4641:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1831 -> a
-    4642:4643:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1834:1835 -> a
-    4644:4648:boolean com.android.tools.r8.ir.conversion.IRConverter.isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1855:1859 -> a
-    4644:4648:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1836 -> a
-    4649:4654:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1837:1842 -> a
-    4655:4666:void com.android.tools.r8.ir.conversion.IRConverter.ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1891:1902 -> a
-    4655:4666:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1843 -> a
-    4667:4668:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$25(com.android.tools.r8.graph.DexItemFactory):1817:1818 -> a
-    4669:4669:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$25(com.android.tools.r8.graph.DexItemFactory):1816:1816 -> a
-    4670:4670:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1864:1864 -> a
-    4671:4671:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1940:1940 -> a
-    4672:4672:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    4672:4672:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1941 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4673:4690:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1942:1959 -> a
-    4691:4691:void lambda$onMethodCodePruned$28(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1992:1992 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":207,"2":208,"3":209}}
+    207:207:java.lang.String lambda$new$0(java.lang.String):203:203 -> a
+    208:208:java.lang.String lambda$new$0(java.lang.String):203:203 -> a
+    209:209:java.lang.String lambda$new$0(java.lang.String):203:203 -> a
+    204:204:java.lang.String lambda$new$0(java.lang.String):203:203 -> a
+    205:205:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageBinaryNameFromJavaType(java.lang.String):380:380 -> a
+    205:205:java.lang.String lambda$new$0(java.lang.String):203 -> a
+    206:206:java.lang.String lambda$new$0(java.lang.String):203:203 -> a
+    210:211:void com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover.run(com.android.tools.r8.graph.AppView):17:18 -> a
+    210:211:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):354 -> a
+    212:225:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):355:368 -> a
+    226:230:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):395:399 -> a
+    226:230:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):370 -> a
+    231:235:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):396:400 -> a
+    231:235:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):370 -> a
+    236:236:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):372:372 -> a
+    237:241:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):395:399 -> a
+    237:241:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):374 -> a
+    242:246:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):396:400 -> a
+    242:246:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):374 -> a
+    247:249:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):377:379 -> a
+    250:250:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    250:250:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):379 -> a
+    251:251:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):380:380 -> a
+    252:253:void com.android.tools.r8.ir.conversion.IRConverter.processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):347:348 -> a
+    252:253:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):382 -> a
+    254:260:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):384:390 -> a
+    261:261:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):387:387 -> a
+    262:266:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):329:333 -> a
+    267:267:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$1(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring):331:331 -> a
+    268:270:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):418:418 -> a
+    272:272:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):420:420 -> a
+    273:273:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):447:447 -> a
+    274:277:com.android.tools.r8.ir.conversion.ClassConverter com.android.tools.r8.ir.conversion.ClassConverter.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):48:51 -> a
+    274:277:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):448 -> a
+    278:288:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):449:459 -> a
+    289:297:void com.android.tools.r8.ir.desugar.lambda.D8LambdaDesugaring.rewriteEnclosingLambdaMethodAttributes(com.android.tools.r8.graph.AppView,java.util.Map):17:25 -> a
+    289:297:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):458 -> a
+    298:298:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):461:461 -> a
+    299:301:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):467:469 -> a
+    302:310:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):468:476 -> a
+    311:311:void lambda$prepareDesugaringForD8$5(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.DexProgramClass):471:471 -> a
+    312:312:void lambda$prepareDesugaringForD8$4(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):473:473 -> a
+    313:313:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):484:484 -> a
+    314:316:boolean com.android.tools.r8.graph.DexProgramClass.hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):767:769 -> a
+    314:316:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):484 -> a
+    317:348:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):486:517 -> a
+    349:353:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1956:1960 -> a
+    349:353:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):517 -> a
+    354:354:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
+    354:354:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1961 -> a
+    354:354:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):517 -> a
+    355:355:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):516:516 -> a
+    356:359:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):526:529 -> a
+    360:364:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1956:1960 -> a
+    360:364:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):529 -> a
+    365:365:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
+    365:365:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1961 -> a
+    365:365:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):529 -> a
+    366:372:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):528:534 -> a
+    373:377:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):569:573 -> a
+    373:377:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):537 -> a
+    378:378:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    378:378:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):573 -> a
+    378:378:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):537 -> a
+    379:399:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):574:594 -> a
+    379:399:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):537 -> 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.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):594 -> a
+    400:400:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):537 -> a
+    401:401:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    401:401:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    401:401:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):594 -> a
+    401:401:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):537 -> a
+    402:402:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):594:594 -> a
+    402:402:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):537 -> a
+    403:403:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):538:538 -> a
+    404:404:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    404:404:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):538 -> a
+    405:415:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):538:548 -> a
+    416:425:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):541:550 -> a
+    426:426:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    426:426:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):550 -> a
+    427:427:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):551:551 -> a
+    428:434:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1669:1675 -> a
+    428:434:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):551 -> a
+    435:435:void lambda$optimize$8(java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):639:639 -> a
+    436:436:com.android.tools.r8.utils.Timing lambda$optimize$9(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):660:660 -> a
+    437:437:void lambda$optimize$10(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):695:695 -> a
+    438:438:com.android.tools.r8.utils.Timing lambda$optimize$11(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PostMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):725:725 -> a
+    439:439:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):791:791 -> a
+    440:446:void addWaveDoneAction(com.android.tools.r8.utils.Action):827:833 -> a
+    447:447:void addWaveDoneAction(com.android.tools.r8.utils.Action):831:831 -> a
+    448:448:void addWaveDoneAction(com.android.tools.r8.utils.Action):828:828 -> a
+    449:450:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):842:843 -> a
+    451:451:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexEncodedMethod):847:847 -> a
+    452:455:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):860:863 -> a
+    456:456:void clearDexMethodCompilationState():867:867 -> a
+    457:457:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):871:871 -> a
+    458:467:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):884:893 -> a
+    468:473:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):892:897 -> a
+    474:474:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):934:934 -> a
+    474:474:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):897 -> a
+    475:475:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):897:897 -> a
+    476:476:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):896:896 -> a
+    477:478:void optimizeSynthesizedMethods(java.util.List,java.util.concurrent.ExecutorService):905:906 -> a
+    479:479:void lambda$optimizeSynthesizedMethod$14(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):916:916 -> a
+    480:482:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):923:925 -> a
+    483:483:com.android.tools.r8.utils.Timing lambda$rewriteDesugaredCode$17(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):990:990 -> a
+    484:489:boolean com.android.tools.r8.ir.conversion.IRConverter.desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1049:1054 -> a
+    484:489:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1000 -> a
+    484:489:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):973 -> a
+    490:495:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1001:1006 -> a
+    490:495:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):973 -> a
+    496:496:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):934:934 -> a
+    496:496:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1006 -> a
+    496:496:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):973 -> a
+    497:497:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1006:1006 -> a
+    497:497:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):973 -> a
+    498:504:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1002:1008 -> a
+    498:504:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):973 -> a
+    505:515:com.android.tools.r8.utils.Timing optimize(com.android.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):1066:1076 -> a
+    516:521:void com.android.tools.r8.ir.conversion.IRConverter.printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1884:1889 -> a
+    516:521:com.android.tools.r8.utils.Timing optimize(com.android.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):1079 -> a
+    522:547:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1080:1105 -> a
+    548:548:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4319,"2":4320,"3":4321}}
+    4319:4319:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1105:1105 -> a
+    4320:4320:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1105:1105 -> a
+    4321:4321:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1105:1105 -> a
+    1655:1660:com.android.tools.r8.utils.Timing optimize(com.android.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):1107:1112 -> a
+    1661:1661:com.android.tools.r8.utils.Timing optimize(com.android.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):1110:1110 -> a
+    1662:1662:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4326,"2":4327,"3":4328}}
+    4326:4326:com.android.tools.r8.utils.Timing optimize(com.android.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):1110:1110 -> a
+    4327:4327:com.android.tools.r8.utils.Timing optimize(com.android.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):1110:1110 -> a
+    4328:4328:com.android.tools.r8.utils.Timing optimize(com.android.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):1110:1110 -> a
+    2775:2780:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1113:1118 -> a
+    2781:2781:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4336,"2":4337,"3":4338}}
+    4336:4336:com.android.tools.r8.utils.Timing optimize(com.android.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):1118:1118 -> a
+    4337:4337:com.android.tools.r8.utils.Timing optimize(com.android.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):1118:1118 -> a
+    4338:4338:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1118:1118 -> a
+    3902:3914:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1121:1133 -> a
+    3915:3919:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1495:1499 -> a
+    3915:3919:com.android.tools.r8.utils.Timing optimize(com.android.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):1135 -> a
+    3920:3920:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
+    3920:3920:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1499 -> a
+    3920:3920:com.android.tools.r8.utils.Timing optimize(com.android.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):1135 -> a
+    3921:3922:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1499:1500 -> a
+    3921:3922:com.android.tools.r8.utils.Timing optimize(com.android.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):1135 -> a
+    3923:3923:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
+    3923:3923:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1500 -> a
+    3923:3923:com.android.tools.r8.utils.Timing optimize(com.android.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):1135 -> a
+    3924:3933:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1137:1146 -> a
+    3934:3959:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1139:1164 -> a
+    3960:3960:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):94:94 -> a
+    3960:3960:com.android.tools.r8.utils.Timing optimize(com.android.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):1164 -> a
+    3961:3987:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1165:1191 -> a
+    3988:3988:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
+    3988:3988:com.android.tools.r8.utils.Timing optimize(com.android.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):1191 -> a
+    3989:3989:com.android.tools.r8.utils.Timing optimize(com.android.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):1191:1191 -> a
+    3990:3990:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
+    3990:3990:com.android.tools.r8.utils.Timing optimize(com.android.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):1191 -> a
+    3991:3995:com.android.tools.r8.utils.Timing optimize(com.android.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):1192:1192 -> a
+    4001:4019:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1198:1216 -> a
+    4020:4020:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):870:870 -> a
+    4020:4020:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1216 -> a
+    4021:4021:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):864:864 -> a
+    4021:4021:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1216 -> a
+    4022:4127:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1217:1322 -> a
+    4128:4129:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):90:91 -> a
+    4128:4129:com.android.tools.r8.utils.Timing optimize(com.android.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):1322 -> a
+    4130:4135:com.android.tools.r8.utils.Timing optimize(com.android.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):1323:1328 -> a
+    4136:4138:void com.android.tools.r8.ir.conversion.IRConverter.invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):956:958 -> a
+    4136:4138:com.android.tools.r8.utils.Timing optimize(com.android.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):1329 -> a
+    4139:4153:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1333:1347 -> a
+    4154:4185:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1346:1377 -> a
+    4186:4233:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1366:1413 -> a
+    4234:4234:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    4234:4234:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1413 -> a
+    4235:4257:com.android.tools.r8.utils.Timing optimize(com.android.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):1414:1436 -> a
+    4258:4263:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1200:1205 -> a
+    4258:4263:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1436 -> a
+    4264:4318:com.android.tools.r8.utils.Timing optimize(com.android.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):1436:1490 -> a
+    4339:4339:void lambda$optimize$18(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1205:1205 -> a
+    4340:4340:void lambda$optimize$19(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1209:1209 -> a
+    4341:4343:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$20(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1379:1379 -> a
+    4344:4344:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int):911:911 -> a
+    4344:4344:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$20(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1379 -> a
+    4345:4345:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int):907:907 -> a
+    4345:4345:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$20(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1379 -> a
+    4346:4391:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1514:1559 -> a
+    4392:4392:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1583:1583 -> a
+    4392:4392:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1559 -> a
+    4393:4398:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1560:1565 -> a
+    4399:4399:void lambda$collectOptimizationInfo$21(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1515:1515 -> a
+    4400:4408:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1577:1585 -> a
+    4409:4409:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1581:1581 -> a
+    4410:4411:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1595:1596 -> a
+    4412:4412:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    4412:4412:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1596 -> a
+    4413:4418:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions):1606:1611 -> a
+    4413:4418:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1597 -> a
+    4419:4419:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1599:1599 -> a
+    4420:4431:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1620:1631 -> a
+    4420:4431:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1600 -> a
+    4432:4438:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1669:1675 -> a
+    4432:4438:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1631 -> a
+    4432:4438:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1600 -> a
+    4439:4441:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1632:1634 -> a
+    4439:4441:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1600 -> a
+    4442:4442:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):934:934 -> a
+    4442:4442:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1634 -> a
+    4442:4442:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1600 -> a
+    4443:4443:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1634:1634 -> a
+    4443:4443:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1600 -> a
+    4444:4450:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1633:1639 -> a
+    4444:4450:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1600 -> a
+    4451:4451:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1644:1644 -> a
+    4452:4461:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1653:1662 -> a
+    4452:4461:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1646 -> a
+    4462:4464:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1647:1649 -> a
+    4465:4473: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1687:1695 -> a
+    4474:4486:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3932:3944 -> a
+    4474:4486: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1695 -> a
+    4487:4487:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    4487:4487:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3945 -> a
+    4487:4487: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1695 -> a
+    4488:4489:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3945:3946 -> a
+    4488:4489: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1695 -> a
+    4490:4505: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1697:1712 -> a
+    4506:4506: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.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1711:1711 -> a
+    4507:4521:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1769:1783 -> a
+    4522:4522:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
+    4522:4522:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongMul(com.android.tools.r8.ir.code.Instruction):1829 -> a
+    4522:4522:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1784 -> a
+    4523:4524:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongMul(com.android.tools.r8.ir.code.Instruction):1830:1831 -> a
+    4523:4524:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1784 -> a
+    4525:4525:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1787:1787 -> a
+    4526:4526:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1836:1836 -> a
+    4526:4526:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1788 -> a
+    4527:4527:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> a
+    4527:4527:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1836 -> a
+    4527:4527:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1788 -> a
+    4528:4528:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1837:1837 -> a
+    4528:4528:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1788 -> a
+    4529:4530:boolean com.android.tools.r8.ir.conversion.IRConverter.isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1841:1842 -> a
+    4529:4530:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1791 -> a
+    4531:4532:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1794:1795 -> a
+    4533:4537:boolean com.android.tools.r8.ir.conversion.IRConverter.isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1815:1819 -> a
+    4533:4537:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1796 -> a
+    4538:4543:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1797:1802 -> a
+    4544:4555:void com.android.tools.r8.ir.conversion.IRConverter.ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1851:1862 -> a
+    4544:4555:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1803 -> a
+    4556:4557:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$23(com.android.tools.r8.graph.DexItemFactory):1777:1778 -> a
+    4558:4558:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$23(com.android.tools.r8.graph.DexItemFactory):1776:1776 -> a
+    4559:4559:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1824:1824 -> a
+    4560:4560:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1900:1900 -> a
+    4561:4561:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    4561:4561:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1901 -> a
+    4562:4579:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1902:1919 -> a
+    4580:4580:void lambda$onMethodCodePruned$26(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1949:1949 -> a
     boolean lambda$postProcessingDesugaringForD8$2(com.android.tools.r8.graph.ProgramMethod) -> b
-    1:1:void clearNestAttributes():349:349 -> b
-    2:9:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):442:449 -> b
-    10:13:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):448:451 -> b
-    14:17:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):450:453 -> b
-    18:18:boolean lambda$prepareDesugaringForD8$3(com.android.tools.r8.graph.DexEncodedMethod):486:486 -> b
-    19:24:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):615:620 -> b
-    25:25:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):619:619 -> b
-    26:26:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):634:634 -> b
+    1:1:void clearNestAttributes():342:342 -> b
+    2:9:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):428:435 -> b
+    10:13:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):434:437 -> b
+    14:17:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):436:439 -> b
+    18:18:boolean lambda$prepareDesugaringForD8$3(com.android.tools.r8.graph.DexEncodedMethod):472:472 -> b
+    19:24:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):601:606 -> b
+    25:25:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):605:605 -> b
+    26:26:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):620:620 -> b
     27:27:boolean com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection.isEmpty():0:0 -> b
-    27:27:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):634 -> b
-    28:70:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):634:676 -> b
-    71:72:void com.android.tools.r8.ir.conversion.IRConverter.lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):855:856 -> b
-    71:72:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):684 -> b
-    73:87:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):685:699 -> b
-    88:92:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):420:424 -> b
-    88:92:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):702 -> b
-    93:93:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):421:421 -> b
-    93:93:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):702 -> b
-    94:156:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):707:769 -> b
-    157:157:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
-    157:157:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):769 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    158:158:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):770:770 -> b
-    159:160:void com.android.tools.r8.ir.conversion.IRConverter.staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):355:356 -> b
-    159:160:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):772 -> b
-    161:164:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):773:776 -> b
-    165:169:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):420:424 -> b
-    165:169:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):781 -> b
-    170:170:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):421:421 -> b
-    170:170:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):781 -> b
-    171:176:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):784:789 -> b
-    177:210:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):788:821 -> b
-    211:211:void lambda$optimize$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):658:658 -> b
-    212:216:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):830:834 -> b
-    217:217:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1561:1561 -> b
-    217:217:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):834 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    218:229:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):835:846 -> b
-    230:236:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):842:848 -> b
-    237:237:void lambda$computeReachabilitySensitivity$15(com.android.tools.r8.graph.DexProgramClass):879:879 -> b
-    238:240:boolean com.android.tools.r8.graph.DexProgramClass.hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):767:769 -> b
-    238:240:void lambda$computeReachabilitySensitivity$15(com.android.tools.r8.graph.DexProgramClass):879 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    241:242:void lambda$computeReachabilitySensitivity$15(com.android.tools.r8.graph.DexProgramClass):880:881 -> b
-    243:243:void processSynthesizedServiceLoaderMethods(java.util.List,java.util.concurrent.ExecutorService):889:889 -> b
-    244:244:void lambda$processMethodsConcurrently$17(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):961:961 -> b
-    245:254:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):977:986 -> b
-    255:256:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1004:1005 -> b
-    257:257:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1003:1003 -> b
-    258:278:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1758:1778 -> b
-    279:291:void com.android.tools.r8.ir.conversion.IRConverter.ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1908:1920 -> b
-    279:291:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1789 -> b
-    292:296:boolean lambda$workaroundForwardingInitializerBug$24(com.android.tools.r8.ir.code.Instruction):1780:1784 -> b
-    297:298:void printPhase(java.lang.String):1934:1935 -> b
-    299:299:void lambda$onMethodPruned$27(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1972:1972 -> b
-    1:1:com.android.tools.r8.ir.optimize.Inliner getInliner():330:330 -> c
-    2:3:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$7(com.android.tools.r8.graph.DexProgramClass):622:623 -> c
-    4:4:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$6(com.android.tools.r8.graph.ProgramMethod):624:624 -> c
-    5:6:com.android.tools.r8.utils.Timing rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1021:1022 -> c
-    7:7:com.android.tools.r8.utils.Timing rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1020:1020 -> c
-    1:1:boolean isInWave():871:871 -> d
-    2:11:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1050:1059 -> d
-    12:12:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):968:968 -> d
-    12:12:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1059 -> d
-    13:13:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1059:1059 -> d
-    14:21:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1055:1062 -> d
-    22:22:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):570:570 -> d
-    22:22:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065 -> d
+    27:27:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):620 -> b
+    28:66:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):620:658 -> b
+    67:68:void com.android.tools.r8.ir.conversion.IRConverter.lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):821:822 -> b
+    67:68:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):666 -> b
+    69:83:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):667:681 -> b
+    84:88:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):406:410 -> b
+    84:88:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):684 -> b
+    89:89:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):407:407 -> b
+    89:89:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):684 -> b
+    90:144:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):689:743 -> b
+    145:149:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):406:410 -> b
+    145:149:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):747 -> b
+    150:150:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):407:407 -> b
+    150:150:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):747 -> b
+    151:156:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):750:755 -> b
+    157:190:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):754:787 -> b
+    191:195:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):796:800 -> b
+    196:196:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1583:1583 -> b
+    196:196:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):800 -> b
+    197:208:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):801:812 -> b
+    209:215:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):808:814 -> b
+    216:216:void lambda$computeReachabilitySensitivity$13(com.android.tools.r8.graph.DexProgramClass):845:845 -> b
+    217:219:boolean com.android.tools.r8.graph.DexProgramClass.hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):767:769 -> b
+    217:219:void lambda$computeReachabilitySensitivity$13(com.android.tools.r8.graph.DexProgramClass):845 -> b
+    220:221:void lambda$computeReachabilitySensitivity$13(com.android.tools.r8.graph.DexProgramClass):846:847 -> b
+    222:222:void processSynthesizedServiceLoaderMethods(java.util.List,java.util.concurrent.ExecutorService):855:855 -> b
+    223:223:void lambda$processMethodsConcurrently$15(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):927:927 -> b
+    224:233:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):943:952 -> b
+    234:235:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):970:971 -> b
+    236:236:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):969:969 -> b
+    237:257:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1718:1738 -> b
+    258:270:void com.android.tools.r8.ir.conversion.IRConverter.ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1868:1880 -> b
+    258:270:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1749 -> b
+    271:275:boolean lambda$workaroundForwardingInitializerBug$22(com.android.tools.r8.ir.code.Instruction):1740:1744 -> b
+    276:277:void printPhase(java.lang.String):1894:1895 -> b
+    278:278:void lambda$onMethodPruned$25(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1932:1932 -> b
+    1:1:com.android.tools.r8.ir.optimize.Inliner getInliner():323:323 -> c
+    2:3:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$7(com.android.tools.r8.graph.DexProgramClass):608:609 -> c
+    4:4:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$6(com.android.tools.r8.graph.ProgramMethod):610:610 -> c
+    5:6:com.android.tools.r8.utils.Timing rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):987:988 -> c
+    7:7:com.android.tools.r8.utils.Timing rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):986:986 -> c
+    1:1:boolean isInWave():837:837 -> d
+    2:11:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1016:1025 -> d
+    12:12:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):934:934 -> d
+    12:12:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1025 -> d
+    13:13:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1025:1025 -> d
+    14:21:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1021:1028 -> d
+    22:22:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):556:556 -> d
+    22:22:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1031 -> d
     23:23:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> d
-    23:23:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):570 -> d
-    23:23:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065 -> d
-    24:30:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):573:579 -> d
-    24:30:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065 -> d
-    31:41:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065:1075 -> d
-    42:43:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1066:1067 -> d
-    44:54:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1989:1999 -> d
-    1:1:void reportNestDesugarDependencies():344:344 -> e
-    2:13:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1970:1981 -> e
-    1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):944:948 -> f
-com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.internal.zB:
+    23:23:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):556 -> d
+    23:23:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1031 -> d
+    24:30:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):559:565 -> d
+    24:30:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1031 -> d
+    31:41:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1031:1041 -> d
+    42:43:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1032:1033 -> d
+    44:51:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1946:1953 -> d
+    1:1:void reportNestDesugarDependencies():337:337 -> e
+    2:10:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1930:1938 -> e
+    1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):910:914 -> f
+com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.internal.JA:
+    com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> b
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> c
     com.android.tools.r8.utils.InternalOptions options -> d
     boolean $assertionsDisabled -> e
-    com.android.tools.r8.ir.conversion.LensCodeRewriterUtils helper -> c
-    1:1:void <clinit>():111:111 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):118:118 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):115:121 -> <init>
-    boolean lambda$insertCastForFieldAssignmentIfNeeded$11(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
-    boolean lambda$insertNullCheckForInvokeReceiverIfNeeded$12(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.LensCodeRewriter):111:111 -> a
-    2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):111:111 -> a
-    3:5:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):134:136 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):88:88 -> a
-    6:6:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):136 -> a
-    7:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):137:137 -> a
-    8:14:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):153:159 -> a
-    15:18:com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):45:48 -> a
-    15:18:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):160 -> a
-    19:22:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):162:165 -> a
-    23:32:boolean com.android.tools.r8.ir.conversion.LensCodeRewriter.unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1024:1033 -> a
-    23:32:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):167 -> a
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    33:33:boolean com.android.tools.r8.ir.conversion.LensCodeRewriter.unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1033 -> a
-    33:33:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):167 -> a
-    34:44:boolean com.android.tools.r8.ir.conversion.LensCodeRewriter.unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1034:1044 -> a
-    34:44:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):167 -> a
-    45:592:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):170:717 -> a
-    593:593:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):88:88 -> a
-    593:593:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):717 -> a
-    594:595:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):719:720 -> a
-    596:597:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):479:480 -> a
-    598:598:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):471:471 -> a
-    598:598:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):481 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    599:613:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):483:497 -> a
-    614:618:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):496:500 -> a
-    619:724:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):499:604 -> a
-    725:725:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):603:603 -> a
-    726:727:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):437:438 -> a
-    728:728:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):471:471 -> a
-    728:728:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):439 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    729:731:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):440:442 -> a
-    732:735:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):143:146 -> a
-    732:735:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):445 -> a
-    736:738:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):446:446 -> a
-    739:742:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):143:146 -> a
-    739:742:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):449 -> a
-    743:745:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):450:450 -> a
-    749:752:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):454:457 -> a
-    753:758:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):456:461 -> a
-    759:759:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
-    759:759:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):461 -> a
-    760:769:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):462:471 -> a
-    770:773:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):209:212 -> a
-    774:1186:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):211:623 -> a
-    1187:1187:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):622:622 -> a
-    1188:1191:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):610:613 -> a
-    1192:1192:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):612:612 -> a
-    1193:1217:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):223:247 -> a
-    1218:1251:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):979:1012 -> a
-    1218:1251:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):247 -> a
-    1252:1252:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):1003:1003 -> a
-    1252:1252:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):247 -> a
-    1253:1253:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):1002:1002 -> a
-    1253:1253:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):247 -> a
-    1254:1254:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):250:250 -> a
-    1255:1255:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    1255:1255:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):250 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1256:1280:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):251:275 -> a
-    1281:1281:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2976,"2":2977,"3":2978}}
-    2976:2976:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):277:277 -> a
-    2977:2977:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):277:277 -> a
-    2978:2978:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):277:277 -> a
-    1560:1562:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):279:281 -> a
-    1563:1575:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):276:288 -> a
-    1576:1576:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
-    1576:1576:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):288 -> a
-    1577:1584:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):289:296 -> a
-    1585:1591:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):291:297 -> a
-    1592:1592:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
-    1592:1592:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):298 -> a
-    1593:1619:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):299:325 -> a
-    1620:1634:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):321:335 -> a
-    1635:1647:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):334:346 -> a
-    1648:1648:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    1648:1648:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):346 -> a
-    1649:1649:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    1649:1649:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    1649:1649:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):346 -> a
-    1650:1694:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):347:391 -> a
-    1695:1695:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1695:1695:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):391 -> a
-    1696:1696:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1696:1696:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1696:1696:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):391 -> a
-    1697:1705:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):391:399 -> a
-    1706:1712:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):398:404 -> a
-    1713:1738:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):403:428 -> a
-    1739:1740:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):176:177 -> a
-    1741:1744:com.android.tools.r8.ir.conversion.LensCodeRewriterUtils com.android.tools.r8.ir.conversion.LensCodeRewriter.getHelper():126:129 -> a
-    1741:1744:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):178 -> a
-    1745:2119:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):178:552 -> a
-    2120:2120:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):471:471 -> a
-    2120:2120:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):553 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2121:2136:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):555:570 -> a
-    2137:2141:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):569:573 -> a
-    2142:2143:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):510:511 -> a
-    2144:2144:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):471:471 -> a
-    2144:2144:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):512 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2145:2147:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):513:515 -> a
-    2148:2151:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):143:146 -> a
-    2148:2151:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):518 -> a
-    2152:2154:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):519:519 -> a
-    2155:2158:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):143:146 -> a
-    2155:2158:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):522 -> a
-    2159:2165:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):523:529 -> a
-    2166:2171:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):528:533 -> a
-    2172:2172:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
-    2172:2172:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):533 -> a
-    2173:2289:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):534:650 -> a
-    2290:2290:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):193:193 -> a
-    2291:2294:com.android.tools.r8.ir.conversion.LensCodeRewriterUtils com.android.tools.r8.ir.conversion.LensCodeRewriter.getHelper():126:129 -> a
-    2291:2294:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):195 -> a
-    2295:2695:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):195:595 -> a
-    2696:2696:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):594:594 -> a
-    2697:2700:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):581:584 -> a
-    2701:2828:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):583:710 -> a
-    2829:2854:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):659:684 -> a
-    2855:2857:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):639:641 -> a
-    2858:2861:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):630:633 -> a
-    2862:2926:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):632:696 -> a
-    2927:2927:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    2927:2927:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):696 -> a
-    2928:2929:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):697:698 -> a
-    2930:2930:com.android.tools.r8.ir.code.Argument$Builder com.android.tools.r8.ir.code.Argument.builder():36:36 -> a
-    2930:2930:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):700 -> a
-    2931:2931:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):701:701 -> a
-    2932:2932:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1646:1646 -> a
-    2932:2932:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):702 -> a
-    2933:2935:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):702:704 -> a
-    2936:2975:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):699:738 -> a
-    2979:2979:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):212:212 -> a
-    2980:2986:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):232:238 -> a
-    2987:2987:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):230:230 -> a
-    2987:2987:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):238 -> a
-    2988:2988:java.util.Map lambda$rewrite$2(com.android.tools.r8.ir.analysis.value.SingleNumberValue):368:368 -> a
-    2989:2995:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):372:378 -> a
-    2996:2996:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):377:377 -> a
-    2997:2997:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):374:374 -> a
-    2998:2998:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    2998:2998:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):374 -> a
-    2999:3001:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):379:381 -> a
-    3002:3006:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):380:384 -> a
-    3007:3007:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):586:586 -> a
-    3008:3008:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):604:604 -> a
-    3009:3009:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):614:614 -> a
-    3010:3010:com.android.tools.r8.ir.code.Instruction lambda$rewrite$8(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):624:624 -> a
-    3011:3011:com.android.tools.r8.ir.code.Instruction lambda$rewrite$10(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):642:642 -> a
-    3012:3015:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):747:750 -> a
-    3016:3016:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
-    3016:3016:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):750 -> a
-    3017:3018:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):751:752 -> a
-    3019:3019:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    3019:3019:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):752 -> a
-    3020:3020:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    3020:3020:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    3020:3020:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):752 -> a
-    3021:3021:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1646:1646 -> a
-    3021:3021:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):752 -> a
-    3022:3032:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):752:762 -> a
-    3033:3033:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
-    3033:3033:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):762 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3034:3040:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):763:769 -> a
-    3041:3055:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):830:844 -> a
-    3056:3056:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
-    3056:3056:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):844 -> a
-    3057:3062:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):845:850 -> a
-    3063:3063:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    3063:3063:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):850 -> a
-    3064:3064:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1646:1646 -> a
-    3064:3064:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):846 -> a
-    3065:3079:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):846:860 -> a
-    3080:3080:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
-    3080:3080:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):860 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3081:3087:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):861:867 -> a
-    3088:3102:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return):875:889 -> a
-    3103:3103:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
-    3103:3103:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return):889 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3104:3112:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return):890:898 -> a
-    3113:3113:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
-    3113:3113:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return):898 -> a
-    3114:3116:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return):899:901 -> a
-    3117:3117:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    3117:3117:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return):901 -> a
-    3118:3118:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1646:1646 -> a
-    3118:3118:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return):900 -> a
-    3119:3128:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return):900:909 -> a
-    3129:3136:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):914:921 -> a
-    3137:3142:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):920:925 -> a
-    3143:3143:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):936:936 -> a
-    3144:3154:boolean com.android.tools.r8.ir.conversion.LensCodeRewriter.defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):949:959 -> a
-    3144:3154:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):936 -> a
-    3155:3157:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):937:939 -> a
-    3158:3161:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.LensCodeRewriter.defaultValueLatticeElement(com.android.tools.r8.graph.DexType):964:967 -> a
-    3158:3161:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):941 -> a
-    3162:3164:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):940:942 -> a
+    1:1:void <clinit>():121:121 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):153:157 -> <init>
+    boolean lambda$insertCastForFieldAssignmentIfNeeded$13(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
+    boolean lambda$removeUnusedArguments$12(com.android.tools.r8.ir.code.UnusedArgument,com.android.tools.r8.ir.code.Instruction) -> a
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.LensCodeRewriter):121:121 -> a
+    2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):121:121 -> a
+    3:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):162:164 -> a
+    3:5:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):121 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):96:96 -> a
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):164 -> a
+    6:6:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):121 -> a
+    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):165:165 -> a
+    7:7:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):121 -> a
+    8:19:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):234:245 -> a
+    20:40:boolean com.android.tools.r8.ir.conversion.LensCodeRewriter.unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1192:1212 -> a
+    20:40:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):247 -> a
+    41:565:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):250:774 -> a
+    566:566:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):96:96 -> a
+    566:566:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):774 -> a
+    567:568:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):776:777 -> a
+    569:579:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):561:571 -> a
+    580:584:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):570:574 -> a
+    585:677:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):573:665 -> a
+    678:678:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):664:664 -> a
+    679:682:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):525:528 -> a
+    683:686:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):171:174 -> a
+    683:686:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):531 -> a
+    687:689:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):532:532 -> a
+    693:696:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):536:539 -> a
+    697:702:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):538:543 -> a
+    703:703:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
+    703:703:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):543 -> a
+    704:713:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):544:553 -> a
+    714:717:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):290:293 -> a
+    718:1115:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):292:689 -> a
+    1116:1116:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):688:688 -> a
+    1117:1120:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):674:677 -> a
+    1121:1121:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):676:676 -> a
+    1122:1148:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):307:333 -> a
+    1149:1182:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):1146:1179 -> a
+    1149:1182:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):333 -> a
+    1183:1183:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):1170:1170 -> a
+    1183:1183:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):333 -> a
+    1184:1184:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):1169:1169 -> a
+    1184:1184:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):333 -> a
+    1185:1185:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):337:337 -> a
+    1186:1209:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):336:359 -> a
+    1210:1210:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2932,"2":2933,"3":2934}}
+    2932:2932:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):361:361 -> a
+    2933:2933:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):361:361 -> a
+    2934:2934:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):361:361 -> a
+    1573:1575:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):363:365 -> a
+    1576:1588:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):360:372 -> a
+    1589:1589:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
+    1589:1589:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):372 -> a
+    1590:1597:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):373:380 -> a
+    1598:1604:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):375:381 -> a
+    1605:1605:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
+    1605:1605:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):382 -> a
+    1606:1628:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):383:405 -> a
+    1629:1635:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):404:410 -> a
+    1636:1649:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):407:420 -> a
+    1650:1662:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):419:431 -> a
+    1663:1663:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    1663:1663:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):431 -> a
+    1664:1664:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    1664:1664:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    1664:1664:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):431 -> a
+    1665:1666:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):432:433 -> a
+    1667:1669:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):162:164 -> a
+    1667:1669:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):438 -> a
+    1670:1670:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):96:96 -> a
+    1670:1670:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):164 -> a
+    1670:1670:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):438 -> a
+    1671:1671:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):165:165 -> a
+    1671:1671:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):438 -> a
+    1672:1707:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):441:476 -> a
+    1708:1708:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1708:1708:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):476 -> a
+    1709:1709:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1709:1709:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1709:1709:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):476 -> a
+    1710:1718:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):476:484 -> a
+    1719:1725:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):483:489 -> a
+    1726:1754:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):488:516 -> a
+    1755:1757:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):256:258 -> a
+    1758:1760:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):162:164 -> a
+    1758:1760:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):260 -> a
+    1761:1761:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):96:96 -> a
+    1761:1761:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):164 -> a
+    1761:1761:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):260 -> a
+    1762:1762:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):165:165 -> a
+    1762:1762:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):260 -> a
+    1763:2131:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):261:629 -> a
+    2132:2136:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):628:632 -> a
+    2137:2140:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):584:587 -> a
+    2141:2144:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):171:174 -> a
+    2141:2144:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):590 -> a
+    2145:2151:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):591:597 -> a
+    2152:2157:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):596:601 -> a
+    2158:2158:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
+    2158:2158:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):601 -> a
+    2159:2281:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):602:724 -> a
+    2282:2286:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):273:277 -> a
+    2287:2289:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):162:164 -> a
+    2287:2289:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):279 -> a
+    2290:2290:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):96:96 -> a
+    2290:2290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):164 -> a
+    2290:2290:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):279 -> a
+    2291:2291:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):165:165 -> a
+    2291:2291:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):279 -> a
+    2292:2668:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):280:656 -> a
+    2669:2669:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):655:655 -> a
+    2670:2673:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):640:643 -> a
+    2674:2799:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):642:767 -> a
+    2800:2825:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):733:758 -> a
+    2826:2828:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):710:712 -> a
+    2829:2832:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):698:701 -> a
+    2833:2931:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):700:798 -> a
+    2935:2935:com.android.tools.r8.ir.conversion.LensCodeRewriterUtils lambda$rewritePartialDefault$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):236:236 -> a
+    2936:2936:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):294:294 -> a
+    2937:2943:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):316:322 -> a
+    2944:2944:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):230:230 -> a
+    2944:2944:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):322 -> a
+    2945:2945:java.util.Map lambda$rewritePartialDefault$3(com.android.tools.r8.ir.analysis.value.SingleNumberValue):453:453 -> a
+    2946:2952:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$4(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):457:463 -> a
+    2953:2953:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$4(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):462:462 -> a
+    2954:2954:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$4(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):459:459 -> a
+    2955:2955:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    2955:2955:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$4(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):459 -> a
+    2956:2958:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$4(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):464:466 -> a
+    2959:2963:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$4(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):465:469 -> a
+    2964:2964:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):645:645 -> a
+    2965:2965:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$7(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):666:666 -> a
+    2966:2966:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$8(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):678:678 -> a
+    2967:2967:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$9(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):690:690 -> a
+    2968:2968:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$11(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):714:714 -> a
+    2969:2975:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):919:925 -> a
+    2976:2976:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):921:921 -> a
+    2977:2977:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3899,"2":3900,"3":3901}}
+    3899:3899:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):921:921 -> a
+    3900:3900:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):921:921 -> a
+    3901:3901:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):921:921 -> a
+    3898:3898:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):921:921 -> a
+    3902:3926:java.util.Deque com.android.tools.r8.ir.conversion.LensCodeRewriter.getUnappliedLenses(com.android.tools.r8.graph.ProgramMethod):930:954 -> a
+    3902:3926:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):181 -> a
+    3927:3928:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):182:183 -> a
+    3929:3929:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    3929:3929:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):183 -> a
+    3930:3936:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):184:190 -> a
+    3937:3945:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):189:197 -> a
+    3946:3947:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):213:214 -> a
+    3946:3947:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3948:3961:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):812:825 -> a
+    3948:3961:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3948:3961:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3962:3962:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
+    3962:3962:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):825 -> a
+    3962:3962:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3962:3962:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3963:3963:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):831:831 -> a
+    3963:3963:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3963:3963:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3964:3967:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):876:879 -> a
+    3964:3967:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3964:3967:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3964:3967:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3968:3968:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():42:42 -> a
+    3968:3968:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):879 -> a
+    3968:3968:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3968:3968:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3968:3968:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3969:3970:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):880:881 -> a
+    3969:3970:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3969:3970:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3969:3970:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3971:3971:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    3971:3971:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):881 -> a
+    3971:3971:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3971:3971:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3971:3971:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3972:3972:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    3972:3972:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    3972:3972:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):881 -> a
+    3972:3972:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3972:3972:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3972:3972:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3973:3975:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):882:884 -> a
+    3973:3975:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3973:3975:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3973:3975:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3976:3976:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):883:883 -> a
+    3976:3976:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3976:3976:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3976:3976:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3977:3977:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    3977:3977:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):883 -> a
+    3977:3977:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3977:3977:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3977:3977:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3978:3978:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):886:886 -> a
+    3978:3978:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3978:3978:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3978:3978:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3979:3982:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):885:888 -> a
+    3979:3982:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3979:3982:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3979:3982:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3983:3983:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    3983:3983:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):888 -> a
+    3983:3983:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3983:3983:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3983:3983:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3984:3984:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    3984:3984:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    3984:3984:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):888 -> a
+    3984:3984:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3984:3984:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3984:3984:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3985:3992:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):889:896 -> a
+    3985:3992:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826 -> a
+    3985:3992:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3985:3992:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3993:3993:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
+    3993:3993:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):836 -> a
+    3993:3993:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3993:3993:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3994:3994:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841:841 -> a
+    3994:3994:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3994:3994:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3995:3995:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,java.util.Set,int):906:906 -> a
+    3995:3995:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):837 -> a
+    3995:3995:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3995:3995:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3996:3996:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    3996:3996:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,java.util.Set,int):906 -> a
+    3996:3996:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):837 -> a
+    3996:3996:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3996:3996:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3997:3997:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    3997:3997:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    3997:3997:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,java.util.Set,int):906 -> a
+    3997:3997:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):837 -> a
+    3997:3997:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3997:3997:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3998:3998:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,java.util.Set,int):908:908 -> a
+    3998:3998:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):837 -> a
+    3998:3998:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3998:3998:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    3999:3999:com.android.tools.r8.ir.code.Argument$Builder com.android.tools.r8.ir.code.Argument.builder():36:36 -> a
+    3999:3999:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,java.util.Set,int):908 -> a
+    3999:3999:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):837 -> a
+    3999:3999:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    3999:3999:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    4000:4005:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,java.util.Set,int):909:914 -> a
+    4000:4005:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):837 -> a
+    4000:4005:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    4000:4005:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    4006:4006:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):846:846 -> a
+    4006:4006:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    4006:4006:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    4007:4007:com.android.tools.r8.ir.code.Argument$Builder com.android.tools.r8.ir.code.Argument.builder():36:36 -> a
+    4007:4007:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):846 -> a
+    4007:4007:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    4007:4007:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    4008:4011:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):847:850 -> a
+    4008:4011:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    4008:4011:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    4012:4028:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,java.util.Set,java.util.Set):845:861 -> a
+    4012:4028:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    4012:4028:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    4029:4034:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.RewrittenPrototypeDescription):217:222 -> a
+    4029:4034:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
+    4035:4035:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):200:200 -> a
+    4036:4039:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):964:967 -> a
+    4040:4040:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
+    4040:4040:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):967 -> a
+    4041:4042:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):968:969 -> a
+    4043:4043:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    4043:4043:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):969 -> a
+    4044:4044:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    4044:4044:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    4044:4044:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):969 -> a
+    4045:4045:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
+    4045:4045:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):969 -> a
+    4046:4056:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):969:979 -> a
+    4057:4057:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
+    4057:4057:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):979 -> a
+    4058:4064:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):980:986 -> a
+    4065:4079:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):997:1011 -> a
+    4080:4080:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
+    4080:4080:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1011 -> a
+    4081:4086:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1012:1017 -> a
+    4087:4087:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    4087:4087:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1017 -> a
+    4088:4088:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
+    4088:4088:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1013 -> a
+    4089:4103:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1013:1027 -> a
+    4104:4104:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
+    4104:4104:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1027 -> a
+    4105:4111:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1028:1034 -> a
+    4112:4122:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.RewrittenPrototypeDescription):1046:1056 -> a
+    4123:4123:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
+    4123:4123:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.RewrittenPrototypeDescription):1056 -> a
+    4124:4132:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.RewrittenPrototypeDescription):1057:1065 -> a
+    4133:4133:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
+    4133:4133:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.RewrittenPrototypeDescription):1065 -> a
+    4134:4136:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.RewrittenPrototypeDescription):1066:1068 -> a
+    4137:4137:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    4137:4137:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.RewrittenPrototypeDescription):1068 -> a
+    4138:4138:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
+    4138:4138:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.RewrittenPrototypeDescription):1067 -> a
+    4139:4148:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.RewrittenPrototypeDescription):1067:1076 -> a
+    4149:4156:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):1081:1088 -> a
+    4157:4162:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):1087:1092 -> a
+    4163:4163:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):1103:1103 -> a
+    4164:4174:boolean com.android.tools.r8.ir.conversion.LensCodeRewriter.defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1116:1126 -> a
+    4164:4174:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):1103 -> a
+    4175:4177:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):1104:1106 -> a
+    4178:4181:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.LensCodeRewriter.defaultValueLatticeElement(com.android.tools.r8.graph.DexType):1131:1134 -> a
+    4178:4181:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):1108 -> a
+    4182:4184:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):1107:1109 -> a
     boolean lambda$insertCastForReturnIfNeeded$15(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
-    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):595:595 -> b
-    2:2:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> b
-    2:2:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):595 -> b
-    3:3:com.android.tools.r8.ir.code.InstructionListIterator insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):781:781 -> b
-    4:4:boolean com.android.tools.r8.ir.code.Invoke$Type.isStatic():189:189 -> b
-    4:4:com.android.tools.r8.ir.code.InstructionListIterator insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):781 -> b
-    5:16:com.android.tools.r8.ir.code.InstructionListIterator insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):785:796 -> b
-    17:19:com.android.tools.r8.ir.code.InstructionListIterator insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):795:797 -> b
-    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> b
-    20:20:com.android.tools.r8.ir.code.InstructionListIterator insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):799 -> b
-    21:36:com.android.tools.r8.ir.code.InstructionListIterator insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):798:813 -> b
-    37:37:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> b
-    37:37:com.android.tools.r8.ir.code.InstructionListIterator insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):813 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    38:44:com.android.tools.r8.ir.code.InstructionListIterator insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):814:820 -> b
+    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$10(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):702:702 -> b
     boolean lambda$insertCastsForInvokeArgumentsIfNeeded$14(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> c
-    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):633:633 -> c
-    boolean lambda$insertNullCheckForInvokeReceiverIfNeeded$13(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> d
-com.android.tools.r8.ir.conversion.LensCodeRewriter$1 -> com.android.tools.r8.internal.xB:
+    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):656:656 -> c
+    2:2:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> c
+    2:2:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):656 -> c
+com.android.tools.r8.ir.conversion.LensCodeRewriter$1 -> com.android.tools.r8.internal.GA:
+    com.android.tools.r8.graph.GraphLens val$codeLens -> e
     com.android.tools.r8.ir.code.InvokeMethod val$invoke -> b
-    com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> e
+    com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> f
     com.android.tools.r8.graph.DexMethod val$invokedMethod -> d
-    com.android.tools.r8.graph.GraphLens val$graphLens -> c
-    1:1:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod):307:307 -> <init>
-    1:2:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():315:316 -> c
-    3:3:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":323,"2":324,"3":325}}
-    323:323:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():316:316 -> c
-    324:324:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> c
-    324:324:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():316 -> c
-    325:325:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> c
-    325:325:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():316 -> c
-    319:320:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():316:317 -> c
-    321:321:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> c
-    321:321:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():317 -> c
-    322:322:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> c
-    322:322:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> c
-    322:322:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():317 -> c
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():310:310 -> i
-com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.internal.yB:
+    com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens val$graphLens -> c
+    1:1:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):391:391 -> <init>
+    1:3:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():399:401 -> c
+    4:4:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> c
+    4:4:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():401 -> c
+    5:5:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> c
+    5:5:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> c
+    5:5:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():401 -> c
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():394:394 -> i
+com.android.tools.r8.ir.conversion.LensCodeRewriter$GraphLensInterval -> com.android.tools.r8.internal.HA:
+    com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens graphLens -> a
+    com.android.tools.r8.graph.DexMethod method -> c
+    com.android.tools.r8.graph.GraphLens codeLens -> b
+    1:4:void <init>(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod):129:132 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLens getCodeLens():140:140 -> a
+    1:1:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens getGraphLens():136:136 -> b
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():144:144 -> c
+com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.internal.IA:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> e
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():1047:1047 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):1055:1059 -> <init>
-    1:1:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1064:1064 -> a
-    2:2:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1088,"2":1089,"3":1090}}
-    1088:1088:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1064:1064 -> a
-    1089:1089:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    1089:1089:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1064 -> a
-    1090:1090:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    1090:1090:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1064 -> a
-    1068:1076:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1066:1074 -> a
-    1077:1077:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    1077:1077:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1074 -> a
-    1078:1079:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1074:1075 -> a
-    1080:1080:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
-    1080:1080:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1075 -> a
-    1081:1082:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1075:1076 -> a
-    1083:1083:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> a
-    1083:1083:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1076 -> a
-    1084:1086:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1076:1078 -> a
-    1087:1087:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):1074:1074 -> a
-com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.AB:
-    java.util.Map protoFixupCache -> c
-    java.util.Map rewrittenCallSiteCache -> d
-    boolean $assertionsDisabled -> e
+    1:1:void <clinit>():1215:1215 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):1223:1227 -> <init>
+    1:11:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1235:1245 -> a
+    12:12:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    12:12:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1245 -> a
+    13:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1245:1246 -> a
+    15:15:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
+    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1246 -> a
+    16:17:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1246:1247 -> a
+    18:18:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> a
+    18:18:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1247 -> a
+    19:21:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1247:1249 -> a
+    22:22:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1245:1245 -> a
+com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.KA:
+    java.util.Map protoFixupCache -> d
+    boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexDefinitionSupplier definitions -> a
+    java.util.Map rewrittenCallSiteCache -> e
     com.android.tools.r8.graph.GraphLens graphLens -> b
+    com.android.tools.r8.graph.GraphLens codeLens -> c
     1:1:void <clinit>():37:37 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):49:49 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,boolean):52:52 -> <init>
-    3:16:void <init>(com.android.tools.r8.graph.AppView,boolean):42:55 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):58:58 -> <init>
-    18:37:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):42:61 -> <init>
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():65:65 -> a
-    2:5:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):69:72 -> a
-    6:6:com.android.tools.r8.graph.DexCallSite lambda$rewriteCallSite$0(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexCallSite):73:73 -> a
-    7:9:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto):222:224 -> a
-    10:10:boolean hasGraphLens(com.android.tools.r8.graph.GraphLens):235:235 -> a
-    11:11:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
-    11:11:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):118 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:15:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):119:122 -> a
-    16:16:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    16:16:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):122 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:24:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):123:130 -> a
-    25:41:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):201:217 -> a
-    25:41:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):130 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    42:52:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):205:215 -> a
-    42:52:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):130 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    53:63:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):203:213 -> a
-    53:63:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):130 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    64:67:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):207:210 -> a
-    64:67:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):130 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    68:76:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):132:140 -> a
-    77:77:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":296,"2":297,"3":298}}
-    296:296:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):142:142 -> a
-    297:297:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    297:297:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):142 -> a
-    298:298:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    298:298:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):142 -> a
-    219:219:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):142:142 -> a
-    220:230:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):141:151 -> a
-    231:247:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):201:217 -> a
-    231:247:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):151 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    248:258:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):205:215 -> a
-    248:258:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):151 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    259:269:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):203:213 -> a
-    259:269:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):151 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    270:273:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):207:210 -> a
-    270:273:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):151 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    274:291:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):152:169 -> a
-    292:292:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
-    292:292:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):169 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    293:294:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):171:172 -> a
-    295:295:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.DexItemFactory.createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2686:2686 -> a
-    295:295:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):173 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:7:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):77:83 -> b
+    1:1:void <init>(com.android.tools.r8.graph.AppView):50:50 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,boolean):53:53 -> <init>
+    3:17:void <init>(com.android.tools.r8.graph.AppView,boolean):43:57 -> <init>
+    18:18:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):61:61 -> <init>
+    19:41:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):43:65 -> <init>
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():69:69 -> a
+    2:5:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):73:76 -> a
+    6:6:com.android.tools.r8.graph.DexCallSite lambda$rewriteCallSite$0(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexCallSite):77:77 -> a
+    7:7:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):122:122 -> a
+    8:8:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
+    8:8:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):122 -> a
+    9:13:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):123:127 -> a
+    14:23:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):126:135 -> a
+    24:40:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):201:217 -> a
+    24:40:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):135 -> a
+    41:51:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):205:215 -> a
+    41:51:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):135 -> a
+    52:62:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):203:213 -> a
+    52:62:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):135 -> a
+    63:66:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):207:210 -> a
+    63:66:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):135 -> a
+    67:77:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):137:147 -> a
+    78:88:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):146:156 -> a
+    89:105:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):201:217 -> a
+    89:105:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):156 -> a
+    106:116:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):205:215 -> a
+    106:116:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):156 -> a
+    117:127:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):203:213 -> a
+    117:127:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):156 -> a
+    128:131:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):207:210 -> a
+    128:131:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):156 -> a
+    132:153:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):157:178 -> a
+    154:154:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.DexItemFactory.createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2686:2686 -> a
+    154:154:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):178 -> a
+    155:157:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto):227:229 -> a
+    158:158:com.android.tools.r8.graph.DexType lambda$rewriteProto$1(com.android.tools.r8.graph.DexType):230:230 -> a
+    1:7:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):81:87 -> b
     8:8:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):906:906 -> b
-    8:8:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):83 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:10:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):85:86 -> b
-    11:12:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):183:184 -> b
-    11:12:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
-    13:20:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):207:214 -> b
-    13:20:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):185 -> b
-    13:20:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
-    21:21:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":67,"2":68,"3":69}}
-    67:67:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):214:214 -> b
-    67:67:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):185 -> b
-    67:67:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
-    68:68:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):214 -> b
-    68:68:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):185 -> b
-    68:68:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
-    69:69:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):214 -> b
-    69:69:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):185 -> b
-    69:69:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
-    22:22:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):215:215 -> b
-    22:22:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):185 -> b
-    22:22:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
-    23:23:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):209:209 -> b
-    23:23:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):185 -> b
-    23:23:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
-    24:26:com.android.tools.r8.graph.DexValue$DexValueMethodHandle com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):229:231 -> b
-    24:26:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):209 -> b
-    24:26:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):185 -> b
-    24:26:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
-    27:27:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):211:211 -> b
-    27:27:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):185 -> b
-    27:27:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
-    28:30:com.android.tools.r8.graph.DexValue$DexValueMethodType com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):200:202 -> b
-    28:30:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):211 -> b
-    28:30:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):185 -> b
-    28:30:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
-    31:36:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):188:193 -> b
-    31:36:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
-    37:39:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):102:104 -> b
-    37:39:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    40:40:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> b
-    40:40:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):104 -> b
-    40:40:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    41:41:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):104:104 -> b
-    41:41:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    42:42:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> b
-    42:42:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):105 -> b
-    42:42:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    43:43:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):105:105 -> b
-    43:43:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    44:44:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> b
-    44:44:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):105 -> b
-    44:44:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    45:49:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):105:109 -> b
-    45:49:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    50:50:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):108:108 -> b
-    50:50:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    51:51:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> b
-    51:51:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaDescriptor.getMainFunctionalInterfaceMethodReference(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexItemFactory):272 -> b
-    51:51:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):108 -> b
-    51:51:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    52:56:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaDescriptor.getMainFunctionalInterfaceMethodReference(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexItemFactory):272:276 -> b
-    52:56:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):108 -> b
-    52:56:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    57:58:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):110:111 -> b
-    57:58:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    59:59:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> b
-    59:59:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):111 -> b
-    59:59:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    60:61:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):112:113 -> b
-    60:61:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88 -> b
-    62:66:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):89:93 -> b
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker -> com.android.tools.r8.internal.GB:
+    8:8:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
+    9:10:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):89:90 -> b
+    11:12:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):188:189 -> b
+    11:12:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):91 -> b
+    13:21:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):212:220 -> b
+    13:21:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):190 -> b
+    13:21:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):91 -> b
+    22:22:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):214:214 -> b
+    22:22:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):190 -> b
+    22:22:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):91 -> b
+    23:25:com.android.tools.r8.graph.DexValue$DexValueMethodHandle com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):235:237 -> b
+    23:25:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):214 -> b
+    23:25:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):190 -> b
+    23:25:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):91 -> b
+    26:26:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):216:216 -> b
+    26:26:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):190 -> b
+    26:26:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):91 -> b
+    27:29:com.android.tools.r8.graph.DexValue$DexValueMethodType com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):205:207 -> b
+    27:29:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):216 -> b
+    27:29:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):190 -> b
+    27:29:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):91 -> b
+    30:35:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):193:198 -> b
+    30:35:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):91 -> b
+    36:38:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):106:108 -> b
+    36:38:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
+    39:39:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> b
+    39:39:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):108 -> b
+    39:39:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
+    40:40:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):108:108 -> b
+    40:40:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
+    41:41:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> b
+    41:41:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):109 -> b
+    41:41:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
+    42:42:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):109:109 -> b
+    42:42:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
+    43:43:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> b
+    43:43:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):109 -> b
+    43:43:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
+    44:48:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):109:113 -> b
+    44:48:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
+    49:49:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):112:112 -> b
+    49:49:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
+    50:50:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> b
+    50:50:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaDescriptor.getMainFunctionalInterfaceMethodReference(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexItemFactory):272 -> b
+    50:50:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):112 -> b
+    50:50:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
+    51:55:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaDescriptor.getMainFunctionalInterfaceMethodReference(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexItemFactory):272:276 -> b
+    51:55:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):112 -> b
+    51:55:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
+    56:59:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):114:117 -> b
+    56:59:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
+    60:64:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):93:97 -> b
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker -> com.android.tools.r8.internal.QA:
     com.android.tools.r8.graph.DexString jDollarDescriptorPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):26:28 -> <init>
     1:4:boolean isClassLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):32:35 -> a
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer -> com.android.tools.r8.internal.FB:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer -> com.android.tools.r8.internal.PA:
     com.android.tools.r8.graph.DexString jDollarDescriptorPrefix -> a
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexProgramClass clazz -> c
@@ -52737,7 +52265,7 @@
     43:44:void com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer.registerField(com.android.tools.r8.graph.DexField):85:86 -> a
     43:44:void registerField(com.android.tools.r8.graph.DexEncodedField):97 -> a
     1:1:void run():53:53 -> b
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry -> com.android.tools.r8.internal.EB:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry -> com.android.tools.r8.internal.OA:
     com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer this$0 -> f
     1:2:void <init>(com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):121:122 -> <init>
     1:1:boolean com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry.registerField(com.android.tools.r8.graph.DexField):126:126 -> a
@@ -52765,16 +52293,16 @@
     1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):130:131 -> h
     3:3:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> h
     3:3:boolean registerMethod(com.android.tools.r8.graph.DexMethod):131 -> h
-com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.PE:
+com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.SD:
     1:1:void <init>():7:7 -> <init>
     boolean isPeepholeOptimizationsEnabled() -> a
-com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions -> com.android.tools.r8.internal.NE:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions -> com.android.tools.r8.internal.QD:
     com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions INSTANCE -> a
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>():37:37 -> <init>
     boolean isPeepholeOptimizationsEnabled() -> a
     1:1:com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions getInstance():40:40 -> b
-com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions -> com.android.tools.r8.internal.OE:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions -> com.android.tools.r8.internal.RD:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> a
     boolean enablePeepholeOptimizations -> b
     boolean $assertionsDisabled -> c
@@ -52783,7 +52311,7 @@
     2:5:void <init>(com.android.tools.r8.ir.conversion.MethodProcessor):14:17 -> <init>
     1:2:boolean isPeepholeOptimizationsEnabled():27:28 -> a
     1:2:void disablePeepholeOptimizations():21:22 -> b
-com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.ZE:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.bE:
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
@@ -52799,7 +52327,6 @@
     void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint) -> a
     void setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet) -> a
     void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod) -> a
-    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
     void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
     void unsetForceInline(com.android.tools.r8.graph.ProgramMethod) -> b
@@ -52808,7 +52335,7 @@
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> d
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> e
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> f
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.jF:
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.lE:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod) -> a
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation() -> a
@@ -52816,14 +52343,14 @@
     boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod) -> b
     void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod) -> c
     boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.conversion.MethodProcessorWithWave -> com.android.tools.r8.internal.kF:
+com.android.tools.r8.ir.conversion.MethodProcessorWithWave -> com.android.tools.r8.internal.mE:
     com.android.tools.r8.utils.collections.ProgramMethodSet waveExtension -> b
     com.android.tools.r8.utils.collections.ProgramMethodSet wave -> a
     1:4:void <init>():10:13 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation():17:17 -> a
     1:1:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):22:22 -> b
     1:1:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):27:27 -> c
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.UK:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.QJ:
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> c
     1:3:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.utils.collections.ProgramMethodSet):23:25 -> <init>
     1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder builder(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):29:29 -> a
@@ -52851,16 +52378,16 @@
     23:27:void forEachWaveWithExtension(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction,java.util.concurrent.ExecutorService):82 -> a
     28:28:void lambda$forEachWaveWithExtension$0(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction,com.android.tools.r8.graph.ProgramMethod):80:80 -> a
     boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder -> com.android.tools.r8.internal.SK:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder -> com.android.tools.r8.internal.OJ:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToProcess -> a
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> b
     1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):91:91 -> <init>
     2:6:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):88:92 -> <init>
     1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder add(com.android.tools.r8.graph.ProgramMethod):96:96 -> a
     2:2:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor build():101:101 -> a
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction -> com.android.tools.r8.internal.TK:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction -> com.android.tools.r8.internal.PJ:
     void accept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.internal.CM:
+com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.internal.vL:
     java.util.Deque waves -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.ProgramMethodSet processed -> e
@@ -52879,8 +52406,7 @@
     31:35:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):157 -> a
     36:38:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):158:160 -> a
     1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):58:59 -> d
-com.android.tools.r8.ir.conversion.PostMethodProcessor$1 -> com.android.tools.r8.internal.AM:
-com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.internal.BM:
+com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.internal.uL:
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsToReprocessBuilder -> a
     1:3:void <init>(com.android.tools.r8.graph.GraphLens):66:68 -> <init>
     1:1:void add(com.android.tools.r8.graph.ProgramMethod):73:73 -> a
@@ -52893,7 +52419,7 @@
     27:30:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):99:102 -> a
     31:31:boolean com.android.tools.r8.utils.collections.ProgramMethodSet.createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
     31:31:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):102 -> a
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.internal.mN:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.internal.dM:
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation callSiteInformation -> d
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> f
     com.android.tools.r8.graph.AppView appView -> c
@@ -52917,13 +52443,13 @@
     46:48:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):146:148 -> a
     boolean isPrimaryMethodProcessor() -> b
     1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):82:83 -> d
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.jN:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.aM:
     com.android.tools.r8.utils.Timing apply(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction -> com.android.tools.r8.internal.kN:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction -> com.android.tools.r8.internal.bM:
     void notifyWaveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService) -> a
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.internal.lN:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.internal.cM:
     void notifyWaveStart(com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.mW:
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.LU:
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
     void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean) -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
@@ -52947,11 +52473,10 @@
     int instructionOffset(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.XX:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.qW:
     1:7:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):187:193 -> a
     1:7:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):107 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.internal.PX:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.RX:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.kW:
     com.android.tools.r8.ir.code.Phi idValue -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap mapping -> c
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> a
@@ -52962,7 +52487,7 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock access$002(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):647:647 -> a
     1:1:com.android.tools.r8.ir.code.Phi access$100(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):647:647 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap access$300(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):647:647 -> c
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.QX:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.jW:
     1:1:void <init>():649:649 -> <init>
     1:1:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping build(com.android.tools.r8.ir.code.BasicBlock):676:676 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):688:688 -> a
@@ -52985,14 +52510,17 @@
     66:80:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):766:780 -> a
     81:81:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder.setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):682:682 -> a
     81:81:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):769 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.TX:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.mW:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> a
     1:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.Map,com.android.tools.r8.ir.code.Value):263:267 -> <init>
     1:29:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):276:304 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.SX:
+    30:30:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):335:335 -> a
+    30:30:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):331 -> a
+    30:30:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):304 -> a
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.lW:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():198:198 -> <clinit>
@@ -53021,9 +52549,8 @@
     33:48:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):223:238 -> a
     49:49:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.keySet():87:87 -> a
     49:49:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):238 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     50:59:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):238:247 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.VX:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.oW:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap mapping -> c
     com.android.tools.r8.ir.code.Value stringHashValue -> b
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> a
@@ -53034,7 +52561,7 @@
     3:7:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):631:635 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$200(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> a
     1:1:com.android.tools.r8.ir.code.Value access$500(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.UX:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.nW:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.ir.code.Phi intermediateIdValue -> c
     com.android.tools.r8.ir.code.Value stringValue -> d
@@ -53112,14 +52639,14 @@
     152:152:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):605 -> a
     153:166:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):607:620 -> a
     1:27:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):404:430 -> b
-    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1545:1547 -> b
+    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1546:1548 -> b
     28:30:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):430 -> b
     31:31:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):431:431 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.WX:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.pW:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():797:797 -> <clinit>
     1:8:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock(com.android.tools.r8.ir.code.JumpInstruction):805:812 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.internal.cY:
+com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.internal.uW:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement stringType -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> b
@@ -53134,8 +52661,7 @@
     21:22:void run(com.android.tools.r8.ir.code.IRCode):79 -> b
     23:23:void run(com.android.tools.r8.ir.code.IRCode):84:84 -> b
     24:44:void run(com.android.tools.r8.ir.code.IRCode):80:100 -> b
-com.android.tools.r8.ir.conversion.StringSwitchRemover$1 -> com.android.tools.r8.internal.YX:
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.internal.ZX:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.internal.rW:
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> g
     com.android.tools.r8.ir.code.BasicBlock block -> f
     com.android.tools.r8.ir.conversion.StringSwitchRemover this$0 -> i
@@ -53145,23 +52671,25 @@
     1:1:void <init>(com.android.tools.r8.ir.conversion.StringSwitchRemover,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set,com.android.tools.r8.ir.conversion.StringSwitchRemover$1):177:177 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.conversion.StringSwitchRemover,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):189:193 -> <init>
     1:2:java.util.Map createStructure(com.android.tools.r8.ir.code.StringSwitch):197:198 -> a
-    3:33:void removeStringSwitch():205:235 -> a
-    34:34:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    34:34:void removeStringSwitch():237 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:void removeStringSwitch():237:237 -> a
-    36:43:void removeStringSwitch():236:243 -> a
-    44:44:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    44:44:void removeStringSwitch():245 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    45:47:void removeStringSwitch():245:247 -> a
-    48:54:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1481:1487 -> a
-    48:54:void removeStringSwitch():244 -> a
-    55:60:void removeStringSwitch():250:255 -> a
-    61:62:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    61:62:void removeStringSwitch():255 -> a
-    63:73:void removeStringSwitch():255:265 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.internal.aY:
+    3:35:void removeStringSwitch():205:237 -> a
+    36:36:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    36:36:void removeStringSwitch():237 -> a
+    37:37:void removeStringSwitch():237:237 -> a
+    38:47:void removeStringSwitch():236:245 -> a
+    48:48:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    48:48:void removeStringSwitch():245 -> a
+    49:51:void removeStringSwitch():245:247 -> a
+    52:58:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1482:1488 -> a
+    52:58:void removeStringSwitch():244 -> a
+    59:64:void removeStringSwitch():250:255 -> a
+    65:66:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
+    65:66:void removeStringSwitch():255 -> a
+    67:67:void removeStringSwitch():255:255 -> a
+    68:68:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):335:335 -> a
+    68:68:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):331 -> a
+    68:68:void removeStringSwitch():255 -> a
+    69:78:void removeStringSwitch():256:265 -> a
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.internal.sW:
     com.android.tools.r8.ir.code.BasicBlock idSwitchBlock -> h
     com.android.tools.r8.ir.conversion.StringSwitchRemover this$0 -> l
     boolean $assertionsDisabled -> m
@@ -53176,7 +52704,7 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap createStructure(com.android.tools.r8.ir.code.StringSwitch):301:302 -> a
     3:9:void lambda$createStructure$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock):304:310 -> a
     10:20:void removeStringSwitch():319:329 -> a
-    21:21:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement):1172:1172 -> a
+    21:21:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement):1196:1196 -> a
     21:21:void removeStringSwitch():329 -> a
     22:33:void removeStringSwitch():330:341 -> a
     34:34:void com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):406:406 -> a
@@ -53184,7 +52712,7 @@
     35:35:int com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.getAndIncrementNextBlockNumber():296:296 -> a
     35:35:void com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):409 -> a
     35:35:void removeStringSwitch():362 -> a
-    36:36:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
+    36:36:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
     36:36:int com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.getAndIncrementNextBlockNumber():296 -> a
     36:36:void com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):409 -> a
     36:36:void removeStringSwitch():362 -> a
@@ -53193,7 +52721,7 @@
     64:64:int com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.getAndIncrementNextBlockNumber():296:296 -> a
     64:64:void com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):440 -> a
     64:64:void removeStringSwitch():362 -> a
-    65:65:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
+    65:65:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
     65:65:int com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.getAndIncrementNextBlockNumber():296 -> a
     65:65:void com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):440 -> a
     65:65:void removeStringSwitch():362 -> a
@@ -53204,7 +52732,7 @@
     79:79:int com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.getAndIncrementNextBlockNumber():296:296 -> a
     79:79:void com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):455 -> a
     79:79:void removeStringSwitch():362 -> a
-    80:80:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
+    80:80:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
     80:80:int com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.getAndIncrementNextBlockNumber():296 -> a
     80:80:void com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):455 -> a
     80:80:void removeStringSwitch():362 -> a
@@ -53229,7 +52757,7 @@
     132:140:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.createIdSwitch(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):473:481 -> a
     132:140:void removeStringSwitch():386 -> a
     141:143:void removeStringSwitch():387:389 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.internal.bY:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.internal.tW:
     java.util.ListIterator blockIterator -> b
     java.util.Set newBlocksWithStrings -> c
     com.android.tools.r8.ir.code.Value stringValue -> e
@@ -53238,7 +52766,7 @@
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set,com.android.tools.r8.ir.conversion.StringSwitchRemover$1):153:153 -> <init>
     2:7:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):166:171 -> <init>
     void removeStringSwitch() -> a
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.JY:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.bX:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -53249,13 +52777,13 @@
     22:22:int[] absoluteTargets(int):68:68 -> a
     23:23:void clear():84:84 -> a
     1:1:int[] getKeys(int):72:72 -> b
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.IY:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.aX:
     int[] absoluteTargets -> b
     int[] keys -> c
     int userOffset -> a
     1:1:void <init>(int):26:26 -> <init>
     2:7:void <init>(int):22:27 -> <init>
-com.android.tools.r8.ir.conversion.SyntheticStraightLineSourceCode -> com.android.tools.r8.internal.eZ:
+com.android.tools.r8.ir.conversion.SyntheticStraightLineSourceCode -> com.android.tools.r8.internal.uX:
     java.util.List instructionBuilders -> a
     com.android.tools.r8.ir.code.Position position -> b
     1:3:void <init>(java.util.List,com.android.tools.r8.ir.code.Position):21:23 -> <init>
@@ -53281,7 +52809,7 @@
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():76:76 -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.g10:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.wZ:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -53347,9 +52875,8 @@
     129:129:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):228 -> a
     130:130:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):228:228 -> a
     131:138:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):226:233 -> a
-    139:139:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> a
+    139:139:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> a
     139:139:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):233 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     140:142:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):233:235 -> a
     143:145:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.TypeConstraintResolver.canonical(com.android.tools.r8.ir.code.Value):273:275 -> a
     143:145:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):194 -> a
@@ -53400,7 +52927,7 @@
     183:183:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
     184:199:void com.android.tools.r8.ir.conversion.TypeConstraintResolver.link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):250:265 -> a
     184:199:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
-com.android.tools.r8.ir.conversion.callgraph.CallGraph -> com.android.tools.r8.internal.l6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraph -> com.android.tools.r8.internal.h6:
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
     1:1:void <clinit>():39:39 -> <clinit>
@@ -53420,13 +52947,13 @@
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet extractRoots():76:76 -> d
     2:14:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.conversion.callgraph.CallGraph.extractNodes(java.util.function.Predicate,java.util.function.Consumer):80:92 -> d
     2:14:com.android.tools.r8.utils.collections.ProgramMethodSet extractRoots():76 -> d
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBase -> com.android.tools.r8.internal.m6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBase -> com.android.tools.r8.internal.i6:
     java.util.Map nodes -> a
     1:2:void <init>(java.util.Map):16:17 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase getNode(com.android.tools.r8.graph.ProgramMethod):25:25 -> a
     2:2:java.util.Collection getNodes():29:29 -> a
     1:1:boolean isEmpty():21:21 -> b
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilder -> com.android.tools.r8.internal.n6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilder -> com.android.tools.r8.internal.j6:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):21:21 -> <init>
@@ -53435,7 +52962,7 @@
     3:3:void processClass(com.android.tools.r8.graph.DexProgramClass):30:30 -> a
     4:6:boolean verifyAllMethodsWithCodeExists():46:48 -> a
     1:8:void processMethod(com.android.tools.r8.graph.ProgramMethod):34:41 -> c
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilderBase -> com.android.tools.r8.internal.o6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilderBase -> com.android.tools.r8.internal.k6:
     java.util.Map nodes -> b
     java.util.Map possibleProgramTargetsCache -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -53444,13 +52971,13 @@
     com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase lambda$getOrCreateNode$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):30:30 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase getOrCreateNode(com.android.tools.r8.graph.ProgramMethod):30:30 -> b
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation -> com.android.tools.r8.internal.s6:
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation -> com.android.tools.r8.internal.o6:
     1:1:void <init>():16:16 -> <init>
     boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation empty():31:31 -> a
     boolean isMultiCallerInlineCandidate(com.android.tools.r8.graph.ProgramMethod) -> b
     void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod) -> c
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.internal.q6:
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.internal.m6:
     java.util.Set singleCallerMethods -> a
     java.util.Set multiCallerInlineCandidates -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph):59:59 -> <init>
@@ -53460,7 +52987,7 @@
     3:3:boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod):107:107 -> a
     1:1:boolean isMultiCallerInlineCandidate(com.android.tools.r8.graph.ProgramMethod):118:118 -> b
     1:2:void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod):123:124 -> c
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.internal.r6:
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.internal.n6:
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation EMPTY_INFO -> a
     1:1:void <clinit>():36:36 -> <clinit>
     1:1:void <init>():34:34 -> <init>
@@ -53468,7 +52995,7 @@
     boolean isMultiCallerInlineCandidate(com.android.tools.r8.graph.ProgramMethod) -> b
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation access$000():34:34 -> b
     void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod) -> c
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator -> com.android.tools.r8.internal.oe:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator -> com.android.tools.r8.internal.Pd:
     java.util.Deque writerStack -> d
     java.util.Map stackEntryInfo -> b
     java.util.Deque clinitCallStack -> c
@@ -53543,40 +53070,39 @@
     74:76:void recordCallEdgeRemoval(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):447:449 -> b
     1:1:void removeCallEdge(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):371:371 -> c
     1:1:void removeFieldReadEdge(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):375:375 -> d
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$1 -> com.android.tools.r8.internal.me:
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge -> com.android.tools.r8.internal.ne:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge -> com.android.tools.r8.internal.Od:
     com.android.tools.r8.ir.conversion.callgraph.Node callee -> b
     com.android.tools.r8.ir.conversion.callgraph.Node caller -> a
     1:3:void <init>(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):35:37 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$400(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge):30:30 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$500(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge):30:30 -> b
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult -> com.android.tools.r8.internal.oe$a:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult -> com.android.tools.r8.internal.Pd$a:
     java.util.Map removedCallEdges -> a
     1:2:void <init>(java.util.Map):58:59 -> <init>
     1:2:int numberOfRemovedCallEdges():64:65 -> a
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem -> com.android.tools.r8.internal.pe:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem -> com.android.tools.r8.internal.Qd:
     java.util.Iterator calleesAndWriters -> b
     com.android.tools.r8.ir.conversion.callgraph.Node callerOrReader -> a
     1:3:void <init>(com.android.tools.r8.ir.conversion.callgraph.Node,java.util.Iterator):186:188 -> <init>
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem asIterator() -> a
     1:1:java.util.Iterator access$200(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem):182:182 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$300(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem):182:182 -> b
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem -> com.android.tools.r8.internal.qe:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem -> com.android.tools.r8.internal.Rd:
     com.android.tools.r8.ir.conversion.callgraph.Node node -> a
     1:2:void <init>(com.android.tools.r8.ir.conversion.callgraph.Node):167:168 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$100(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem):164:164 -> a
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem asNode() -> b
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo -> com.android.tools.r8.internal.re:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo -> com.android.tools.r8.internal.Sd:
     com.android.tools.r8.ir.conversion.callgraph.Node predecessor -> b
     boolean processed -> c
     int index -> a
     1:3:void <init>(int,com.android.tools.r8.ir.conversion.callgraph.Node):48:50 -> <init>
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$WorkItem -> com.android.tools.r8.internal.se:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$WorkItem -> com.android.tools.r8.internal.Td:
     1:1:void <init>():146:146 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$1):146:146 -> <init>
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem asIterator() -> a
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem asNode() -> b
-com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphBuilderBase -> com.android.tools.r8.internal.Dn:
+com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphBuilderBase -> com.android.tools.r8.internal.in:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):19:19 -> <init>
@@ -53595,7 +53121,7 @@
     28:28:void lambda$build$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):31:31 -> a
     29:29:com.android.tools.r8.ir.conversion.callgraph.Node com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphBuilderBase.createNode(com.android.tools.r8.graph.ProgramMethod):49:49 -> a
     29:29:com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod):16 -> a
-com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry -> com.android.tools.r8.internal.En:
+com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry -> com.android.tools.r8.internal.jn:
     com.android.tools.r8.graph.FieldAccessInfoCollection fieldAccessInfoCollection -> k
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():25:25 -> <clinit>
@@ -53611,10 +53137,10 @@
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9,"2":10,"3":11}}
     9:9:void com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry.processInitClass(com.android.tools.r8.graph.DexType):104:104 -> b
     9:9:void registerInitClass(com.android.tools.r8.graph.DexType):123 -> b
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> b
     10:10:void com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry.processInitClass(com.android.tools.r8.graph.DexType):104 -> b
     10:10:void registerInitClass(com.android.tools.r8.graph.DexType):123 -> b
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> b
     11:11:void com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry.processInitClass(com.android.tools.r8.graph.DexType):104 -> b
     11:11:void registerInitClass(com.android.tools.r8.graph.DexType):123 -> b
     3:8:void com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry.processInitClass(com.android.tools.r8.graph.DexType):105:110 -> b
@@ -53632,9 +53158,8 @@
     1:16:void processFieldRead(com.android.tools.r8.graph.DexField):63:78 -> i
     17:17:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> i
     17:17:void processFieldRead(com.android.tools.r8.graph.DexField):78 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:20:void processFieldRead(com.android.tools.r8.graph.DexField):79:81 -> i
-com.android.tools.r8.ir.conversion.callgraph.InvokeExtractor -> com.android.tools.r8.internal.Iu:
+com.android.tools.r8.ir.conversion.callgraph.InvokeExtractor -> com.android.tools.r8.internal.cu:
     java.util.function.Function nodeFactory -> g
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.conversion.callgraph.NodeBase currentMethod -> f
@@ -53647,7 +53172,6 @@
     1:8:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):49:56 -> a
     9:9:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():436:436 -> a
     9:9:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):56 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:17:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):60:67 -> a
     18:37:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):71:90 -> a
     38:42:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):80:84 -> a
@@ -53677,7 +53201,7 @@
     1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):178:178 -> f
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):183:183 -> g
-com.android.tools.r8.ir.conversion.callgraph.Node -> com.android.tools.r8.internal.KH:
+com.android.tools.r8.ir.conversion.callgraph.Node -> com.android.tools.r8.internal.HG:
     java.util.Set writers -> g
     java.util.Set callees -> d
     java.util.Set callers -> e
@@ -53728,14 +53252,14 @@
     216:216:java.lang.String toString():184:184 -> toString
     217:217:java.lang.String toString():185:185 -> toString
     187:214:java.lang.String toString():186:213 -> toString
-com.android.tools.r8.ir.conversion.callgraph.NodeBase -> com.android.tools.r8.internal.LH:
+com.android.tools.r8.ir.conversion.callgraph.NodeBase -> com.android.tools.r8.internal.IG:
     com.android.tools.r8.graph.ProgramMethod method -> b
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):14:15 -> <init>
     void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase,boolean) -> a
     void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase) -> a
     1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():23:23 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod getProgramMethod():27:27 -> b
-com.android.tools.r8.ir.conversion.callgraph.PartialCallGraphBuilder -> com.android.tools.r8.internal.cM:
+com.android.tools.r8.ir.conversion.callgraph.PartialCallGraphBuilder -> com.android.tools.r8.internal.YK:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.ProgramMethodSet seeds -> e
     1:1:void <clinit>():15:15 -> <clinit>
@@ -53744,112 +53268,109 @@
     2:2:void populateGraph(java.util.concurrent.ExecutorService):27:27 -> a
     3:4:boolean verifyAllMethodsWithCodeExists():43:44 -> a
     1:8:void processMethod(com.android.tools.r8.graph.ProgramMethod):31:38 -> c
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.i4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.f4:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods rewritableMethods -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():54:54 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):59:62 -> <init>
     1:8:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):79:86 -> a
-    9:12:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):93:96 -> a
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMember.getContextType():36:36 -> a
-    13:13:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):97 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):97:97 -> a
-    15:31:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:118 -> a
-    32:32:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):125:125 -> a
+    9:13:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):93:97 -> a
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMember.getContextType():36:36 -> a
+    14:14:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):97 -> a
+    15:15:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):97:97 -> a
+    16:31:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:117 -> a
+    32:32:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):124:124 -> a
     33:89:void com.android.tools.r8.ir.desugar.backports.BackportedMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):59:115 -> a
-    33:89:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):125 -> a
-    90:90:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):129:129 -> a
+    33:89:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):124 -> a
+    90:90:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):128:128 -> a
     91:91:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    91:91:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):129 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    92:100:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):130:138 -> a
-    101:101:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    101:101:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):138 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    102:116:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):138:152 -> a
+    91:91:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):128 -> a
+    92:100:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):129:137 -> a
+    101:101:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    101:101:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):137 -> a
+    102:116:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):137:151 -> a
     1:1:boolean hasBackports():66:66 -> b
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.Z3:
-    1:1:void <init>():1586:1586 -> <init>
-    1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1590:1590 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.a4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.W3:
+    1:1:void <init>():1585:1585 -> <init>
+    1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1589:1589 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.X3:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriter -> b
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1466:1467 -> <init>
-    1:1:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1477:1477 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.b4:
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1465:1466 -> <init>
+    1:1:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1476:1476 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.Y3:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory factory -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1487:1487 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1491:1492 -> <init>
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind():1497:1497 -> a
-    2:4:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1507:1509 -> a
-    5:8:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1515:1518 -> a
-    9:9:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1516:1516 -> a
-    10:13:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1522:1525 -> a
-    14:14:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1525:1525 -> a
-    15:15:com.android.tools.r8.graph.Code com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1533:1533 -> a
-    15:15:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1525 -> a
-    16:16:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1529:1529 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.c4:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1486:1486 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1490:1491 -> <init>
+    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind():1496:1496 -> a
+    2:4:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1506:1508 -> a
+    5:8:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1514:1517 -> a
+    9:9:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1515:1515 -> a
+    10:13:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1521:1524 -> a
+    14:14:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1524:1524 -> a
+    15:15:com.android.tools.r8.graph.Code com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1532:1532 -> a
+    15:15:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1524 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1528:1528 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.Z3:
     com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory) -> a
-    1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):1582:1582 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.d4:
+    1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):1581:1581 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.a4:
     com.android.tools.r8.graph.DexMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1449:1450 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1448:1449 -> <init>
     java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.e4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.b4:
     java.util.Map rewritable -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():157:157 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):164:164 -> <init>
-    2:56:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):162:216 -> <init>
-    1:1:boolean isEmpty():220:220 -> a
-    2:2:void visit(java.util.function.Consumer):224:224 -> a
-    3:133:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):229:359 -> a
-    134:134:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):929:929 -> a
-    135:156:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1416:1437 -> a
-    157:157:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1441:1441 -> a
-    1:338:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):365:702 -> b
-    339:339:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):950:950 -> b
+    1:1:void <clinit>():156:156 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):163:163 -> <init>
+    2:56:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):161:215 -> <init>
+    1:1:boolean isEmpty():219:219 -> a
+    2:2:void visit(java.util.function.Consumer):223:223 -> a
+    3:133:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):228:358 -> a
+    134:134:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928:928 -> a
+    135:156:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1415:1436 -> a
+    157:157:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1440:1440 -> a
+    1:338:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):364:701 -> b
+    339:339:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949:949 -> b
     1:6:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):68:73 -> c
-    1:6:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):970 -> c
+    1:6:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):969 -> c
     7:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):71:104 -> c
-    7:40:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):970 -> c
+    7:40:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):969 -> c
     41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):99:99 -> c
-    41:41:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):970 -> c
+    41:41:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):969 -> c
     42:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):96:108 -> c
-    42:54:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):970 -> c
-    55:213:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):709:867 -> c
-    1:48:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):879:926 -> d
-    49:73:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):923:947 -> d
-    74:97:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):944:967 -> d
-    98:116:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):964:982 -> d
-    1:99:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):992:1090 -> e
-    100:100:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):1088:1088 -> e
-    1:29:void initializeAndroidSv2MethodProviders(com.android.tools.r8.graph.DexItemFactory):1097:1125 -> f
-    1:23:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1338:1360 -> g
-    1:61:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1204:1264 -> h
-    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1366:1385 -> i
-    1:18:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1136:1153 -> j
-    19:48:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1147:1176 -> j
-    49:70:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1170:1191 -> j
-    1:61:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1271:1331 -> k
-    1:8:void initializeObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):1404:1411 -> l
-    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1392:1398 -> m
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.f4:
+    42:54:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):969 -> c
+    55:213:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):708:866 -> c
+    1:48:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):878:925 -> d
+    49:73:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):922:946 -> d
+    74:97:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):943:966 -> d
+    98:116:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):963:981 -> d
+    1:99:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):991:1089 -> e
+    100:100:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):1087:1087 -> e
+    1:29:void initializeAndroidSv2MethodProviders(com.android.tools.r8.graph.DexItemFactory):1096:1124 -> f
+    1:23:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1337:1359 -> g
+    1:61:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1203:1263 -> h
+    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1365:1384 -> i
+    1:18:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1135:1152 -> j
+    19:48:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1146:1175 -> j
+    49:70:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1169:1190 -> j
+    1:61:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1270:1330 -> k
+    1:8:void initializeObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):1403:1410 -> l
+    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1391:1397 -> m
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.c4:
     com.android.tools.r8.graph.DexType receiverType -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1546:1547 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1552:1552 -> a
-    2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1529:1529 -> a
-    2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1552 -> a
-    3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1552:1552 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodWithForwardingGenerator -> com.android.tools.r8.internal.g4:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1561:1561 -> <init>
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind():1566:1566 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.h4:
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1545:1546 -> <init>
+    1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1551:1551 -> a
+    2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1528:1528 -> a
+    2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1551 -> a
+    3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1551:1551 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodWithForwardingGenerator -> com.android.tools.r8.internal.d4:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1560:1560 -> <init>
+    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind():1565:1565 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.e4:
     com.android.tools.r8.graph.CfCode create(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod) -> a
-com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter -> com.android.tools.r8.internal.U5:
+com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter -> com.android.tools.r8.internal.R5:
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):28:30 -> <init>
     1:15:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):61:75 -> a
@@ -53865,34 +53386,33 @@
     35:37:boolean com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter.isInvokeCandidate(com.android.tools.r8.cf.code.CfInstruction):83:85 -> a
     35:37:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):90 -> a
     38:39:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):93:94 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.J6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.E6:
     void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.M6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.H6:
     1:1:void <init>():18:18 -> <init>
     void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
     1:2:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):22:23 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     3:3:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):23 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):43:43 -> a
+    4:4:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):47:47 -> a
     4:4:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):25 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    5:5:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):43 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    5:5:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):47 -> a
     5:5:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):25 -> a
-    6:9:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):44:47 -> a
+    6:9:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):48:51 -> a
     6:9:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):25 -> a
     10:26:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):27:43 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$EmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.K6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$EmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.F6:
     1:1:void <init>():71:71 -> <init>
     void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$NonEmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.L6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$NonEmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.G6:
     java.util.Collection synthesizers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():50:50 -> <clinit>
     1:3:void <init>(java.util.Collection):55:57 -> <init>
     1:1:void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):64:64 -> a
     2:2:void lambda$synthesizeClasses$0(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring):66:66 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.N6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.I6:
     java.util.Set synthesizedClasses -> a
     1:7:void <init>():15:21 -> <init>
     1:1:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):45:45 -> a
@@ -53901,13 +53421,13 @@
     1:1:void acceptEnumConversionProgramClass(com.android.tools.r8.graph.DexProgramClass):35:35 -> c
     1:1:void acceptProgramEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):25:25 -> d
     1:1:void acceptWrapperProgramClass(com.android.tools.r8.graph.DexProgramClass):30:30 -> e
-com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.z7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.t7:
     java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory) -> a
     boolean hasPreciseNeedsDesugaring() -> a
     boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod) -> a
     void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions) -> a
     void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android.tools.r8.internal.A7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android.tools.r8.internal.u7:
     1:1:void <init>():29:29 -> <init>
     void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
     java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
@@ -53919,13 +53439,12 @@
     void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer) -> a
     void withDesugaredLibraryAPIConverter(java.util.function.Consumer) -> a
     1:6:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):33:38 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     7:7:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):38 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:10:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):39:41 -> a
     11:11:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection empty():45:45 -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo getRetargetingInfo() -> b
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.E7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.x7:
     1:1:void <init>():47:47 -> <init>
     void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer.acceptConstantDynamicClass(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod) -> a
     void com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer.acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo) -> a
@@ -53938,8 +53457,7 @@
     void com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer.acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> f
     void com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer.acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod) -> g
     void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer.acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> h
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$1 -> com.android.tools.r8.internal.B7:
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.C7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.v7:
     java.util.Map pendingInvokeSpecialBridges -> b
     java.util.List synthesizedConstantDynamicClasses -> d
     java.util.List synthesizedLambdaClasses -> c
@@ -53955,11 +53473,9 @@
     5:5:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):130:130 -> a
     6:6:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():231:231 -> a
     6:6:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):130 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
     7:7:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():231 -> a
     7:7:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):130 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     8:8:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):130:130 -> a
     9:11:void acceptLambdaClass(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):135:137 -> a
     12:14:void acceptConstantDynamicClass(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):143:145 -> a
@@ -53986,7 +53502,7 @@
     1:1:void acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):176:176 -> f
     1:1:void acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod):117:117 -> g
     1:1:void acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):170:170 -> h
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.D7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.w7:
     java.util.function.BiConsumer onCompanionMethodCallback -> i
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.BiConsumer twrCloseResourceMethodConsumer -> d
@@ -54030,15 +53546,15 @@
     1:1:void acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):337:337 -> f
     void acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod) -> g
     void acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> h
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.f8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.X7:
     void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService) -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.i8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.a8:
     1:1:void <init>():21:21 -> <init>
     void postProcessingDesugaring(java.util.Collection,java.util.function.Predicate,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService) -> a
     1:1:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):27:27 -> a
     2:4:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):59:61 -> a
     2:4:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):28 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     5:5:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):61 -> a
     5:5:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):28 -> a
     6:24:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):62:80 -> a
@@ -54050,17 +53566,17 @@
     26:26:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):28 -> a
     27:27:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection.empty():35:35 -> a
     27:27:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):31 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.g8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.Y7:
     com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection INSTANCE -> a
     1:1:void <clinit>():102:102 -> <clinit>
     1:1:void <init>():105:105 -> <init>
     void postProcessingDesugaring(java.util.Collection,java.util.function.Predicate,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService) -> a
     1:1:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection access$000():99:99 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.h8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.Z7:
     java.util.List desugarings -> a
     1:2:void <init>(java.util.List):51:52 -> <init>
     1:2:void postProcessingDesugaring(java.util.Collection,java.util.function.Predicate,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):93:94 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.m8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.d8:
     1:1:void <init>():26:26 -> <init>
     void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer.acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod) -> a
     void com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer.acceptEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClasspathClass) -> a
@@ -54069,8 +53585,7 @@
     1:1:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer createForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):33:33 -> a
     2:2:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer createForR8(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,java.util.function.BiConsumer):40:40 -> a
     void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer.acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod) -> b
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$1 -> com.android.tools.r8.internal.j8:
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.k8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.b8:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToReprocess -> b
     com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> a
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection instructionDesugaring -> c
@@ -54090,7 +53605,7 @@
     1:3:void com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer.addMethodToReprocess(com.android.tools.r8.graph.ProgramMethod):62:64 -> b
     1:3:void acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod):91 -> b
     void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> c
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.l8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.c8:
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection desugaring -> b
     java.util.function.BiConsumer missingClassConsumer -> c
     com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions additions -> a
@@ -54105,7 +53620,7 @@
     1:1:void acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod):164:164 -> b
     2:2:void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass):175:175 -> b
     1:1:void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass):180:180 -> c
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.ke:
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.Md:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
     boolean $assertionsDisabled -> c
@@ -54115,7 +53630,6 @@
     15:15:void buildCovariantReturnTypeMethodsForClass(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.List):112:112 -> a
     16:16:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
     16:16:void buildCovariantReturnTypeMethodsForClass(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.List):112 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):114:114 -> a
     18:19:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.methodHasCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedMethod):122:123 -> a
     18:19:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):114 -> a
@@ -54192,7 +53706,7 @@
     22:22:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):99 -> b
     23:27:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):98:102 -> b
     28:28:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):99:99 -> b
-com.android.tools.r8.ir.desugar.DesugarDescription -> com.android.tools.r8.internal.yf:
+com.android.tools.r8.ir.desugar.DesugarDescription -> com.android.tools.r8.internal.hf:
     com.android.tools.r8.ir.desugar.DesugarDescription NOTHING -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.DesugarDescription$1):23:23 -> <init>
@@ -54203,22 +53717,21 @@
     boolean needsDesugaring() -> c
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription nothing():47:47 -> d
     void scan() -> e
-com.android.tools.r8.ir.desugar.DesugarDescription$1 -> com.android.tools.r8.internal.rf:
-com.android.tools.r8.ir.desugar.DesugarDescription$Builder -> com.android.tools.r8.internal.sf:
+com.android.tools.r8.ir.desugar.DesugarDescription$Builder -> com.android.tools.r8.internal.bf:
     1:1:void <init>():70:70 -> <init>
     com.android.tools.r8.ir.desugar.DesugarDescription$Builder addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback) -> a
     com.android.tools.r8.ir.desugar.DesugarDescription build() -> a
     com.android.tools.r8.ir.desugar.DesugarDescription$Builder setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback) -> a
-com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback -> com.android.tools.r8.internal.tf:
+com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback -> com.android.tools.r8.internal.cf:
     java.util.Collection desugarInstruction(com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder -> com.android.tools.r8.internal.uf:
+com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder -> com.android.tools.r8.internal.df:
     com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder INSTANCE -> a
     1:1:void <clinit>():83:83 -> <clinit>
     1:1:void <init>():82:82 -> <init>
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription build():91:91 -> a
     2:2:com.android.tools.r8.ir.desugar.DesugarDescription$Builder addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):96:96 -> a
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription$Builder setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):101:101 -> a
-com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder -> com.android.tools.r8.internal.wf:
+com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder -> com.android.tools.r8.internal.ff:
     java.util.List scanEffects -> a
     com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback desugarRewrite -> b
     boolean $assertionsDisabled -> c
@@ -54227,15 +53740,15 @@
     1:2:com.android.tools.r8.ir.desugar.DesugarDescription$Builder addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):112:113 -> a
     3:5:com.android.tools.r8.ir.desugar.DesugarDescription$Builder setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):119:121 -> a
     6:6:com.android.tools.r8.ir.desugar.DesugarDescription build():127:127 -> a
-com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder$1 -> com.android.tools.r8.internal.vf:
+com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder$1 -> com.android.tools.r8.internal.ef:
     com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder this$0 -> b
     1:1:void <init>(com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder):127:127 -> <init>
     1:3:java.util.Collection desugarInstruction(com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):146:148 -> a
     1:1:boolean needsDesugaring():135:135 -> c
     1:1:void scan():130:130 -> e
-com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback -> com.android.tools.r8.internal.xf:
+com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback -> com.android.tools.r8.internal.gf:
     void scan() -> a
-com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.Lh:
+com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.vh:
     com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection INSTANCE -> a
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -54250,9 +53763,9 @@
     void withDesugaredLibraryAPIConverter(java.util.function.Consumer) -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo getRetargetingInfo() -> b
     1:1:com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection getInstance():30:30 -> c
-com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.gl:
+com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.Kk:
     int getFreshLocal(int) -> a
-com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.internal.Wu:
+com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.internal.qu:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():28:28 -> <init>
@@ -54264,7 +53777,7 @@
     18:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter.privateMethodInvokedOnSelf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):61:67 -> a
     18:24:boolean com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter.isInvokingPrivateMethodOnSelf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):74 -> a
     18:24:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):57 -> a
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.YA:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.hA:
     com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring desugaring -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor -> d
@@ -54285,7 +53798,7 @@
     6:14:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):133 -> a
     15:21:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):259:265 -> a
     15:21:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):133 -> a
-    22:22:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():475:475 -> a
+    22:22:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():498:498 -> a
     22:22:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):267 -> a
     22:22:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):133 -> a
     23:23:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):268:268 -> a
@@ -54304,7 +53817,7 @@
     36:36:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):134 -> a
     37:37:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):239:239 -> a
     37:37:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):134 -> a
-    38:38:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():475:475 -> a
+    38:38:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():498:498 -> a
     38:38:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):244 -> a
     38:38:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):134 -> a
     39:39:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):245:245 -> a
@@ -54361,18 +53874,16 @@
     209:214:com.android.tools.r8.graph.DexField getCaptureField(int):140:145 -> a
     215:215:com.android.tools.r8.graph.DexField getCaptureField(int):142:142 -> a
     216:217:boolean canAccessModifyLambdaImplMethod():326:327 -> a
-    218:218:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1781:1781 -> a
+    218:218:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1803:1803 -> a
     218:218:boolean canAccessModifyLambdaImplMethod():327 -> a
     219:222:boolean com.android.tools.r8.ir.desugar.LambdaClass.isPrivateOrStaticInterfaceMethodInvokeThatWillBeDesugared():319:322 -> a
     219:222:boolean canAccessModifyLambdaImplMethod():328 -> a
     223:224:boolean canAccessModifyLambdaImplMethod():329:330 -> a
     225:225:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):183:183 -> a
     225:225:boolean canAccessModifyLambdaImplMethod():330 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     226:226:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
     226:226:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):183 -> a
     226:226:boolean canAccessModifyLambdaImplMethod():330 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     227:228:boolean canAccessModifyLambdaImplMethod():330:331 -> a
     229:229:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):398:398 -> a
     230:230:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isInvokeInstance():153:153 -> a
@@ -54403,11 +53914,9 @@
     3:8:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):335:340 -> b
     9:9:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):183:183 -> b
     9:9:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):340 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> b
     10:10:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):183 -> b
     10:10:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):340 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     11:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):340:390 -> b
     62:64:com.android.tools.r8.graph.DexString com.android.tools.r8.utils.DesugarUtils.appendFullyQualifiedHolderToMethodName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):14:14 -> b
     62:64:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):390 -> b
@@ -54415,7 +53924,6 @@
     1:1:boolean isStateless():149:149 -> c
     2:2:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():199:199 -> c
     2:2:boolean isStateless():149 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:21:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):290:308 -> c
     22:22:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):0:0 -> c
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":421,"2":422,"3":423}}
@@ -54517,7 +54025,7 @@
     413:414:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):300 -> c
     415:420:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createStaticMethodTarget(com.android.tools.r8.graph.ProgramMethod):455:460 -> c
     415:420:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):300 -> c
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.QA:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.Zz:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> h
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppView appView -> f
@@ -54534,67 +54042,60 @@
     54:77:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):28:51 -> a
     54:77:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):812 -> a
     78:85:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):811:818 -> a
-    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     86:86:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):818 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     87:89:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):818:820 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.RA:
+com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.aA:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):559:559 -> <init>
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.SA:
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.bA:
     com.android.tools.r8.graph.DexMethod implMethod -> f
     com.android.tools.r8.graph.AppView appView -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():696:696 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):703:705 -> <init>
     1:33:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):715:747 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     34:34:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):747 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     35:38:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):747:750 -> a
-    39:39:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     39:39:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):750 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:40:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):751:751 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     41:41:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):751 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     42:51:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):751:760 -> a
     52:70:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):723:741 -> a
     71:71:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):740:740 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.TA:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.cA:
     com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.graph.DexMethod implMethod -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():604:604 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):611:613 -> <init>
     1:38:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):622:659 -> a
-    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     39:39:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):659 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:43:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):659:662 -> a
-    44:44:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    44:44:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     44:44:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):662 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     45:45:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663:663 -> a
-    46:46:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    46:46:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     46:46:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     47:56:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663:672 -> a
     57:75:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):632:650 -> a
     76:80:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):649:653 -> a
     81:81:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):652:652 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.UA:
+com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.dA:
     com.android.tools.r8.graph.DexType exceptionType -> f
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType,boolean):683:684 -> <init>
+    1:685:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType,boolean):0:684 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.VA:
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.eA:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):567:567 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.WA:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.fA:
     com.android.tools.r8.graph.ProgramMethod target -> f
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod,boolean):584:585 -> <init>
     1:4:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):593:596 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.XA:
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.gA:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod callTarget -> a
@@ -54604,10 +54105,10 @@
     1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):525:530 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer) -> a
     1:3:void ensureAccessibilityIfNeeded(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):546:548 -> b
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.ZA:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.iA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.aB:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.jA:
     com.android.tools.r8.graph.MethodAccessFlags targetAccessFlags -> j
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
@@ -54652,7 +54153,6 @@
     256:257:void forEachErasedAndEnforcedTypes(java.util.function.BiConsumer):187:188 -> a
     258:258:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> a
     258:258:void forEachErasedAndEnforcedTypes(java.util.function.BiConsumer):188 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     259:259:void forEachErasedAndEnforcedTypes(java.util.function.BiConsumer):189:189 -> a
     260:260:boolean needsAccessor(com.android.tools.r8.graph.ProgramMethod):204:204 -> a
     261:261:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isInvokeInterface():157:157 -> a
@@ -54715,7 +54215,7 @@
     2003:2006:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):460:463 -> a
     1:1:com.android.tools.r8.graph.DexMethod getMainMethod():67:67 -> b
     2:3:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):266:267 -> b
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.fB:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.oA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():44:44 -> <clinit>
     1:15:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):97:111 -> a
@@ -54775,29 +54275,25 @@
     342:342:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):248 -> a
     343:343:int com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.prepareParameterValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):364:364 -> a
     343:343:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):248 -> a
-    344:344:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):252:252 -> a
-    345:361:int com.android.tools.r8.ir.code.Invoke$Type.getCfOpcode():150:166 -> a
-    345:361:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):253 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    362:362:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.isInterface():553:553 -> a
-    362:362:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):253 -> a
-    363:389:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):253:279 -> a
-    390:403:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):278:291 -> a
-    404:405:int com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.prepareReturnValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):346:347 -> a
-    404:405:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):288 -> a
-    406:424:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):286:304 -> a
-    425:425:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> a
-    425:425:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):304 -> a
-    426:440:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):412:426 -> a
-    426:440:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    441:452:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):76:87 -> a
-    441:452:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):429 -> a
-    441:452:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    453:453:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":521,"2":522,"3":523,"4":524,"5":525}}
-    521:521:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
-    521:521:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):429 -> a
-    521:521:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    344:345:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):252:253 -> a
+    346:362:int com.android.tools.r8.ir.code.Invoke$Type.getCfOpcode():150:166 -> a
+    346:362:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):253 -> a
+    363:363:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.isInterface():553:553 -> a
+    363:363:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):253 -> a
+    364:390:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):253:279 -> a
+    391:404:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):278:291 -> a
+    405:406:int com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.prepareReturnValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):346:347 -> a
+    405:406:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):288 -> a
+    407:425:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):286:304 -> a
+    426:426:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> a
+    426:426:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):304 -> a
+    427:441:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):412:426 -> a
+    427:441:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    442:453:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):76:87 -> a
+    442:453:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):429 -> a
+    442:453:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    454:454:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":522,"2":523,"3":524,"4":525,"5":526}}
     522:522:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
     522:522:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):429 -> a
     522:522:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
@@ -54810,41 +54306,40 @@
     525:525:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
     525:525:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):429 -> a
     525:525:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    454:454:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
-    454:454:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):429 -> a
-    454:454:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    455:455:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):85:85 -> a
+    526:526:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
+    526:526:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):429 -> a
+    526:526:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    455:455:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
     455:455:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):429 -> a
     455:455:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    456:456:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):430:430 -> a
+    456:456:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):85:85 -> a
+    456:456:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):429 -> a
     456:456:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    457:457:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
-    457:457:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):430 -> a
+    457:457:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):430:430 -> a
     457:457:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    458:458:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):430:430 -> a
+    458:458:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
+    458:458:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):430 -> a
     458:458:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    459:459:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):775:775 -> a
-    459:459:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):432 -> a
+    459:459:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):430:430 -> a
     459:459:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    460:461:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):750:751 -> a
-    460:461:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
-    460:461:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
-    460:461:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    462:462:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):545:545 -> a
-    462:462:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
-    462:462:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    463:463:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):435:435 -> a
+    460:460:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):775:775 -> a
+    460:460:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):432 -> a
+    460:460:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    461:462:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):750:751 -> a
+    461:462:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
+    461:462:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
+    461:462:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    463:463:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):545:545 -> a
+    463:463:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
     463:463:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    464:464:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
-    464:464:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
-    464:464:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
+    464:464:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):435:435 -> a
     464:464:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    465:465:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":526,"2":527,"3":528,"4":529,"5":530}}
-    526:526:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
-    526:526:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
-    526:526:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
-    526:526:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    465:465:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
+    465:465:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
+    465:465:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
+    465:465:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    466:466:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":527,"2":528,"3":529,"4":530,"5":531}}
     527:527:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
     527:527:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     527:527:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
@@ -54861,18 +54356,19 @@
     530:530:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     530:530:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
     530:530:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    466:466:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
-    466:466:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
-    466:466:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
-    466:466:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    467:478:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):76:87 -> a
-    467:478:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):443 -> a
-    467:478:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    479:479:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":531,"2":532,"3":533,"4":534,"5":535}}
-    531:531:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
-    531:531:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):443 -> a
+    531:531:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
+    531:531:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
+    531:531:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
     531:531:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    467:467:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
+    467:467:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
+    467:467:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
+    467:467:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    468:479:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):76:87 -> a
+    468:479:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):443 -> a
+    468:479:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    480:480:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":532,"2":533,"3":534,"4":535,"5":536}}
     532:532:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
     532:532:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):443 -> a
     532:532:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
@@ -54885,40 +54381,39 @@
     535:535:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
     535:535:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):443 -> a
     535:535:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    480:480:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
-    480:480:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):443 -> a
-    480:480:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    481:481:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):85:85 -> a
+    536:536:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
+    536:536:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):443 -> a
+    536:536:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    481:481:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
     481:481:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):443 -> a
     481:481:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    482:482:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):444:444 -> a
+    482:482:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):85:85 -> a
+    482:482:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):443 -> a
     482:482:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    483:483:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):760:760 -> a
-    483:483:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
-    483:483:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
+    483:483:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):444:444 -> a
     483:483:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    484:484:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):775:775 -> a
-    484:484:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):761 -> a
+    484:484:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):760:760 -> a
     484:484:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     484:484:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     484:484:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    485:486:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:766 -> a
-    485:486:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
-    485:486:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
-    485:486:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    487:487:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):553:553 -> a
-    487:487:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
-    487:487:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    488:488:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
-    488:488:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
+    485:485:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):775:775 -> a
+    485:485:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):761 -> a
+    485:485:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
+    485:485:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
+    485:485:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    486:487:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:766 -> a
+    486:487:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
+    486:487:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
+    486:487:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    488:488:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):553:553 -> a
     488:488:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     488:488:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    489:489:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":536,"2":537,"3":538,"4":539,"5":540}}
-    536:536:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
-    536:536:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
-    536:536:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
-    536:536:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    489:489:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
+    489:489:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
+    489:489:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
+    489:489:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    490:490:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":537,"2":538,"3":539,"4":540,"5":541}}
     537:537:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
     537:537:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     537:537:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
@@ -54935,63 +54430,67 @@
     540:540:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     540:540:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     540:540:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    490:490:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
-    490:490:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
-    490:490:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
-    490:490:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    491:505:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):456:470 -> a
-    491:505:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    506:506:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
-    506:506:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):470 -> a
-    506:506:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    507:507:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):470:470 -> a
-    507:507:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    508:508:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):389:389 -> a
-    509:509:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):775:775 -> a
-    509:509:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):392 -> a
-    510:515:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):394:399 -> a
-    516:516:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):395:395 -> a
-    517:517:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):393:393 -> a
-    518:518:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):475:475 -> a
-    518:518:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    519:519:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":541,"2":542,"3":543}}
-    541:541:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):475:475 -> a
+    541:541:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
+    541:541:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
+    541:541:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     541:541:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    491:491:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
+    491:491:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
+    491:491:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
+    491:491:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    492:506:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):456:470 -> a
+    492:506:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    507:507:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
+    507:507:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):470 -> a
+    507:507:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    508:508:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):470:470 -> a
+    508:508:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    509:509:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):389:389 -> a
+    510:510:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):775:775 -> a
+    510:510:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):392 -> a
+    511:516:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):394:399 -> a
+    517:517:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):395:395 -> a
+    518:518:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):393:393 -> a
+    519:519:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):475:475 -> a
+    519:519:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    520:520:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":542,"2":543,"3":544}}
     542:542:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):475:475 -> a
     542:542:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
     543:543:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):475:475 -> a
     543:543:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    520:520:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):476:476 -> a
-    520:520:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    544:590:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):481:527 -> a
-    591:595:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):516:520 -> a
-    596:599:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):508:511 -> a
-    600:600:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):502:502 -> a
-    601:643:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):494:536 -> a
-    644:644:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1184,"2":1185,"3":1186}}
-    1184:1184:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):536:536 -> a
+    544:544:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):475:475 -> a
+    544:544:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    521:521:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):476:476 -> a
+    521:521:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    545:591:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):481:527 -> a
+    592:596:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):516:520 -> a
+    597:600:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):508:511 -> a
+    601:601:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):502:502 -> a
+    602:644:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):494:536 -> a
+    645:645:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1185,"2":1186,"3":1187}}
     1185:1185:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):536:536 -> a
     1186:1186:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):536:536 -> a
-    645:645:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1187,"2":1188,"3":1189}}
     1187:1187:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):536:536 -> a
+    646:646:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1188,"2":1189,"3":1190}}
     1188:1188:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):536:536 -> a
     1189:1189:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):536:536 -> a
-    646:646:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1190,"2":1191,"3":1192,"4":1193}}
-    1190:1190:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
+    1190:1190:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):536:536 -> a
+    647:647:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1191,"2":1192,"3":1193,"4":1194}}
     1191:1191:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
     1192:1192:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
     1193:1193:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
-    1183:1183:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.eB:
+    1194:1194:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
+    1184:1184:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.nA:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():492:492 -> <clinit>
-com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.MC:
+com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.UB:
     void allocateLocalStack(int) -> a
-com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.OH:
+com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.LG:
     java.util.List desugarings -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> g
     com.android.tools.r8.graph.AppView appView -> a
@@ -55002,146 +54501,169 @@
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():49:49 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):64:64 -> <init>
-    2:89:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):52:139 -> <init>
-    1:2:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):144:145 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    3:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):145 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:5:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):145:146 -> a
+    2:47:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):52:97 -> <init>
+    48:93:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):96:141 -> <init>
+    1:2:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):146:147 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    3:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):147 -> a
+    4:5:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):147:148 -> a
     6:6:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.noAndroidApiLevelCompute():54:54 -> a
-    6:6:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):147 -> a
-    7:10:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):147:150 -> a
-    11:19:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):165:173 -> a
-    11:19:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):194 -> a
-    20:20:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):169:169 -> a
-    20:20:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):194 -> a
-    21:34:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):195:208 -> a
-    35:66:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):207:238 -> a
-    67:75:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):165:173 -> a
-    67:75:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):179 -> a
-    76:76:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):169:169 -> a
-    76:76:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):179 -> a
-    77:77:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):180:180 -> a
-    78:86:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):165:173 -> a
-    78:86:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):185 -> a
-    87:87:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):169:169 -> a
-    87:87:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):185 -> a
-    88:88:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):186:186 -> a
-    89:89:void lambda$prepare$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):180:180 -> a
-    90:90:void lambda$scan$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):186:186 -> a
-    91:102:java.util.Collection lambda$desugar$2(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):210:221 -> a
+    6:6:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):149 -> a
+    7:10:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):149:152 -> a
+    11:19:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):167:175 -> a
+    11:19:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):196 -> a
+    20:20:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):171:171 -> a
+    20:20:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):196 -> a
+    21:34:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):197:210 -> a
+    35:66:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):209:240 -> a
+    67:75:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):167:175 -> a
+    67:75:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):181 -> a
+    76:76:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):171:171 -> a
+    76:76:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):181 -> a
+    77:77:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):182:182 -> a
+    78:86:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):167:175 -> a
+    78:86:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):187 -> a
+    87:87:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.ensureCfCode(com.android.tools.r8.graph.ProgramMethod):171:171 -> a
+    87:87:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):187 -> a
+    88:88:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):188:188 -> a
+    89:89:void lambda$prepare$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):182:182 -> a
+    90:90:void lambda$scan$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):188:188 -> a
+    91:102:java.util.Collection lambda$desugar$2(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):212:223 -> a
     103:104:void com.android.tools.r8.utils.IntBox.setMax(int):61:62 -> a
-    103:104:java.util.Collection lambda$desugar$2(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):221 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    105:105:java.util.Collection lambda$desugar$2(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):222:222 -> a
+    103:104:java.util.Collection lambda$desugar$2(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):223 -> a
+    105:105:java.util.Collection lambda$desugar$2(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):224:224 -> a
     106:107:void com.android.tools.r8.utils.IntBox.setMax(int):61:62 -> a
-    106:107:java.util.Collection lambda$desugar$2(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):222 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    108:109:java.util.Collection lambda$desugar$2(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):225:226 -> a
-    110:110:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$3(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):243:243 -> a
-    111:119:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):273:281 -> a
-    120:131:java.util.Collection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.applyDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):305:316 -> a
-    120:131:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):274 -> a
-    132:143:java.util.Collection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.applyDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):308:319 -> a
-    132:143:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):274 -> a
-    144:151:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):287:294 -> a
-    152:163:java.util.Collection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.applyDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):305:316 -> a
-    152:163:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):287 -> a
-    164:175:java.util.Collection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.applyDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):308:319 -> a
-    164:175:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):287 -> a
-    176:190:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):328:342 -> a
+    106:107:java.util.Collection lambda$desugar$2(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):224 -> a
+    108:109:java.util.Collection lambda$desugar$2(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):227:228 -> a
+    110:110:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$3(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):245:245 -> a
+    111:119:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):275:283 -> a
+    120:131:java.util.Collection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.applyDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):307:318 -> a
+    120:131:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):276 -> a
+    132:143:java.util.Collection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.applyDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):310:321 -> a
+    132:143:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):276 -> a
+    144:151:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289:296 -> a
+    152:163:java.util.Collection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.applyDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):307:318 -> a
+    152:163:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
+    164:175:java.util.Collection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.applyDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):310:321 -> a
+    164:175:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
+    176:190:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):330:344 -> a
     191:191:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    191:191:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):341 -> a
-    192:192:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):338:338 -> a
-    193:193:boolean lambda$needsDesugaring$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):342:342 -> a
-    194:194:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):346:346 -> a
+    191:191:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):343 -> a
+    192:192:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):340:340 -> a
+    193:193:boolean lambda$needsDesugaring$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):344:344 -> a
+    194:194:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):348:348 -> a
     195:195:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    195:195:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):346 -> a
-    196:196:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):346:346 -> a
+    195:195:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):348 -> a
+    196:196:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):348:348 -> a
     197:197:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    197:197:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):348 -> a
-    198:198:boolean lambda$needsDesugaring$7(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):347:347 -> a
-    199:199:boolean verifyNoOtherDesugaringNeeded(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,java.util.Iterator,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):357:357 -> a
-    200:216:void lambda$verifyNoOtherDesugaringNeeded$9(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):359:375 -> a
-    217:219:void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer):383:385 -> a
-    220:221:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):392:393 -> a
-    222:223:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):400:401 -> a
-    224:225:void withDesugaredLibraryAPIConverter(java.util.function.Consumer):415:416 -> a
-    1:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToDexNonDesugar(com.android.tools.r8.graph.AppView):155:157 -> b
+    197:197:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):350 -> a
+    198:198:boolean lambda$needsDesugaring$7(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):349:349 -> a
+    199:199:boolean verifyNoOtherDesugaringNeeded(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,java.util.Iterator,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):359:359 -> a
+    200:216:void lambda$verifyNoOtherDesugaringNeeded$9(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):361:377 -> a
+    217:219:void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer):385:387 -> a
+    220:221:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):394:395 -> a
+    222:223:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):402:403 -> a
+    224:225:void withDesugaredLibraryAPIConverter(java.util.function.Consumer):417:418 -> a
+    1:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToDexNonDesugar(com.android.tools.r8.graph.AppView):157:159 -> b
     4:4:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.noAndroidApiLevelCompute():54:54 -> b
-    4:4:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToDexNonDesugar(com.android.tools.r8.graph.AppView):158 -> b
-    5:7:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToDexNonDesugar(com.android.tools.r8.graph.AppView):158:160 -> b
-    8:25:boolean noDesugaringBecauseOfImpreciseDesugaring(com.android.tools.r8.graph.ProgramMethod):243:260 -> b
-    26:26:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$4(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):250:250 -> b
-    27:27:boolean lambda$needsDesugaring$8(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):349:349 -> b
-    28:29:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo getRetargetingInfo():407:408 -> b
-    1:1:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$5(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):256:256 -> c
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.SM:
-    1:1:void <init>():23:23 -> <init>
+    4:4:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToDexNonDesugar(com.android.tools.r8.graph.AppView):160 -> b
+    5:7:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToDexNonDesugar(com.android.tools.r8.graph.AppView):160:162 -> b
+    8:25:boolean noDesugaringBecauseOfImpreciseDesugaring(com.android.tools.r8.graph.ProgramMethod):245:262 -> b
+    26:26:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$4(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):252:252 -> b
+    27:27:boolean lambda$needsDesugaring$8(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):351:351 -> b
+    28:29:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo getRetargetingInfo():409:410 -> b
+    1:1:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$5(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):258:258 -> c
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.LL:
+    1:1:void <init>():24:24 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
-    1:1:com.android.tools.r8.ir.desugar.PrefixRewritingMapper empty():26:26 -> a
-    2:2:boolean hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
-    3:7:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView):38:42 -> a
+    1:1:com.android.tools.r8.ir.desugar.PrefixRewritingMapper empty():27:27 -> a
+    2:2:boolean hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):37:37 -> a
+    3:7:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView):41:45 -> a
     boolean isRewriting() -> b
-    com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.QM:
+    com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
+    com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> c
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.IL:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
     boolean l8Compilation -> e
     boolean $assertionsDisabled -> f
     java.util.Set notRewritten -> a
-    1:1:void <clinit>():55:55 -> <clinit>
+    1:1:void <clinit>():56:56 -> <clinit>
     1:1:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,boolean):65:65 -> <init>
-    2:22:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,boolean):57:77 -> <init>
-    1:1:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):81:81 -> a
+    2:18:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,boolean):58:74 -> <init>
+    1:1:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):78:78 -> a
     2:2:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":84,"2":85,"3":86}}
-    84:84:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):81:81 -> a
-    85:85:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):81:81 -> a
-    86:86:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):81:81 -> a
-    83:83:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):81:81 -> a
-    87:87:void forAllRewrittenTypes(java.util.function.Consumer):86:86 -> a
-    88:111:void validatePrefixes(java.util.Map):90:113 -> a
-    112:112:void validatePrefixes(java.util.Map):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":116,"2":117,"3":118}}
-    116:116:void validatePrefixes(java.util.Map):113:113 -> a
-    117:117:void validatePrefixes(java.util.Map):113:113 -> a
-    118:118:void validatePrefixes(java.util.Map):113:113 -> a
-    113:113:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    113:113:void validatePrefixes(java.util.Map):113 -> a
-    114:114:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    114:114:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    114:114:void validatePrefixes(java.util.Map):113 -> a
-    115:115:void validatePrefixes(java.util.Map):113:113 -> a
-    119:129:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):153:163 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81,"2":82,"3":83}}
+    81:81:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):78:78 -> a
+    82:82:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):78:78 -> a
+    83:83:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):78:78 -> a
+    80:80:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):78:78 -> a
+    84:84:void forAllRewrittenTypes(java.util.function.Consumer):83:83 -> a
+    85:108:void validatePrefixes(java.util.Map):87:110 -> a
+    109:109:void validatePrefixes(java.util.Map):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":113,"2":114,"3":115}}
+    113:113:void validatePrefixes(java.util.Map):110:110 -> a
+    114:114:void validatePrefixes(java.util.Map):110:110 -> a
+    115:115:void validatePrefixes(java.util.Map):110:110 -> a
+    110:110:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    110:110:void validatePrefixes(java.util.Map):110 -> a
+    111:111:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    111:111:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    111:111:void validatePrefixes(java.util.Map):110 -> a
+    112:112:void validatePrefixes(java.util.Map):110:110 -> a
+    116:126:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):180:190 -> a
     boolean isRewriting() -> b
-    1:6:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):122:127 -> b
-    7:8:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):167:168 -> b
-    7:8:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):179:179 -> b
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):168 -> b
-    9:9:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
-    10:10:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> b
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):180 -> b
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):168 -> b
-    10:10:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
-    11:14:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):181:184 -> b
-    11:14:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):168 -> b
-    11:14:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
-    15:25:void com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.failIfRewritingProgramType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):134:144 -> b
-    15:25:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):170 -> b
-    15:25:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):173:173 -> b
-    26:26:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.RM:
-    1:1:void <init>():208:208 -> <init>
+    1:16:com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):131:146 -> b
+    17:22:com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):145:150 -> b
+    23:23:com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":179,"2":180,"3":181}}
+    179:179:com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):150:150 -> b
+    180:180:com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):150:150 -> b
+    181:181:com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):150:150 -> b
+    176:176:com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):153:153 -> b
+    177:177:com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):152:152 -> b
+    178:178:com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):151:151 -> b
+    1:6:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):119:124 -> c
+    7:8:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):194:195 -> c
+    7:8:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):126 -> c
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):206:206 -> c
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):195 -> c
+    9:9:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):126 -> c
+    10:10:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> c
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):207 -> c
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):195 -> c
+    10:10:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):126 -> c
+    11:14:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):208:211 -> c
+    11:14:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):195 -> c
+    11:14:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):126 -> c
+    15:25:void com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.failIfRewritingProgramType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):161:171 -> c
+    15:25:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):197 -> c
+    15:25:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):126 -> c
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):200:200 -> c
+    26:26:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):126 -> c
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.JL:
+    1:1:void <init>():273:273 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     boolean isRewriting() -> b
-    com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.internal.sN:
+    com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
+    com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> c
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$MachineDesugarPrefixRewritingMapper -> com.android.tools.r8.internal.KL:
+    java.util.Map rewriteType -> b
+    java.util.Map rewriteDerivedTypeOnly -> c
+    com.android.tools.r8.ir.desugar.PrefixRewritingMapper mapper -> a
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():224:224 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.desugar.PrefixRewritingMapper,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags):231:234 -> <init>
+    1:2:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):253:254 -> a
+    3:3:com.android.tools.r8.graph.DexType lambda$rewriteType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):257:257 -> a
+    4:4:void forAllRewrittenTypes(java.util.function.Consumer):269:269 -> a
+    boolean isRewriting() -> b
+    1:4:com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):245:248 -> b
+    1:2:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):239:240 -> c
+com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.internal.jM:
     java.util.Map additions -> b
     java.util.Set added -> a
     boolean $assertionsDisabled -> c
@@ -55156,39 +54678,42 @@
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):44:46 -> <init>
-    1:5:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):59:63 -> a
-    6:9:java.util.Collection com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaring.desugarLibraryCall(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory):121:124 -> a
-    6:9:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):61 -> a
-    10:14:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):72:76 -> a
-    15:26:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):81:92 -> a
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):49:52 -> <init>
+    1:5:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):65:69 -> a
+    6:9:java.util.Collection com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaring.desugarLibraryCall(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory):138:141 -> a
+    6:9:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):67 -> a
+    10:14:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):78:82 -> a
+    15:26:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):87:98 -> a
     27:27:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    27:27:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):93 -> a
-    28:30:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):96:98 -> a
-    31:33:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):97:99 -> a
-    34:35:boolean com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaring.isApiLevelLessThanOrEqualTo9(com.android.tools.r8.androidapi.ComputedApiLevel):112:113 -> a
-    34:35:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):100 -> a
-    36:40:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):104:108 -> a
-    41:41:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):101:101 -> a
-    42:42:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):94:94 -> a
-    43:45:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):133:135 -> a
-    46:48:boolean com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaring.verifyLibraryHolderAndInvoke(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,boolean):175:177 -> a
-    46:48:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):136 -> a
-    49:50:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):136:137 -> a
-    51:51:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2584:2584 -> a
-    51:51:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2588 -> a
-    51:51:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):137 -> a
-    52:52:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2588:2588 -> a
-    52:52:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):137 -> a
-    53:55:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):138:140 -> a
-    56:58:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):146:148 -> a
-    59:59:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic():343:343 -> a
-    59:59:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):149 -> a
-    60:64:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):149:153 -> a
-    65:74:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):147:156 -> a
-    75:83:com.android.tools.r8.graph.Code lambda$ensureOutlineMethod$0(boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):159:167 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.j4:
+    27:27:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):99 -> a
+    28:30:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):102:104 -> a
+    31:33:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):103:105 -> a
+    34:35:boolean com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaring.isApiLevelLessThanOrEqualTo9(com.android.tools.r8.androidapi.ComputedApiLevel):129:130 -> a
+    34:35:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):106 -> a
+    36:48:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):110:122 -> a
+    49:49:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> a
+    49:49:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):122 -> a
+    50:50:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):124:124 -> a
+    51:51:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):107:107 -> a
+    52:52:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):100:100 -> a
+    53:55:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):150:152 -> a
+    56:58:boolean com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaring.verifyLibraryHolderAndInvoke(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,boolean):192:194 -> a
+    56:58:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):153 -> a
+    59:60:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):153:154 -> a
+    61:61:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2584:2584 -> a
+    61:61:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2588 -> a
+    61:61:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):154 -> a
+    62:62:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2588:2588 -> a
+    62:62:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):154 -> a
+    63:65:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):155:157 -> a
+    66:68:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):163:165 -> a
+    69:69:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic():343:343 -> a
+    69:69:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):166 -> a
+    70:74:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):166:170 -> a
+    75:84:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):164:173 -> a
+    85:93:com.android.tools.r8.graph.Code lambda$ensureOutlineMethod$0(boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):176:184 -> a
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.g4:
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2235:2264 -> A
     31:31:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> A
     31:31:com.android.tools.r8.graph.CfCode IntegerMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2264 -> A
@@ -56658,48 +56183,48 @@
     33:56:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6743:6766 -> z0
     57:57:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> z0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6766 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.v5:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.s5:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter createRewriter(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode):15:15 -> a
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):15:15 -> a
     3:3:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalAnd():19:19 -> a
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalOr():23:23 -> b
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalXor():27:27 -> c
-com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.internal.hc:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.internal.Mb:
     1:1:com.android.tools.r8.graph.CfCode generateListOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):31:31 -> a
     2:21:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):40:59 -> a
     22:22:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):56:56 -> a
     23:33:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):53:63 -> a
     1:1:com.android.tools.r8.graph.CfCode generateSetOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):35:35 -> b
-com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.ic:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.Nb:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteListOfEmpty():16:16 -> a
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToCollectionMethod(java.lang.String):28:28 -> a
     3:5:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToCollectionMethod$0(java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):29:31 -> a
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteMapOfEmpty():24:24 -> b
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteSetOfEmpty():20:20 -> c
-com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.internal.Mk:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.internal.qk:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteHashCode():16:16 -> a
     2:5:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):17:20 -> a
     6:6:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):19:19 -> a
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.internal.pD:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.internal.xC:
     1:1:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteCompare$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):17:17 -> a
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteCompare():17:17 -> a
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.internal.tI:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.internal.rH:
     1:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToAddInstruction$1(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):30:31 -> a
     3:3:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteAsIdentity():36:36 -> a
     1:4:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToInvokeMath$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):20:23 -> b
     5:5:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToAddInstruction():29:29 -> b
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToInvokeMath():19:19 -> c
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.sI:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.qH:
     1:1:void <init>():36:36 -> <init>
     1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):41:41 -> a
-com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites -> com.android.tools.r8.internal.PK:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites -> com.android.tools.r8.internal.LJ:
     1:4:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToArraysHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):24:27 -> a
     5:5:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteRequireNonNull():33:33 -> a
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToArraysHashCode():23:23 -> b
-com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.OK:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.KJ:
     1:1:void <init>():33:33 -> <init>
     1:2:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):39:40 -> a
-com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.iL:
+com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.eK:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter createRewriter(java.util.function.Function,java.lang.String):20:20 -> a
     2:5:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(java.util.function.Function,java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):21:24 -> a
     6:6:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(java.util.function.Function,java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):23:23 -> a
@@ -56711,10 +56236,10 @@
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLongOrElseGet():41:41 -> c
     1:1:com.android.tools.r8.graph.DexType lambda$rewriteOrElseGet$1(com.android.tools.r8.graph.DexItemFactory):29:29 -> d
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteOrElseGet():29:29 -> d
-com.android.tools.r8.ir.desugar.backports.SparseArrayMethodRewrites -> com.android.tools.r8.internal.qW:
+com.android.tools.r8.ir.desugar.backports.SparseArrayMethodRewrites -> com.android.tools.r8.internal.PU:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteSet():17:17 -> a
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteSet$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):18:18 -> a
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass -> com.android.tools.r8.internal.Id:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass -> com.android.tools.r8.internal.kd:
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean isFinalBootstrapMethodReferenceOnInterface -> i
@@ -56747,7 +56272,7 @@
     16:16:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):233 -> a
     17:17:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):242:242 -> a
     17:17:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):233 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():475:475 -> a
+    18:18:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():498:498 -> a
     18:18:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):243 -> a
     18:18:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):233 -> a
     19:21:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):244:246 -> a
@@ -56757,7 +56282,7 @@
     22:22:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):233 -> a
     23:23:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):247:247 -> a
     23:23:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):233 -> a
-    24:24:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():475:475 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():498:498 -> a
     24:24:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):248 -> a
     24:24:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):233 -> a
     25:25:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):249:249 -> a
@@ -56839,13 +56364,12 @@
     179:179:com.android.tools.r8.graph.Code adaptCode(com.android.tools.r8.graph.DexEncodedMethod):439 -> a
     180:181:com.android.tools.r8.cf.code.CfInstruction lambda$adaptCode$1(com.android.tools.r8.cf.code.CfInstruction):429:430 -> a
     1:33:void rewriteBootstrapMethodSignatureIfNeeded():372:404 -> b
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> b
     34:34:void rewriteBootstrapMethodSignatureIfNeeded():404 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     35:43:void rewriteBootstrapMethodSignatureIfNeeded():404:412 -> b
     44:59:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):383:398 -> b
     1:2:boolean shouldRewriteBootstrapMethodSignature():175:176 -> c
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.Jd:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.ld:
     java.util.Map dynamicConstantSyntheticsPerClass -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):33:33 -> <init>
@@ -56865,7 +56389,7 @@
     28:28:void lambda$createConstantDynamicClass$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):124:124 -> a
     1:3:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass ensureConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):90:92 -> b
     4:17:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass ensureConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):91:104 -> b
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.android.tools.r8.internal.Kd:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.android.tools.r8.internal.md:
     java.lang.Object[] bootstrapMethodArguments -> d
     com.android.tools.r8.graph.DexString name -> a
     boolean $assertionsDisabled -> e
@@ -56879,7 +56403,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():34:34 -> d
     1:7:boolean equals(java.lang.Object):48:54 -> equals
     1:1:int hashCode():59:59 -> hashCode
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer -> com.android.tools.r8.internal.zf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer -> com.android.tools.r8.internal.if:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -56898,46 +56422,45 @@
     7:12:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):59:64 -> a
     13:37:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):102:126 -> a
     13:37:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    38:38:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    38:38:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     38:38:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):126 -> a
     38:38:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
     39:40:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):130:131 -> a
     39:40:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     41:41:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):131 -> a
     41:41:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
     42:42:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):134:134 -> a
     42:42:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
     43:49:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):66:72 -> a
-    50:67:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.generateCallbackMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer):195:212 -> a
-    50:67:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
-    68:76:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):74:82 -> a
-    77:78:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.noPendingWrappersOrConversions():88:89 -> a
-    77:78:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):82 -> a
-    79:80:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.isAPIConversionSyntheticType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,com.android.tools.r8.graph.AppView):128:129 -> a
-    79:80:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.noPendingWrappersOrConversions():89 -> a
-    79:80:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):82 -> a
-    81:81:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.noPendingWrappersOrConversions():89:89 -> a
-    81:81:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):82 -> a
-    82:82:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.generateTrackingWarnings():217:217 -> a
-    82:82:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):83 -> a
-    83:85:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):139:141 -> a
-    86:87:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
-    86:87:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):141 -> a
-    88:97:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):144:153 -> a
-    98:99:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
-    98:99:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):153 -> a
-    100:101:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):154:155 -> a
-    102:102:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    102:102:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
-    103:103:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157:157 -> a
-    104:104:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    104:104:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    105:111:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):181:187 -> a
-    105:111:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):160 -> a
-    112:118:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):163:169 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.Lf:
+    50:66:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.generateCallbackMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer):195:211 -> a
+    50:66:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
+    67:75:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):74:82 -> a
+    76:77:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.noPendingWrappersOrConversions():88:89 -> a
+    76:77:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):82 -> a
+    78:79:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.isAPIConversionSyntheticType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,com.android.tools.r8.graph.AppView):128:129 -> a
+    78:79:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.noPendingWrappersOrConversions():89 -> a
+    78:79:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):82 -> a
+    80:80:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.noPendingWrappersOrConversions():89:89 -> a
+    80:80:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):82 -> a
+    81:81:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.generateTrackingWarnings():216:216 -> a
+    81:81:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):83 -> a
+    82:84:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):139:141 -> a
+    85:86:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
+    85:86:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):141 -> a
+    87:96:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):144:153 -> a
+    97:98:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
+    97:98:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):153 -> a
+    99:100:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):154:155 -> a
+    101:101:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    101:101:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
+    102:102:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157:157 -> a
+    103:103:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    103:103:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
+    104:110:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):181:187 -> a
+    104:110:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):160 -> a
+    111:117:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):163:169 -> a
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.tf:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set precedingDesugarings -> c
@@ -56948,53 +56471,53 @@
     1:1:void <clinit>():64:64 -> <clinit>
     1:10:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):80:89 -> <init>
     1:4:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):103:106 -> a
-    5:7:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):326:328 -> a
+    5:7:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):327:329 -> a
     5:7:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
-    8:11:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):345:348 -> a
-    8:11:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):330 -> a
+    8:11:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):346:349 -> a
+    8:11:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):331 -> a
     8:11:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
     12:15:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.getMethodForDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):137:140 -> a
-    12:15:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):351 -> a
-    12:15:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):330 -> a
+    12:15:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):352 -> a
+    12:15:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):331 -> a
     12:15:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
     16:16:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):626:626 -> a
     16:16:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.getMethodForDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):140 -> a
-    16:16:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):351 -> a
-    16:16:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):330 -> a
+    16:16:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):352 -> a
+    16:16:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):331 -> a
     16:16:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
     17:17:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.getMethodForDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):144:144 -> a
-    17:17:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):351 -> a
-    17:17:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):330 -> a
+    17:17:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):352 -> a
+    17:17:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):331 -> a
     17:17:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
     18:20:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.getMethodForDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):142:144 -> a
-    18:20:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):351 -> a
-    18:20:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):330 -> a
+    18:20:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):352 -> a
+    18:20:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):331 -> a
     18:20:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
-    21:22:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):352:353 -> a
-    21:22:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):330 -> a
+    21:22:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):353:354 -> a
+    21:22:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):331 -> a
     21:22:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
-    23:24:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):332:333 -> a
+    23:24:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):333:334 -> a
     23:24:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
-    25:25:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):363:363 -> a
-    25:25:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):336 -> a
+    25:25:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):364:364 -> a
+    25:25:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):337 -> a
     25:25:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
-    26:29:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeReturnConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod):293:296 -> a
-    26:29:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):364 -> a
-    26:29:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):336 -> a
+    26:29:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeReturnConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod):294:297 -> a
+    26:29:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):365 -> a
+    26:29:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):337 -> a
     26:29:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
-    30:37:com.android.tools.r8.graph.DexMethod[] com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversions(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod):306:313 -> a
-    30:37:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):366 -> a
-    30:37:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):336 -> a
+    30:37:com.android.tools.r8.graph.DexMethod[] com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversions(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod):307:314 -> a
+    30:37:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):367 -> a
+    30:37:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):337 -> a
     30:37:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
-    38:43:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):374:379 -> a
-    38:43:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):336 -> a
+    38:43:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):375:380 -> a
+    38:43:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):337 -> a
     38:43:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
-    44:56:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.addInlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList):491:503 -> a
-    44:56:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):387 -> a
-    44:56:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):336 -> a
+    44:56:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.addInlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList):492:504 -> a
+    44:56:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):388 -> a
+    44:56:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):337 -> a
     44:56:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
-    57:62:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):390:395 -> a
-    57:62:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):336 -> a
+    57:62:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):391:396 -> a
+    57:62:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):337 -> a
     57:62:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
     63:66:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):117:120 -> a
     67:68:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.isAPIConversionSyntheticType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,com.android.tools.r8.graph.AppView):128:129 -> a
@@ -57038,107 +56561,99 @@
     122:132:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String,com.android.tools.r8.graph.AppView):219:229 -> a
     133:133:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):235:235 -> a
     134:134:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":375,"2":376,"3":377}}
-    375:375:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):235:235 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":376,"2":377,"3":378}}
     376:376:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):235:235 -> a
     377:377:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):235:235 -> a
+    378:378:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):235:235 -> a
     371:371:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):237:237 -> a
-    372:374:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):236:238 -> a
-    378:391:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):268:281 -> a
-    392:397:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):279:284 -> a
-    398:407:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.invalidType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):247:256 -> a
-    398:407:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):285 -> a
-    408:408:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):283:283 -> a
-    409:414:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):410:415 -> a
-    415:422:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):414:421 -> a
-    423:439:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):419:435 -> a
-    440:451:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):434:445 -> a
-    452:452:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
-    452:452:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):445 -> a
-    453:454:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):445:446 -> a
-    455:456:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):750:751 -> a
-    455:456:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):446 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    457:457:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):447:447 -> a
-    458:458:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
-    458:458:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):446 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    459:459:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":468,"2":469,"3":470,"4":471,"5":472}}
-    468:468:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
-    468:468:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):446 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    372:375:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):236:239 -> a
+    379:392:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):269:282 -> a
+    393:398:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):280:285 -> a
+    399:408:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.invalidType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):248:257 -> a
+    399:408:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):286 -> a
+    409:409:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):284:284 -> a
+    410:415:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):411:416 -> a
+    416:423:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):415:422 -> a
+    424:440:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):420:436 -> a
+    441:452:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):435:446 -> a
+    453:453:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
+    453:453:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):446 -> a
+    454:455:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):446:447 -> a
+    456:457:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):750:751 -> a
+    456:457:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):447 -> a
+    458:458:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):448:448 -> a
+    459:459:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
+    459:459:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):447 -> a
+    460:460:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":469,"2":470,"3":471,"4":472,"5":473}}
     469:469:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
-    469:469:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):446 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    469:469:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):447 -> a
     470:470:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
-    470:470:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):446 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    470:470:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):447 -> a
     471:471:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
-    471:471:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):446 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    471:471:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):447 -> a
     472:472:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
-    472:472:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):446 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    460:460:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
-    460:460:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):446 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    461:461:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):449:449 -> a
-    462:462:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
-    462:462:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):449 -> a
-    463:467:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):449:453 -> a
-    473:477:void lambda$addOutlineParameterConversionInstructions$2(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.synthesis.SyntheticMethodBuilder):425:429 -> a
-    478:478:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431:431 -> a
-    479:492:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):458:471 -> a
-    479:492:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
-    493:493:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):760:760 -> a
-    493:493:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):471 -> a
-    493:493:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
-    494:494:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):775:775 -> a
-    494:494:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):761 -> a
-    494:494:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):471 -> a
-    494:494:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
-    495:496:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:766 -> a
-    495:496:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):471 -> a
-    495:496:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
-    497:497:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472:472 -> a
-    497:497:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
-    498:498:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
-    498:498:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):471 -> a
-    498:498:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
-    499:499:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":513,"2":514,"3":515,"4":516,"5":517}}
-    513:513:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
-    513:513:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):471 -> a
-    513:513:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
+    472:472:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):447 -> a
+    473:473:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
+    473:473:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):447 -> a
+    461:461:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):753:753 -> a
+    461:461:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):447 -> a
+    462:462:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):450:450 -> a
+    463:463:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
+    463:463:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):450 -> a
+    464:468:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):450:454 -> a
+    474:478:void lambda$addOutlineParameterConversionInstructions$2(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.synthesis.SyntheticMethodBuilder):426:430 -> a
+    479:479:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432:432 -> a
+    480:493:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):459:472 -> a
+    480:493:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
+    494:494:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):760:760 -> a
+    494:494:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
+    494:494:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
+    495:495:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):775:775 -> a
+    495:495:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):761 -> a
+    495:495:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
+    495:495:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
+    496:497:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:766 -> a
+    496:497:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
+    496:497:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
+    498:498:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):473:473 -> a
+    498:498:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
+    499:499:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
+    499:499:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
+    499:499:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
+    500:500:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":514,"2":515,"3":516,"4":517,"5":518}}
     514:514:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
-    514:514:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):471 -> a
-    514:514:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
+    514:514:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
+    514:514:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
     515:515:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
-    515:515:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):471 -> a
-    515:515:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
+    515:515:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
+    515:515:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
     516:516:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
-    516:516:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):471 -> a
-    516:516:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
+    516:516:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
+    516:516:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
     517:517:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
-    517:517:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):471 -> a
-    517:517:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
-    500:500:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
-    500:500:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):471 -> a
-    500:500:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
-    501:512:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):474:485 -> a
-    501:512:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):431 -> a
-    518:522:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):512:516 -> a
-    523:526:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeReturnConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod):293:296 -> a
-    523:526:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):517 -> a
-    527:534:com.android.tools.r8.graph.DexMethod[] com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversions(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod):306:313 -> a
-    527:534:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):519 -> a
-    535:540:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):520:525 -> a
-    541:561:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):523:543 -> a
-    562:566:void lambda$createOutlinedAPIConversion$4(com.android.tools.r8.graph.DexProto,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.synthesis.SyntheticMethodBuilder):529:533 -> a
-    567:573:com.android.tools.r8.graph.Code lambda$createOutlinedAPIConversion$3(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):535:541 -> a
+    517:517:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
+    517:517:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
+    518:518:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
+    518:518:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
+    518:518:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
+    501:501:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763:763 -> a
+    501:501:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
+    501:501:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
+    502:513:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):475:486 -> a
+    502:513:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
+    519:523:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):513:517 -> a
+    524:527:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeReturnConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod):294:297 -> a
+    524:527:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):518 -> a
+    528:535:com.android.tools.r8.graph.DexMethod[] com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversions(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod):307:314 -> a
+    528:535:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):520 -> a
+    536:541:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):521:526 -> a
+    542:562:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):524:544 -> a
+    563:567:void lambda$createOutlinedAPIConversion$4(com.android.tools.r8.graph.DexProto,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.synthesis.SyntheticMethodBuilder):530:534 -> a
+    568:574:com.android.tools.r8.graph.Code lambda$createOutlinedAPIConversion$3(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):536:542 -> a
     1:1:void generateTrackingWarnings():214:214 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer -> com.android.tools.r8.internal.Mf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer -> com.android.tools.r8.internal.uf:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -57159,9 +56674,8 @@
     87:93:com.android.tools.r8.graph.DexMethod getExistingProgramEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):147:153 -> a
     94:96:com.android.tools.r8.graph.DexMethod getExistingProgramEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):152:154 -> a
     97:101:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):160:164 -> a
-    102:102:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    102:102:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     102:102:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):164 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     103:109:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):164:170 -> a
     110:110:void lambda$ensureProgramEnumConversionClass$16(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):174:174 -> a
     111:123:com.android.tools.r8.graph.DexClass ensureEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):180:192 -> a
@@ -57177,259 +56691,236 @@
     1:1:void lambda$buildEnumMethodsWithoutCode$15(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):129:129 -> c
     com.android.tools.r8.graph.Code lambda$buildEnumMethodsWithoutCode$8(com.android.tools.r8.graph.DexMethod) -> d
     1:1:void lambda$buildEnumMethodsWithoutCode$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):120:120 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.Xf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.Ff:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer enumConverter -> d
     java.util.concurrent.ConcurrentHashMap allImplementedMethodsCache -> c
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():98:98 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):106:106 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView):102:109 -> <init>
+    1:1:void <clinit>():94:94 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):102:102 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView):98:105 -> <init>
     com.android.tools.r8.graph.Code lambda$buildConversionMethod$7(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod) -> a
     void lambda$getExistingProgramConversionMethod$5(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder) -> a
-    1:4:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):122:125 -> a
-    5:5:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.canConvert(com.android.tools.r8.graph.DexType):191:191 -> a
-    5:5:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):128 -> a
-    6:6:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.canGenerateWrapper(com.android.tools.r8.graph.DexType):219:219 -> a
-    6:6:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.canConvert(com.android.tools.r8.graph.DexType):192 -> a
-    6:6:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):128 -> a
-    7:11:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):196:200 -> a
-    7:11:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):131 -> a
+    1:4:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):118:121 -> a
+    5:5:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.canConvert(com.android.tools.r8.graph.DexType):187:187 -> a
+    5:5:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):124 -> a
+    6:6:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.canGenerateWrapper(com.android.tools.r8.graph.DexType):215:215 -> a
+    6:6:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.canConvert(com.android.tools.r8.graph.DexType):188 -> a
+    6:6:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):124 -> a
+    7:11:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):192:196 -> a
+    7:11:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):127 -> a
     12:12:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":28,"2":29,"3":30}}
-    28:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:200 -> a
-    28:28:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):131 -> a
-    29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:200 -> a
-    29:29:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):131 -> a
-    30:30:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:200 -> a
-    30:30:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):131 -> a
-    13:24:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:211 -> a
-    13:24:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):131 -> a
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    25:25:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):211 -> a
-    25:25:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):131 -> a
-    26:26:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):214:214 -> a
-    26:26:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):131 -> a
-    27:27:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):212:212 -> a
-    27:27:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):131 -> a
-    31:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):181:185 -> a
-    31:35:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):140 -> a
-    36:36:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):184:184 -> a
-    36:36:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):140 -> a
-    37:41:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):144:148 -> a
-    42:42:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.canGenerateWrapper(com.android.tools.r8.graph.DexType):219:219 -> a
-    42:42:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):148 -> a
-    43:50:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):148:155 -> a
-    51:55:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):181:185 -> a
-    51:55:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):161 -> a
-    56:56:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):184:184 -> a
-    56:56:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):161 -> a
-    57:59:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165:167 -> a
-    60:60:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291:291 -> a
-    60:60:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169 -> a
-    61:61:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    61:61:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291 -> a
-    61:61:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169 -> a
-    62:63:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291:292 -> a
-    62:63:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169 -> a
-    64:64:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):302:302 -> a
-    64:64:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):292 -> a
-    64:64:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169 -> a
-    65:65:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):293:293 -> a
-    65:65:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169 -> a
-    66:66:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):302:302 -> a
-    66:66:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):293 -> a
-    66:66:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169 -> a
-    67:67:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):318:318 -> a
-    67:67:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):294 -> a
-    67:67:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169 -> a
-    68:68:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):318:318 -> a
-    68:68:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):295 -> a
-    68:68:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169 -> a
-    69:71:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):296:298 -> a
-    69:71:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169 -> a
-    72:74:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):172:174 -> a
-    75:81:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):223:229 -> a
+    28:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):196:196 -> a
+    28:28:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):127 -> a
+    29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):196:196 -> a
+    29:29:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):127 -> a
+    30:30:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):196:196 -> a
+    30:30:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):127 -> a
+    13:24:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):196:207 -> a
+    13:24:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):127 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    25:25:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):207 -> a
+    25:25:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):127 -> a
+    26:26:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):210:210 -> a
+    26:26:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):127 -> a
+    27:27:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):208:208 -> a
+    27:27:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):127 -> a
+    31:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):177:181 -> a
+    31:35:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):136 -> a
+    36:36:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):180:180 -> a
+    36:36:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):136 -> a
+    37:41:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):140:144 -> a
+    42:42:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.canGenerateWrapper(com.android.tools.r8.graph.DexType):215:215 -> a
+    42:42:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):144 -> a
+    43:50:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):144:151 -> a
+    51:55:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):177:181 -> a
+    51:55:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):157 -> a
+    56:56:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):180:180 -> a
+    56:56:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):157 -> a
+    57:59:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):161:163 -> a
+    60:60:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):287:287 -> a
+    60:60:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165 -> a
+    61:61:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    61:61:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):287 -> a
+    61:61:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165 -> a
+    62:63:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):287:288 -> a
+    62:63:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165 -> a
+    64:64:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):298:298 -> a
+    64:64:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):288 -> a
+    64:64:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165 -> a
+    65:65:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):289:289 -> a
+    65:65:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165 -> a
+    66:66:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):298:298 -> a
+    66:66:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):289 -> a
+    66:66:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165 -> a
+    67:67:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):314:314 -> a
+    67:67:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):290 -> a
+    67:67:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165 -> a
+    68:68:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):314:314 -> a
+    68:68:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291 -> a
+    68:68:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165 -> a
+    69:71:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):292:294 -> a
+    69:71:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165 -> a
+    72:74:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):168:170 -> a
+    75:81:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):219:225 -> a
     82:82:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    82:82:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):229 -> a
-    83:83:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):229:229 -> a
-    84:84:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    84:84:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):229 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    85:86:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):229:230 -> a
-    87:88:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):259:260 -> a
-    89:89:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291:291 -> a
-    89:89:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):261 -> a
-    90:90:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    90:90:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291 -> a
-    90:90:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):261 -> a
-    91:92:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291:292 -> a
-    91:92:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):261 -> a
-    93:93:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):302:302 -> a
-    93:93:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):292 -> a
-    93:93:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):261 -> a
-    94:94:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):293:293 -> a
-    94:94:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):261 -> a
-    95:95:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):302:302 -> a
-    95:95:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):293 -> a
-    95:95:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):261 -> a
-    96:96:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):318:318 -> a
-    96:96:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):294 -> a
-    96:96:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):261 -> a
-    97:97:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):318:318 -> a
-    97:97:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):295 -> a
-    97:97:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):261 -> a
-    98:100:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):296:298 -> a
-    98:100:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):261 -> a
-    101:103:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):263:265 -> a
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):235:235 -> a
-    104:104:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):266 -> a
-    105:123:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):267:285 -> a
-    124:124:java.util.Collection lambda$ensureWrappers$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):274:274 -> a
-    125:127:com.android.tools.r8.graph.DexMethod getConversion(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):306:308 -> a
-    128:130:com.android.tools.r8.graph.DexMethod getConversion(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):307:309 -> a
-    131:132:com.android.tools.r8.graph.DexEncodedField getWrapperUniqueEncodedField(com.android.tools.r8.graph.DexClass):313:314 -> a
-    133:133:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):318:318 -> a
-    133:133:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):370 -> a
-    134:134:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):318:318 -> a
-    134:134:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):371 -> a
-    135:138:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):372:375 -> a
-    139:139:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):553:553 -> a
-    139:139:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):375 -> a
-    140:140:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):545:545 -> a
-    140:140:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):375 -> a
-    141:141:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):327:327 -> a
-    142:142:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    142:142:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):327 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    143:147:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):327:331 -> a
-    148:148:void lambda$ensureProgramWrapper$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):335:335 -> a
-    149:152:com.android.tools.r8.graph.DexClasspathClass ensureClasspathWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,java.util.function.Function):348:351 -> a
-    153:153:void lambda$ensureClasspathWrapper$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.Function,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):358:358 -> a
-    154:160:void lambda$ensureClasspathWrapper$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.Function,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):357:363 -> a
-    161:163:void lambda$ensureClasspathWrapper$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):361:361 -> a
-    164:165:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):396:397 -> a
-    164:165:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):386 -> a
-    166:166:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":181,"2":182,"3":183}}
-    181:181:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):397:397 -> a
-    181:181:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):386 -> a
-    182:182:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):397:397 -> a
-    182:182:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):386 -> a
-    183:183:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):397:397 -> a
-    183:183:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):386 -> a
-    167:179:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):397:409 -> a
-    167:179:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):386 -> a
-    180:180:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):383:383 -> a
-    184:188:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):414:418 -> a
-    189:194:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):417:422 -> a
-    195:200:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):430:435 -> a
-    201:201:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):648:648 -> a
-    201:201:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):652 -> a
-    201:201:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):435 -> a
-    202:205:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):655:658 -> a
-    202:205:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):435 -> a
-    206:206:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():475:475 -> a
-    206:206:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):660 -> a
-    206:206:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):435 -> a
-    207:207:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):661:661 -> a
-    207:207:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):435 -> a
-    208:211:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):437:440 -> a
-    212:216:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):446:450 -> a
-    217:222:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):449:454 -> a
-    223:224:com.android.tools.r8.graph.Code lambda$buildWrapperConstructor$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexMethod):456:457 -> a
-    225:225:java.lang.String lambda$reportFinalMethodsInWrapper$10(com.android.tools.r8.graph.DexMethod):568:568 -> a
-    226:226:java.lang.String[] lambda$reportFinalMethodsInWrapper$11(int):568:568 -> a
-    227:229:void reportFinalMethodsInWrapper(java.util.Set):568:570 -> a
-    230:230:void reportFinalMethodsInWrapper(java.util.Set):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":809,"2":810,"3":811}}
-    809:809:void reportFinalMethodsInWrapper(java.util.Set):570:570 -> a
-    810:810:void reportFinalMethodsInWrapper(java.util.Set):570:570 -> a
-    811:811:void reportFinalMethodsInWrapper(java.util.Set):570:570 -> a
-    805:807:void reportFinalMethodsInWrapper(java.util.Set):575:577 -> a
-    808:808:void reportFinalMethodsInWrapper(java.util.Set):572:572 -> a
-    812:828:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.Code):583:599 -> a
-    829:831:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.Code):598:600 -> a
-    832:832:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):604:604 -> a
-    833:857:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):609:633 -> a
-    833:857:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):605 -> a
-    858:858:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    858:858:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):633 -> a
-    858:858:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):605 -> a
-    859:867:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):633:641 -> a
-    859:867:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):605 -> a
-    868:879:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):670:681 -> a
-    880:883:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):695:698 -> a
-    880:883:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
-    884:884:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    884:884:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):698 -> a
-    884:884:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
-    885:887:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):698:700 -> a
-    885:887:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
-    888:888:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):235:235 -> a
-    888:888:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):702 -> a
-    888:888:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
-    889:891:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):701:703 -> a
-    889:891:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
-    892:892:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):235:235 -> a
-    892:892:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):707 -> a
-    892:892:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
-    893:901:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):704:712 -> a
-    893:901:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
-    902:902:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):686:686 -> a
-    903:904:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):717:718 -> a
-    903:904:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):687 -> a
-    905:905:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):302:302 -> a
-    905:905:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):718 -> a
-    905:905:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):687 -> a
-    906:906:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):720:720 -> a
-    906:906:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):687 -> a
-    907:909:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):719:721 -> a
-    907:909:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):687 -> a
-    910:910:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):302:302 -> a
-    910:910:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):722 -> a
-    910:910:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):687 -> a
-    911:911:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):725:725 -> a
-    911:911:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):687 -> a
-    912:912:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):724:724 -> a
-    912:912:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):687 -> a
-    913:913:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):723:723 -> a
-    913:913:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):687 -> a
-    1:2:boolean isSyntheticWrapper(com.android.tools.r8.graph.DexType):113:114 -> b
-    3:3:java.util.Collection lambda$ensureWrappers$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):282:282 -> b
-    4:4:boolean isInvalidWrapper(com.android.tools.r8.graph.DexClass):391:391 -> b
-    5:5:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> b
-    5:5:boolean isInvalidWrapper(com.android.tools.r8.graph.DexClass):391 -> b
-    6:6:void lambda$buildWrapper$8(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):440:440 -> b
-    1:16:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):513:528 -> c
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> c
-    17:17:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):528 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:22:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):528:532 -> c
-    23:43:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):531:551 -> c
-    44:49:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):558:563 -> c
-    44:49:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):553 -> c
-    1:21:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):462:482 -> d
-    22:35:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):478:491 -> d
-    36:54:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):488:506 -> d
-    55:60:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):558:563 -> d
-    55:60:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):508 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.Wf:
+    82:82:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):225 -> a
+    83:83:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):225:225 -> a
+    84:84:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    84:84:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):225 -> a
+    85:86:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):225:226 -> a
+    87:88:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):255:256 -> a
+    89:89:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):287:287 -> a
+    89:89:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):257 -> a
+    90:90:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    90:90:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):287 -> a
+    90:90:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):257 -> a
+    91:92:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):287:288 -> a
+    91:92:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):257 -> a
+    93:93:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):298:298 -> a
+    93:93:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):288 -> a
+    93:93:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):257 -> a
+    94:94:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):289:289 -> a
+    94:94:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):257 -> a
+    95:95:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):298:298 -> a
+    95:95:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):289 -> a
+    95:95:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):257 -> a
+    96:96:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):314:314 -> a
+    96:96:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):290 -> a
+    96:96:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):257 -> a
+    97:97:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):314:314 -> a
+    97:97:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291 -> a
+    97:97:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):257 -> a
+    98:100:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):292:294 -> a
+    98:100:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):257 -> a
+    101:103:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):259:261 -> a
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):231:231 -> a
+    104:104:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):262 -> a
+    105:123:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):263:281 -> a
+    124:124:java.util.Collection lambda$ensureWrappers$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):270:270 -> a
+    125:127:com.android.tools.r8.graph.DexMethod getConversion(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):302:304 -> a
+    128:130:com.android.tools.r8.graph.DexMethod getConversion(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):303:305 -> a
+    131:132:com.android.tools.r8.graph.DexEncodedField getWrapperUniqueEncodedField(com.android.tools.r8.graph.DexClass):309:310 -> a
+    133:133:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):314:314 -> a
+    133:133:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):366 -> a
+    134:134:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):314:314 -> a
+    134:134:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):367 -> a
+    135:138:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):368:371 -> a
+    139:139:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):582:582 -> a
+    139:139:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):371 -> a
+    140:140:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):574:574 -> a
+    140:140:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):371 -> a
+    141:141:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):323:323 -> a
+    142:142:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    142:142:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):323 -> a
+    143:147:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):323:327 -> a
+    148:148:void lambda$ensureProgramWrapper$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):331:331 -> a
+    149:152:com.android.tools.r8.graph.DexClasspathClass ensureClasspathWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,java.util.function.Function):344:347 -> a
+    153:153:void lambda$ensureClasspathWrapper$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.Function,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):354:354 -> a
+    154:160:void lambda$ensureClasspathWrapper$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.Function,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):353:359 -> a
+    161:163:void lambda$ensureClasspathWrapper$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):357:357 -> a
+    164:167:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):388:391 -> a
+    164:167:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):382 -> a
+    168:168:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):379:379 -> a
+    169:173:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):396:400 -> a
+    174:179:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):399:404 -> a
+    180:185:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):412:417 -> a
+    186:186:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):600:600 -> a
+    186:186:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):604 -> a
+    186:186:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):417 -> a
+    187:190:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):607:610 -> a
+    187:190:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):417 -> a
+    191:191:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():498:498 -> a
+    191:191:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):612 -> a
+    191:191:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):417 -> a
+    192:192:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):613:613 -> a
+    192:192:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):417 -> a
+    193:196:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):419:422 -> a
+    197:201:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):428:432 -> a
+    202:207:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):431:436 -> a
+    208:209:com.android.tools.r8.graph.Code lambda$buildWrapperConstructor$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexMethod):438:439 -> a
+    210:217:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.Code):523:530 -> a
+    218:219:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.Code):529:530 -> a
+    220:220:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.androidapi.AndroidApiLevelCompute.computeApiLevelForDefinition(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.androidapi.ComputedApiLevel):44:44 -> a
+    220:220:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.Code):530 -> a
+    221:227:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.Code):534:540 -> a
+    228:240:java.lang.Iterable allImplementedMethods(com.android.tools.r8.graph.DexClass):544:556 -> a
+    241:241:java.util.List lambda$allImplementedMethods$10(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):555:555 -> a
+    242:242:com.android.tools.r8.graph.DexMethod lambda$allImplementedMethods$11(com.android.tools.r8.graph.DexEncodedMethod):556:556 -> a
+    243:254:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):622:633 -> a
+    255:258:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):647:650 -> a
+    255:258:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):634 -> a
+    259:259:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    259:259:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):650 -> a
+    259:259:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):634 -> a
+    260:262:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):650:652 -> a
+    260:262:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):634 -> a
+    263:263:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):231:231 -> a
+    263:263:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):654 -> a
+    263:263:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):634 -> a
+    264:266:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):653:655 -> a
+    264:266:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):634 -> a
+    267:267:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):231:231 -> a
+    267:267:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):659 -> a
+    267:267:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):634 -> a
+    268:276:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):656:664 -> a
+    268:276:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):634 -> a
+    277:277:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):638:638 -> a
+    278:279:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):669:670 -> a
+    278:279:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):639 -> a
+    280:280:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):298:298 -> a
+    280:280:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):670 -> a
+    280:280:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):639 -> a
+    281:281:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):672:672 -> a
+    281:281:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):639 -> a
+    282:284:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):671:673 -> a
+    282:284:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):639 -> a
+    285:285:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):298:298 -> a
+    285:285:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):674 -> a
+    285:285:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):639 -> a
+    286:286:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):677:677 -> a
+    286:286:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):639 -> a
+    287:287:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):676:676 -> a
+    287:287:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):639 -> a
+    288:288:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):675:675 -> a
+    288:288:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):639 -> a
+    1:2:boolean isSyntheticWrapper(com.android.tools.r8.graph.DexType):109:110 -> b
+    3:3:java.util.Collection lambda$ensureWrappers$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):278:278 -> b
+    4:4:void lambda$buildWrapper$8(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):422:422 -> b
+    5:29:java.util.List internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):560:584 -> b
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> b
+    30:30:java.util.List internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):584 -> b
+    31:42:java.util.List internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):584:595 -> b
+    43:43:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> b
+    43:43:java.util.List internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):595 -> b
+    44:44:java.util.List internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):595:595 -> b
+    1:15:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):487:501 -> c
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> c
+    16:16:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):501 -> c
+    17:21:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):501:505 -> c
+    22:34:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):504:516 -> c
+    1:20:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):444:463 -> d
+    21:42:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):459:480 -> d
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.Ef:
     com.android.tools.r8.graph.DexMethod vivifiedConversion -> b
     com.android.tools.r8.graph.DexMethod conversion -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):243:245 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod getConversion():249:249 -> a
-    1:1:com.android.tools.r8.graph.DexMethod getVivifiedConversion():253:253 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer -> com.android.tools.r8.internal.Yf:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):239:241 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod getConversion():245:245 -> a
+    1:1:com.android.tools.r8.graph.DexMethod getVivifiedConversion():249:249 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer -> com.android.tools.r8.internal.Gf:
     void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> b
     void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.dn:
-    com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags rewritingFlags -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.Em:
+    com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags topLevelFlags -> b
+    com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags rewritingFlags -> c
     boolean libraryCompilation -> a
     1:9:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,boolean,com.android.tools.r8.graph.DexItemFactory):57:65 -> <init>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags getRewritingFlags():93:93 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.en:
+    1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():85:85 -> b
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags getTopLevelFlags():89:89 -> c
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.Fm:
     com.android.tools.r8.com.google.gson.JsonObject jsonConfig -> d
     com.android.tools.r8.origin.Origin origin -> c
     boolean $assertionsDisabled -> e
@@ -57460,7 +56951,7 @@
     1:1:com.android.tools.r8.com.google.gson.JsonObject getJsonConfig():74:74 -> b
     1:2:com.android.tools.r8.origin.Origin getOrigin():78:79 -> c
     1:1:com.android.tools.r8.utils.Reporter reporter():70:70 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags -> com.android.tools.r8.internal.gn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags -> com.android.tools.r8.internal.Hm:
     java.util.Map rewritePrefix -> a
     java.util.Set dontRetargetLibMember -> g
     java.util.Map emulateLibraryInterface -> b
@@ -57482,7 +56973,7 @@
     1:1:java.util.Map getRetargetCoreLibMember():104:104 -> f
     1:1:java.util.Map getRewritePrefix():96:96 -> g
     1:1:java.util.Set getWrapperConversions():124:124 -> h
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder -> com.android.tools.r8.internal.fn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder -> com.android.tools.r8.internal.Gm:
     java.util.Set dontRewriteInvocation -> i
     java.util.Map rewritePrefix -> d
     java.util.Set dontRetargetLibMember -> j
@@ -57531,12 +57022,13 @@
     4:14:com.android.tools.r8.graph.DexMethod parseMethod(java.lang.String):311:321 -> d
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder putRewritePrefix(java.lang.String,java.lang.String):204:204 -> e
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):325:325 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags -> com.android.tools.r8.internal.jn:
-    java.util.List extraKeepRules -> e
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags -> com.android.tools.r8.internal.Om:
+    java.util.List extraKeepRules -> f
+    boolean supportAllCallbacksFromLibrary -> e
     java.lang.String identifier -> c
     java.lang.String synthesizedLibraryClassesPackagePrefix -> b
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
-    boolean supportAllCallbacksFromLibrary -> d
+    java.lang.String jsonSource -> d
     1:7:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String,java.lang.String,boolean,java.util.List):33:39 -> <init>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder builder():53:53 -> a
     1:1:java.util.List getExtraKeepRules():77:77 -> b
@@ -57544,7 +57036,7 @@
     1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationAPILevel():57:57 -> d
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():61:61 -> e
     1:1:boolean supportAllCallbacksFromLibrary():73:73 -> f
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder -> com.android.tools.r8.internal.in:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder -> com.android.tools.r8.internal.Nm:
     java.lang.Boolean supportAllCallbacksFromLibrary -> e
     java.util.List extraKeepRules -> f
     boolean $assertionsDisabled -> g
@@ -57561,7 +57053,7 @@
     5:12:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags build():122:129 -> a
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setJsonSource(java.lang.String):107:107 -> b
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setSynthesizedLibraryClassesPackagePrefix(java.lang.String):97:97 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.dG:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.aF:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap commonFlags -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap libraryFlags -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap programFlags -> d
@@ -57574,7 +57066,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap getProgramFlags():49:49 -> e
     1:1:java.util.Map getProgramFlagsForTesting():61:61 -> f
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags getTopLevelFlags():37:37 -> g
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter -> com.android.tools.r8.internal.fG:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter -> com.android.tools.r8.internal.cF:
     1:1:void <init>():27:27 -> <init>
     1:1:void export(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer):31:31 -> a
     2:6:void com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter.internalExport(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer):37:41 -> a
@@ -57617,9 +57109,9 @@
     93:93:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():178:178 -> a
     93:93:java.util.Set setToString(java.util.Set):97 -> a
     94:94:java.util.Set setToString(java.util.Set):98:98 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter$1 -> com.android.tools.r8.internal.eG:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter$1 -> com.android.tools.r8.internal.bF:
     1:1:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter):57:57 -> <init>
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.gG:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.dF:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):20:20 -> <init>
     void lambda$parseMultiLevelConfiguration$0(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder) -> a
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):39:49 -> a
@@ -57627,7 +57119,7 @@
     12:56:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):50 -> a
     57:57:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):51:51 -> a
     1:10:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):26:35 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.sB:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.BA:
     com.android.tools.r8.ir.desugar.PrefixRewritingMapper prefixRewritingMapper -> d
     com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags rewritingFlags -> c
     boolean libraryCompilation -> a
@@ -57643,21 +57135,12 @@
     18:26:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags.empty():61:69 -> a
     18:26:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification empty():42 -> a
     27:27:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification empty():42:42 -> a
-    28:28:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification.getSynthesizedLibraryClassesPackagePrefix():96:96 -> a
-    28:28:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):104 -> a
-    29:31:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):104:106 -> a
-    32:32:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":140,"2":141,"3":142}}
-    140:140:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):107:107 -> a
-    141:141:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):107:107 -> a
-    142:142:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):107:107 -> a
-    139:139:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):107:107 -> a
-    143:143:boolean isSupported(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):127:127 -> a
-    144:144:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):147:147 -> a
-    145:154:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification.retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132:141 -> a
-    145:154:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):147 -> a
-    155:155:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification.retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):138:138 -> a
-    155:155:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):147 -> a
+    28:28:boolean isSupported(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):127:127 -> a
+    29:29:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):147:147 -> a
+    30:39:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification.retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132:141 -> a
+    30:39:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):147 -> a
+    40:40:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification.retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):138:138 -> a
+    40:40:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):147 -> a
     1:1:java.util.Map getBackportCoreLibraryMember():155:155 -> b
     1:1:java.util.Map getCustomConversions():159:159 -> c
     1:1:java.util.Set getDontRetargetLibMember():171:171 -> d
@@ -57680,10 +57163,10 @@
     boolean isEmptyConfiguration() -> s
     1:1:boolean isLibraryCompilation():92:92 -> t
     1:1:boolean supportAllCallbacksFromLibrary():80:80 -> u
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.rB:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.AA:
     1:1:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,boolean,com.android.tools.r8.graph.DexItemFactory):42:42 -> <init>
     boolean isSupported(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.tB:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.CA:
     com.android.tools.r8.com.google.gson.JsonObject jsonConfig -> f
     com.android.tools.r8.utils.SemanticVersion MIN_SUPPORTED_VERSION -> g
     com.android.tools.r8.origin.Origin origin -> e
@@ -57736,7 +57219,7 @@
     4:8:java.lang.String parseJson(com.android.tools.r8.StringResource):122:126 -> b
     1:2:com.android.tools.r8.origin.Origin getOrigin():85:86 -> c
     1:1:com.android.tools.r8.utils.Reporter reporter():77:77 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags -> com.android.tools.r8.internal.uB:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags -> com.android.tools.r8.internal.DA:
     java.util.Map rewritePrefix -> a
     java.util.Set dontRetargetLibMember -> g
     java.util.Map emulateLibraryInterface -> b
@@ -57759,7 +57242,7 @@
     1:1:java.util.Map getRetargetCoreLibMember():107:107 -> f
     1:1:java.util.Map getRewritePrefix():99:99 -> g
     1:1:java.util.Set getWrapperConversions():127:127 -> h
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder -> com.android.tools.r8.internal.uB$a:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder -> com.android.tools.r8.internal.DA$a:
     java.util.Map rewritePrefix -> d
     java.util.Set dontRetargetLibMember -> j
     com.android.tools.r8.origin.Origin origin -> c
@@ -57823,7 +57306,7 @@
     14:14:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):240 -> d
     15:15:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):290:290 -> d
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putRewritePrefix(java.lang.String,java.lang.String):202:202 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags -> com.android.tools.r8.internal.wB:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags -> com.android.tools.r8.internal.FA:
     java.util.List extraKeepRules -> f
     boolean supportAllCallbacksFromLibrary -> e
     java.lang.String identifier -> c
@@ -57838,7 +57321,7 @@
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():74:74 -> e
     1:1:boolean supportAllCallbacksFromLibrary():86:86 -> f
     1:7:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags testing():56:62 -> g
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder -> com.android.tools.r8.internal.wB$a:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder -> com.android.tools.r8.internal.FA$a:
     java.util.List extraKeepRules -> f
     boolean supportAllCallbacksFromLibrary -> e
     java.lang.String identifier -> c
@@ -57854,7 +57337,7 @@
     5:5:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags build():136:136 -> a
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setJsonSource(java.lang.String):121:121 -> b
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setSynthesizedLibraryClassesPackagePrefix(java.lang.String):111:111 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.hG:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.eF:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap commonFlags -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap libraryFlags -> d
@@ -57866,12 +57349,12 @@
     1:1:com.android.tools.r8.origin.Origin getOrigin():32:32 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap getProgramFlags():48:48 -> d
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags getTopLevelFlags():36:36 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.iG:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.fF:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):20:20 -> <init>
     1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):39:51 -> a
     void lambda$parseMultiLevelConfiguration$0(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder) -> b
     1:10:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):26:35 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod -> com.android.tools.r8.internal.nf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod -> com.android.tools.r8.internal.Xe:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind holderKind -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):28:30 -> <init>
@@ -57880,39 +57363,67 @@
     1:1:com.android.tools.r8.graph.DexMethod getMethod():42:42 -> c
     1:1:com.android.tools.r8.graph.DexString getName():46:46 -> d
     1:1:com.android.tools.r8.graph.DexProto getProto():50:50 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor -> com.android.tools.r8.internal.Zh:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor -> com.android.tools.r8.internal.Jh:
     java.util.LinkedHashMap dispatchCases -> d
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod emulatedDispatchMethod -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod interfaceMethod -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod forwardingMethod -> c
-    1:5:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,java.util.LinkedHashMap):49:53 -> <init>
-    1:1:java.util.LinkedHashMap getDispatchCases():69:69 -> a
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getEmulatedDispatchMethod():61:61 -> b
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getForwardingMethod():65:65 -> c
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getInterfaceMethod():57:57 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification -> com.android.tools.r8.internal.vD:
+    1:5:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,java.util.LinkedHashMap):48:52 -> <init>
+    1:1:java.util.LinkedHashMap getDispatchCases():68:68 -> a
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getEmulatedDispatchMethod():60:60 -> b
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getForwardingMethod():64:64 -> c
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getInterfaceMethod():56:56 -> d
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor -> com.android.tools.r8.internal.Lh:
+    java.util.Map emulatedMethods -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexType,java.util.Map):16:18 -> <init>
+    1:1:java.util.Map getEmulatedMethods():26:26 -> a
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification -> com.android.tools.r8.internal.DC:
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags rewritingFlags -> a
-    1:3:void <init>(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags):14:16 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags getRewritingFlags():24:24 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags -> com.android.tools.r8.internal.xD:
-    java.util.Map staticRetarget -> a
-    java.util.Map nonEmulatedVirtualRetarget -> b
-    java.util.Map emulatedVirtualRetarget -> c
-    1:4:void <init>(java.util.Map,java.util.Map,java.util.Map):20:23 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder builder():14:14 -> a
-    1:1:java.util.Map getEmulatedVirtualRetarget():49:49 -> b
-    1:1:java.util.Map getNonEmulatedVirtualRetarget():45:45 -> c
-    1:1:java.util.Map getStaticRetarget():41:41 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder -> com.android.tools.r8.internal.wD:
-    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder emulatedVirtualRetarget -> c
-    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder nonEmulatedVirtualRetarget -> b
-    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder staticRetarget -> a
-    1:8:void <init>():54:61 -> <init>
-    1:1:void putNonEmulatedVirtualRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):68:68 -> a
-    2:2:void putEmulatedVirtualRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):72:72 -> a
-    3:6:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags build():76:79 -> a
-    1:1:void putStaticRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):64:64 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.Qf:
+    1:4:void <init>(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags):16:19 -> <init>
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags getRewritingFlags():31:31 -> a
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags -> com.android.tools.r8.internal.FC:
+    java.util.Map rewriteType -> a
+    java.util.Map rewriteDerivedTypeOnly -> b
+    java.util.Map staticRetarget -> c
+    java.util.Map nonEmulatedVirtualRetarget -> d
+    java.util.Map emulatedVirtualRetarget -> e
+    java.util.Map emulatedInterfaces -> f
+    java.util.Map wrappers -> g
+    1:8:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Map):35:42 -> <init>
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder builder():22:22 -> a
+    1:1:java.util.Map getEmulatedInterfaces():98:98 -> b
+    1:1:java.util.Map getEmulatedVirtualRetarget():94:94 -> c
+    1:1:java.util.Map getNonEmulatedVirtualRetarget():90:90 -> d
+    1:1:java.util.Map getRewriteDerivedTypeOnly():82:82 -> e
+    1:1:java.util.Map getRewriteType():78:78 -> f
+    1:1:java.util.Map getStaticRetarget():86:86 -> g
+    1:1:java.util.Map getWrappers():102:102 -> h
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder -> com.android.tools.r8.internal.EC:
+    java.util.Map rewriteType -> a
+    java.util.Map rewriteDerivedTypeOnly -> b
+    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder legacyBackport -> h
+    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder wrappers -> g
+    com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder dontRetarget -> i
+    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder emulatedInterfaces -> f
+    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder emulatedVirtualRetarget -> e
+    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder nonEmulatedVirtualRetarget -> d
+    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder staticRetarget -> c
+    boolean $assertionsDisabled -> k
+    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder customConversions -> j
+    1:1:void <clinit>():117:117 -> <clinit>
+    1:17:void <init>():119:135 -> <init>
+    1:1:void putNonEmulatedVirtualRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):152:152 -> a
+    2:2:void putEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):156:156 -> a
+    3:3:void putEmulatedVirtualRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):160:160 -> a
+    4:4:void addWrapper(com.android.tools.r8.graph.DexType,java.util.List):164:164 -> a
+    5:5:void putLegacyBackport(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):168:168 -> a
+    6:6:void addDontRetarget(com.android.tools.r8.graph.DexType):172:172 -> a
+    7:7:void putCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):176:176 -> a
+    8:18:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags build():180:190 -> a
+    1:1:void rewriteDerivedTypeOnly(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):144:144 -> b
+    2:2:void putStaticRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):148:148 -> b
+    1:3:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):138:140 -> c
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.yf:
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo retargetingInfo -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map staticRetarget -> d
@@ -57926,28 +57437,27 @@
     4:12:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):74:82 -> a
     13:13:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):81:81 -> a
     14:14:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):87:87 -> a
-    15:25:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNonStaticRetarget(com.android.tools.r8.graph.DexEncodedMethod):167:177 -> a
-    26:26:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNonStaticRetarget(com.android.tools.r8.graph.DexEncodedMethod):176:176 -> a
-    27:27:com.android.tools.r8.graph.DexMethod lambda$computeNonStaticRetarget$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):174:174 -> a
+    15:23:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNonStaticRetarget(com.android.tools.r8.graph.DexMethod):169:177 -> a
+    24:24:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNonStaticRetarget(com.android.tools.r8.graph.DexMethod):176:176 -> a
+    25:25:com.android.tools.r8.graph.DexMethod lambda$computeNonStaticRetarget$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):174:174 -> a
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo getRetargetingInfo():61:61 -> b
-    2:8:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):127:133 -> b
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMember.getContextType():36:36 -> b
-    9:9:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):134 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:33:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):134:157 -> b
-    34:34:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):626:626 -> b
-    34:34:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):158 -> b
-    35:35:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):160:160 -> b
-    36:41:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeSuperRetarget(com.android.tools.r8.graph.DexEncodedMethod):181:186 -> b
-    36:41:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):160 -> b
-    42:43:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.ensureForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):34:35 -> b
-    42:43:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeSuperRetarget(com.android.tools.r8.graph.DexEncodedMethod):186 -> b
-    42:43:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):160 -> b
-    44:48:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeSuperRetarget(com.android.tools.r8.graph.DexEncodedMethod):185:189 -> b
-    44:48:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):160 -> b
-    49:49:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeSuperRetarget(com.android.tools.r8.graph.DexEncodedMethod):188:188 -> b
-    49:49:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):160 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult -> com.android.tools.r8.internal.Pf:
+    2:9:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):127:134 -> b
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMember.getContextType():36:36 -> b
+    10:10:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):134 -> b
+    11:36:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):134:159 -> b
+    37:37:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):626:626 -> b
+    37:37:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):160 -> b
+    38:38:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):162:162 -> b
+    39:44:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeSuperRetarget(com.android.tools.r8.graph.DexEncodedMethod):181:186 -> b
+    39:44:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):162 -> b
+    45:46:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.ensureForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):34:35 -> b
+    45:46:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeSuperRetarget(com.android.tools.r8.graph.DexEncodedMethod):186 -> b
+    45:46:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):162 -> b
+    47:51:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeSuperRetarget(com.android.tools.r8.graph.DexEncodedMethod):185:189 -> b
+    47:51:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):162 -> b
+    52:52:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeSuperRetarget(com.android.tools.r8.graph.DexEncodedMethod):188:188 -> b
+    52:52:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):162 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult -> com.android.tools.r8.internal.xf:
     boolean hasNewInvokeTarget -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult NO_REWRITING -> c
     java.util.function.Function newInvokeTargetSupplier -> b
@@ -57963,20 +57473,19 @@
     6:6:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):120 -> a
     7:8:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):120:121 -> a
     com.android.tools.r8.graph.DexMethod lambda$static$0(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer) -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer -> com.android.tools.r8.internal.Rf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer -> com.android.tools.r8.internal.zf:
     java.util.Map emulatedDispatchMethods -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> a
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):30:33 -> <init>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):21:21 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):21 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:8:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):21:26 -> a
     9:9:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):23:23 -> a
     10:13:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):38:41 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterLibraryTypeSynthesizer -> com.android.tools.r8.internal.Sf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterLibraryTypeSynthesizer -> com.android.tools.r8.internal.Af:
     com.android.tools.r8.graph.DexApplication lambda$amendLibraryWithRetargetedMembers$0(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexApplication) -> a
     1:16:void amendLibraryWithRetargetedMembers(com.android.tools.r8.graph.AppView):56:71 -> a
     17:22:java.util.Map synthesizeLibraryClassesForRetargetedMembers(com.android.tools.r8.graph.AppView,java.util.Map):77:82 -> a
@@ -57988,15 +57497,14 @@
     37:37:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):100 -> a
     38:44:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):101:107 -> a
     45:50:java.util.Map synthesizedMembersForRetargetClasses(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map):118:123 -> a
-    51:59:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):125:133 -> a
-    60:62:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withExtraArgumentPrepended(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):304:304 -> a
-    60:62:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):134 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    63:71:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):136:144 -> a
-    72:77:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):143:148 -> a
-    78:78:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):140:140 -> a
-    79:79:boolean lambda$synthesizedMembersForRetargetClasses$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):131:131 -> a
-    80:80:java.util.Set lambda$synthesizedMembersForRetargetClasses$3(com.android.tools.r8.graph.DexLibraryClass):139:139 -> a
+    51:60:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):125:134 -> a
+    61:63:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withExtraArgumentPrepended(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):304:304 -> a
+    61:63:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):134 -> a
+    64:72:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):136:144 -> a
+    73:78:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):143:148 -> a
+    79:79:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):140:140 -> a
+    80:80:boolean lambda$synthesizedMembersForRetargetClasses$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):131:131 -> a
+    81:81:java.util.Set lambda$synthesizedMembersForRetargetClasses$3(com.android.tools.r8.graph.DexLibraryClass):139:139 -> a
     1:4:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):43:46 -> b
     5:5:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterLibraryTypeSynthesizer.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):156:156 -> b
     5:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):48 -> b
@@ -58010,7 +57518,7 @@
     12:12:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):48 -> b
     7:9:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterLibraryTypeSynthesizer.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):159:161 -> b
     7:9:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):48 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.Tf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.Bf:
     java.util.Map emulatedDispatchMethods -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
@@ -58018,14 +57526,12 @@
     1:1:void <clinit>():33:33 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):40:43 -> <init>
     1:1:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52:52 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     2:2:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52:53 -> a
     5:5:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     6:6:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
     8:8:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():431:431 -> a
     8:8:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):60 -> a
@@ -58086,92 +57592,68 @@
     91:93:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):80 -> a
     94:95:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.ensureInterfacesAndForwardingMethodsSynthesized(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):142:143 -> a
     94:95:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):80 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.Uf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.Cf:
     void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.Vf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.Df:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):28:29 -> <init>
-    1:2:com.android.tools.r8.graph.DexMethod getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):50:51 -> a
-    3:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.emulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):44:45 -> a
-    3:4:com.android.tools.r8.graph.DexMethod getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):51 -> a
-    5:5:com.android.tools.r8.graph.DexMethod getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):52:52 -> a
-    6:11:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):59:64 -> a
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    12:12:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):64 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:17:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):65:69 -> a
-    18:20:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):68:70 -> a
-    21:22:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.emulatedHolderDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):39:40 -> a
-    21:22:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):71 -> a
-    23:42:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):72:91 -> a
-    43:44:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.emulatedHolderDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):39:40 -> a
-    43:44:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):92 -> a
-    45:45:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):93:93 -> a
-    46:46:void lambda$ensureEmulatedHolderDispatchMethod$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):85:85 -> a
-    47:48:void lambda$ensureEmulatedHolderDispatchMethod$1(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexClasspathClass):87:88 -> a
-    49:53:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.rewriteType(com.android.tools.r8.graph.DexType):219:223 -> a
-    49:53:void lambda$ensureEmulatedHolderDispatchMethod$1(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexClasspathClass):88 -> a
-    54:54:void lambda$ensureProgramEmulatedHolderDispatchMethod$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):112:112 -> a
-    55:55:void lambda$ensureEmulatedInterfaceDispatchMethod$4(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):138:138 -> a
-    56:56:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):148:148 -> a
-    57:57:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    57:57:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):148 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    58:65:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):148:155 -> a
-    66:66:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):154:154 -> a
-    67:67:void lambda$ensureEmulatedInterfaceDispatchMethod$6(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):158:158 -> a
-    68:69:void lambda$ensureEmulatedInterfaceDispatchMethod$7(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer,com.android.tools.r8.graph.DexProgramClass):160:161 -> a
-    70:74:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.rewriteType(com.android.tools.r8.graph.DexType):219:223 -> a
-    70:74:void lambda$ensureEmulatedInterfaceDispatchMethod$7(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer,com.android.tools.r8.graph.DexProgramClass):161 -> a
-    75:76:void buildInterfaceDispatchMethod(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):168:169 -> a
-    77:77:void lambda$buildInterfaceDispatchMethod$8(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticMethodBuilder):173:173 -> a
-    78:79:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.emulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):44:45 -> a
-    78:79:void lambda$buildInterfaceDispatchMethod$8(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticMethodBuilder):172 -> a
-    80:88:void lambda$buildInterfaceDispatchMethod$8(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticMethodBuilder):175:183 -> a
-    89:89:void buildHolderDispatchMethod(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):189:189 -> a
-    90:90:void lambda$buildHolderDispatchMethod$10(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):193:193 -> a
-    91:92:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.emulatedHolderDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):39:40 -> a
-    91:92:void lambda$buildHolderDispatchMethod$10(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):192 -> a
-    93:98:void lambda$buildHolderDispatchMethod$10(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):195:200 -> a
-    99:99:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):202:202 -> a
-    100:100:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    100:100:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):202 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    101:102:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.ensureForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):34:35 -> a
-    101:102:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):210 -> a
-    101:102:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):203 -> a
-    103:104:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):50:51 -> a
-    103:104:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):211 -> a
-    103:104:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):203 -> a
-    105:106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.emulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):44:45 -> a
-    105:106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):51 -> a
-    105:106:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):211 -> a
-    105:106:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):203 -> a
-    107:107:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):52:52 -> a
-    107:107:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):211 -> a
-    107:107:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):203 -> a
-    108:111:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):212:215 -> a
-    108:111:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):203 -> a
-    1:2:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):100:101 -> b
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> b
-    3:3:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):101 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:12:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):101:109 -> b
-    13:13:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):108:108 -> b
-    14:15:void lambda$ensureProgramEmulatedHolderDispatchMethod$3(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer,com.android.tools.r8.graph.DexProgramClass):114:115 -> b
-    16:20:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.rewriteType(com.android.tools.r8.graph.DexType):219:223 -> b
-    16:20:void lambda$ensureProgramEmulatedHolderDispatchMethod$3(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer,com.android.tools.r8.graph.DexProgramClass):115 -> b
-    21:24:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):122:125 -> b
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> b
-    25:25:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):125 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    26:34:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):126:134 -> b
-    35:36:void lambda$ensureEmulatedInterfaceDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexClasspathClass):140:141 -> b
-    37:41:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.rewriteType(com.android.tools.r8.graph.DexType):219:223 -> b
-    37:41:void lambda$ensureEmulatedInterfaceDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexClasspathClass):141 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo -> com.android.tools.r8.internal.FT:
+    1:3:com.android.tools.r8.graph.DexMethod emulatedHolderDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):39:41 -> a
+    4:5:com.android.tools.r8.graph.DexMethod getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):51:52 -> a
+    6:7:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.emulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):45:46 -> a
+    6:7:com.android.tools.r8.graph.DexMethod getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):52 -> a
+    8:8:com.android.tools.r8.graph.DexMethod getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):53:53 -> a
+    9:14:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):60:65 -> a
+    15:15:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    15:15:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):65 -> a
+    16:20:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):66:70 -> a
+    21:43:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):69:91 -> a
+    44:44:void lambda$ensureEmulatedHolderDispatchMethod$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):86:86 -> a
+    45:45:void lambda$ensureProgramEmulatedHolderDispatchMethod$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):110:110 -> a
+    46:46:void lambda$ensureEmulatedInterfaceDispatchMethod$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):133:133 -> a
+    47:47:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):140:140 -> a
+    48:48:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    48:48:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):140 -> a
+    49:56:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):140:147 -> a
+    57:57:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):146:146 -> a
+    58:58:void lambda$ensureEmulatedInterfaceDispatchMethod$3(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):150:150 -> a
+    59:60:void buildInterfaceDispatchMethod(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):157:158 -> a
+    61:61:void lambda$buildInterfaceDispatchMethod$4(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticMethodBuilder):162:162 -> a
+    62:63:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.emulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):45:46 -> a
+    62:63:void lambda$buildInterfaceDispatchMethod$4(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticMethodBuilder):161 -> a
+    64:72:void lambda$buildInterfaceDispatchMethod$4(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticMethodBuilder):164:172 -> a
+    73:73:void buildHolderDispatchMethod(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):178:178 -> a
+    74:74:void lambda$buildHolderDispatchMethod$6(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):182:182 -> a
+    75:83:void lambda$buildHolderDispatchMethod$6(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):181:189 -> a
+    84:84:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):191:191 -> a
+    85:85:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    85:85:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):191 -> a
+    86:87:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.ensureForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):34:35 -> a
+    86:87:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):199 -> a
+    86:87:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):192 -> a
+    88:89:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):51:52 -> a
+    88:89:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):200 -> a
+    88:89:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):192 -> a
+    90:91:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.emulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):45:46 -> a
+    90:91:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):52 -> a
+    90:91:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):200 -> a
+    90:91:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):192 -> a
+    92:92:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.getEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):53:53 -> a
+    92:92:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):200 -> a
+    92:92:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):192 -> a
+    93:96:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):201:204 -> a
+    93:96:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):192 -> a
+    1:2:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):98:99 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> b
+    3:3:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):99 -> b
+    4:12:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):99:107 -> b
+    13:13:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):106:106 -> b
+    14:17:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):117:120 -> b
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> b
+    18:18:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):120 -> b
+    19:27:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):121:129 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo -> com.android.tools.r8.internal.hS:
     java.util.Map staticRetarget -> a
     java.util.Map nonEmulatedVirtualRetarget -> b
     java.util.Map emulatedVirtualRetarget -> c
@@ -58180,7 +57662,7 @@
     10:10:java.util.Map getEmulatedVirtualRetarget():63:63 -> a
     1:1:java.util.Map getNonEmulatedVirtualRetarget():59:59 -> b
     1:1:java.util.Map getStaticRetarget():55:55 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder -> com.android.tools.r8.internal.ET:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder -> com.android.tools.r8.internal.gS:
     java.util.Map staticRetarget -> b
     java.util.Map nonEmulatedVirtualRetarget -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -58191,215 +57673,407 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView):69:75 -> <init>
     1:20:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():79:98 -> a
     1:20:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:22:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):169:170 -> a
+    21:22:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):165:166 -> a
     21:22:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():97 -> a
     21:22:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     23:23:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2584:2584 -> a
-    23:23:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):170 -> a
+    23:23:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):166 -> a
     23:23:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():97 -> a
     23:23:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    24:24:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):171:171 -> a
+    24:24:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):167:167 -> a
     24:24:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():97 -> a
     24:24:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     25:31:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():95:101 -> a
     25:31:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     32:32:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> a
     32:32:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():104 -> a
     32:32:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     33:44:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():104:115 -> a
     33:44:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     45:45:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.<init>(com.android.tools.r8.graph.DexMethod):25:25 -> a
     45:45:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():115 -> a
     45:45:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    46:54:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():116:124 -> a
-    46:54:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    55:58:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():105:108 -> a
-    55:58:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    59:60:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):169:170 -> a
-    59:60:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():107 -> a
-    59:60:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    61:61:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2584:2584 -> a
-    61:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):170 -> a
-    61:61:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():107 -> a
-    61:61:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    62:62:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):171:171 -> a
-    62:62:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():107 -> a
-    62:62:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    63:101:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():105:143 -> a
-    63:101:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    102:106:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():142:146 -> a
-    102:106:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    107:109:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):169:171 -> a
-    107:109:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():145 -> a
-    107:109:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    110:117:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():147:154 -> a
+    46:50:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():116:120 -> a
+    46:50:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
+    51:54:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():105:108 -> a
+    51:54:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
+    55:56:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):165:166 -> a
+    55:56:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():107 -> a
+    55:56:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
+    57:57:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2584:2584 -> a
+    57:57:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):166 -> a
+    57:57:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():107 -> a
+    57:57:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
+    58:58:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):167:167 -> a
+    58:58:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():107 -> a
+    58:58:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
+    59:93:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():105:139 -> a
+    59:93:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
+    94:98:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():138:142 -> a
+    94:98:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
+    99:101:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):165:167 -> a
+    99:101:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():141 -> a
+    99:101:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
+    102:109:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():143:150 -> a
+    102:109:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
+    110:117:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():148:155 -> a
     110:117:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    118:125:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():152:159 -> a
-    118:125:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    126:128:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):169:171 -> a
-    126:128:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():158 -> a
-    126:128:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    129:133:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():160:164 -> a
-    129:133:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    134:151:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexClassAndMethod):176:193 -> a
-    152:154:void lambda$isEmulatedInterfaceDispatch$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):195:197 -> a
-    155:158:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):205:208 -> a
-    159:159:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":370,"2":371,"3":372}}
-    370:370:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):208:208 -> a
-    371:371:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):208:208 -> a
-    372:372:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):208:208 -> a
-    369:369:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):210:210 -> a
-    373:373:boolean lambda$findMethodsWithName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):207:207 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter -> com.android.tools.r8.internal.hn:
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:1:void <init>():38:38 -> <init>
-    1:9:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):53:61 -> a
-    10:14:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):71:75 -> a
-    10:14:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    15:15:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> a
-    15:15:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):78 -> a
-    15:15:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    16:16:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):78:78 -> a
-    16:16:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    17:25:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):93:101 -> a
-    17:25:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):82 -> a
-    17:25:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    26:26:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.<init>(com.android.tools.r8.graph.DexMethod):25:25 -> a
-    26:26:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):101 -> a
-    26:26:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):82 -> a
-    26:26:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    27:33:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):102:108 -> a
-    27:33:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):82 -> a
-    27:33:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    34:38:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.validateNoOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):118:122 -> a
-    34:38:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):109 -> a
-    34:38:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):82 -> a
-    34:38:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    39:39:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
-    39:39:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.validateNoOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):122 -> a
-    39:39:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):109 -> a
-    39:39:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):82 -> a
-    39:39:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    40:41:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.validateNoOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):123:124 -> a
-    40:41:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):109 -> a
-    40:41:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):82 -> a
-    40:41:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    42:42:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):111:111 -> a
-    42:42:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):82 -> a
-    42:42:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    43:43:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):110:110 -> a
-    43:43:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):82 -> a
-    43:43:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    44:44:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):79:79 -> a
-    44:44:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):59 -> a
-    45:63:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):136:154 -> a
-    64:66:com.android.tools.r8.utils.TraversalContinuation lambda$isEmulatedInterfaceDispatch$1(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):151:153 -> a
-    67:67:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.continueIf(boolean):17:17 -> a
-    67:67:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):13 -> a
-    67:67:com.android.tools.r8.utils.TraversalContinuation lambda$isEmulatedInterfaceDispatch$1(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):150 -> a
-    68:68:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):182:182 -> a
-    69:75:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):163:169 -> a
-    69:75:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):182 -> a
-    76:76:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
-    76:76:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):169 -> a
-    76:76:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):182 -> a
-    77:78:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):170:171 -> a
-    77:78:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):182 -> a
-    79:79:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):191:191 -> a
-    80:82:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withExtraArgumentPrepended(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):304:304 -> a
-    80:82:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):190 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    83:83:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):188:188 -> a
-    84:88:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.readApp(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):205:209 -> a
-    84:88:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):43 -> a
-    89:93:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):44:48 -> a
-    1:1:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):200:200 -> b
-    2:8:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):163:169 -> b
-    2:8:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):200 -> b
+    118:120:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):165:167 -> a
+    118:120:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():154 -> a
+    118:120:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
+    121:125:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():156:160 -> a
+    121:125:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):66 -> a
+    126:143:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexClassAndMethod):172:189 -> a
+    144:146:void lambda$isEmulatedInterfaceDispatch$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):191:193 -> a
+    147:150:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):201:204 -> a
+    151:151:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":358,"2":359,"3":360}}
+    358:358:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):204:204 -> a
+    359:359:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):204:204 -> a
+    360:360:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):204:204 -> a
+    357:357:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):206:206 -> a
+    361:361:boolean lambda$findMethodsWithName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):203:203 -> a
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter -> com.android.tools.r8.internal.Im:
+    java.util.Map emulatedInterfaceHierarchy -> b
+    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):35:36 -> <init>
+    1:16:void convertEmulatedInterfaces(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):43:58 -> a
+    17:17:void convertEmulatedInterfaces(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):57:57 -> a
+    18:18:boolean lambda$convertEmulatedInterfaces$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):51:51 -> a
+    19:21:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):54:56 -> a
+    22:29:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):64:71 -> a
+    22:29:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    30:34:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):68:72 -> a
+    30:34:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    35:35:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.<init>(com.android.tools.r8.graph.DexMethod):25:25 -> a
+    35:35:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):72 -> a
+    35:35:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    36:36:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):73:73 -> a
+    36:36:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    37:44:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):86:93 -> a
+    37:44:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):75 -> a
+    37:44:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    45:46:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):125:126 -> a
+    45:46:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):93 -> a
+    45:46:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):75 -> a
+    45:46:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    47:47:boolean com.android.tools.r8.utils.WorkList.isEmpty():112:112 -> a
+    47:47:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):127 -> a
+    47:47:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):93 -> a
+    47:47:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):75 -> a
+    47:47:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    48:54:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):128:134 -> a
+    48:54:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):93 -> a
+    48:54:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):75 -> a
+    48:54:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    55:56:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
+    55:56:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):134 -> a
+    55:56:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):93 -> a
+    55:56:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):75 -> a
+    55:56:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    57:57:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):94:94 -> a
+    57:57:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):75 -> a
+    57:57:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    58:58:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2584:2584 -> a
+    58:58:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):94 -> a
+    58:58:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):75 -> a
+    58:58:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    59:63:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):95:99 -> a
+    59:63:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):75 -> a
+    59:63:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    64:64:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.<init>(com.android.tools.r8.graph.DexMethod):25:25 -> a
+    64:64:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):99 -> a
+    64:64:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):75 -> a
+    64:64:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    65:85:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):99:119 -> a
+    65:85:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):75 -> a
+    65:85:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    86:86:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):76:76 -> a
+    86:86:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):55 -> a
+    87:87:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):53:53 -> a
+    88:93:java.util.Map processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map):142:147 -> a
+    94:104:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):159:169 -> a
+    105:105:boolean com.android.tools.r8.utils.WorkList.isEmpty():112:112 -> a
+    105:105:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):170 -> a
+    106:113:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):171:178 -> a
+    114:115:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
+    114:115:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):178 -> a
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter -> com.android.tools.r8.internal.Jm:
+    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
+    1:2:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):22:23 -> <init>
+    1:1:void rewriteEmulatedInterface(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):65:65 -> a
+    2:4:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):106:108 -> a
+    2:4:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    5:6:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):27:28 -> a
+    5:6:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109 -> a
+    5:6:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    7:7:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":67,"2":68,"3":69}}
+    67:67:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):28:28 -> a
+    67:67:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109 -> a
+    67:67:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    68:68:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):28:28 -> a
+    68:68:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109 -> a
+    68:68:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    69:69:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):28:28 -> a
+    69:69:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109 -> a
+    69:69:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    8:8:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):29:29 -> a
+    8:8:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109 -> a
+    8:8:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    9:9:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109:109 -> a
+    9:9:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    10:11:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):27:28 -> a
+    10:11:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109 -> a
+    10:11:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    12:12:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":70,"2":71,"3":72}}
+    70:70:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):28:28 -> a
+    70:70:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109 -> a
+    70:70:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    71:71:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):28:28 -> a
+    71:71:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109 -> a
+    71:71:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    72:72:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):28:28 -> a
+    72:72:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109 -> a
+    72:72:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    13:13:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):29:29 -> a
+    13:13:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109 -> a
+    13:13:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    14:16:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109:111 -> a
+    14:16:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):36 -> a
+    17:18:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteClasses(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):82:83 -> a
+    17:18:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):37 -> a
+    19:20:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):92:93 -> a
+    19:20:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteClasses(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):84 -> a
+    19:20:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):37 -> a
+    21:21:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):94 -> a
+    21:21:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteClasses(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):84 -> a
+    21:21:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):37 -> a
+    22:24:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):95:97 -> a
+    22:24:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteClasses(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):84 -> a
+    22:24:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):37 -> a
+    25:27:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):96:98 -> a
+    25:27:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteClasses(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):84 -> a
+    25:27:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):37 -> a
+    28:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteClasses(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):86:86 -> a
+    28:28:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):37 -> a
+    29:29:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):38:38 -> a
+    30:30:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):72:72 -> a
+    30:30:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):38 -> a
+    31:32:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):92:93 -> a
+    31:32:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):73 -> a
+    31:32:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):38 -> a
+    33:33:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):94 -> a
+    33:33:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):73 -> a
+    33:33:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):38 -> a
+    34:36:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):95:97 -> a
+    34:36:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):73 -> a
+    34:36:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):38 -> a
+    37:39:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):96:98 -> a
+    37:39:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):73 -> a
+    37:39:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):38 -> a
+    40:40:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):75:75 -> a
+    40:40:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):38 -> a
+    41:41:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):39:39 -> a
+    42:42:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):72:72 -> a
+    42:42:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):39 -> a
+    43:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):92:93 -> a
+    43:44:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):73 -> a
+    43:44:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):39 -> a
+    45:45:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):94 -> a
+    45:45:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):73 -> a
+    45:45:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):39 -> a
+    46:48:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):95:97 -> a
+    46:48:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):73 -> a
+    46:48:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):39 -> a
+    49:51:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(java.util.Map,com.android.tools.r8.graph.DexType):96:98 -> a
+    49:51:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):73 -> a
+    49:51:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):39 -> a
+    52:52:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map):75:75 -> a
+    52:52:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):39 -> a
+    53:54:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):40:41 -> a
+    55:56:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map,java.lang.String):57:58 -> a
+    55:56:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):41 -> a
+    57:61:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType,java.lang.String):45:49 -> a
+    57:61:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map,java.lang.String):58 -> a
+    57:61:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):41 -> a
+    62:62:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":73,"2":74,"3":75}}
+    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType,java.lang.String):49:49 -> a
+    73:73:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map,java.lang.String):58 -> a
+    73:73:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):41 -> a
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType,java.lang.String):49:49 -> a
+    74:74:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map,java.lang.String):58 -> a
+    74:74:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):41 -> a
+    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType,java.lang.String):49:49 -> a
+    75:75:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map,java.lang.String):58 -> a
+    75:75:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):41 -> a
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType,java.lang.String):52:52 -> a
+    63:63:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map,java.lang.String):58 -> a
+    63:63:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):41 -> a
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType,java.lang.String):51:51 -> a
+    64:64:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map,java.lang.String):58 -> a
+    64:64:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):41 -> a
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType,java.lang.String):50:50 -> a
+    65:65:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map,java.lang.String):58 -> a
+    65:65:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):41 -> a
+    66:66:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.Map,java.lang.String):59:59 -> a
+    66:66:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String):41 -> a
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter -> com.android.tools.r8.internal.Km:
+    com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> b
+    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):30:31 -> <init>
+    1:4:void convertRetargetFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):36:39 -> a
+    5:9:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):49:53 -> a
+    5:9:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    10:10:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> a
+    10:10:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):56 -> a
+    10:10:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    11:11:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):56:56 -> a
+    11:11:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    12:20:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):68:76 -> a
+    12:20:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):60 -> a
+    12:20:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    21:21:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.<init>(com.android.tools.r8.graph.DexMethod):25:25 -> a
+    21:21:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):76 -> a
+    21:21:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):60 -> a
+    21:21:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    22:27:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):77:82 -> a
+    22:27:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):60 -> a
+    22:27:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    28:32:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.validateNoOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):91:95 -> a
+    28:32:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):82 -> a
+    28:32:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):60 -> a
+    28:32:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    33:33:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
+    33:33:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.validateNoOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):95 -> a
+    33:33:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):82 -> a
+    33:33:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):60 -> a
+    33:33:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    34:35:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.validateNoOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):96:97 -> a
+    34:35:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):82 -> a
+    34:35:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):60 -> a
+    34:35:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    36:36:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):84:84 -> a
+    36:36:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):60 -> a
+    36:36:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    37:37:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):83:83 -> a
+    37:37:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):60 -> a
+    37:37:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    38:38:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):57:57 -> a
+    38:38:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):41 -> a
+    39:57:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):109:127 -> a
+    58:60:com.android.tools.r8.utils.TraversalContinuation lambda$isEmulatedInterfaceDispatch$1(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):124:126 -> a
+    61:61:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.continueIf(boolean):17:17 -> a
+    61:61:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):13 -> a
+    61:61:com.android.tools.r8.utils.TraversalContinuation lambda$isEmulatedInterfaceDispatch$1(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):123 -> a
+    62:62:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):151:151 -> a
+    63:69:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):136:142 -> a
+    63:69:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):151 -> a
+    70:70:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
+    70:70:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):142 -> a
+    70:70:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):151 -> a
+    71:72:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):143:144 -> a
+    71:72:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):151 -> a
+    73:73:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):160:160 -> a
+    74:74:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):159:159 -> a
+    75:77:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withExtraArgumentPrepended(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):304:304 -> a
+    75:77:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):159 -> a
+    78:78:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):157:157 -> a
+    1:1:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):165:165 -> b
+    2:8:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):136:142 -> b
+    2:8:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):165 -> b
     9:9:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> b
-    9:9:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):169 -> b
-    9:9:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):200 -> b
-    10:11:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):170:171 -> b
-    10:11:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):200 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter -> com.android.tools.r8.internal.vB:
+    9:9:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):142 -> b
+    9:9:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):165 -> b
+    10:11:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):143:144 -> b
+    10:11:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):165 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter -> com.android.tools.r8.internal.Lm:
+    1:1:void <init>():27:27 -> <init>
+    1:18:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags convertRewritingFlags(java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):58:75 -> a
+    19:19:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):70:70 -> a
+    20:20:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):69:69 -> a
+    21:25:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.readApp(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):79:83 -> a
+    21:25:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):32 -> a
+    26:31:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):33:38 -> a
+    32:36:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):35:39 -> a
+    37:42:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags):46:51 -> a
+    37:42:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):39 -> a
+    43:44:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):40:41 -> a
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter -> com.android.tools.r8.internal.Mm:
+    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():18:18 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):22:23 -> <init>
+    1:3:void convertWrappers(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):28:30 -> a
+    4:36:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter.allImplementedMethods(com.android.tools.r8.graph.DexClass):38:70 -> a
+    4:36:void convertWrappers(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):31 -> a
+    37:38:void convertWrappers(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):32:33 -> a
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter -> com.android.tools.r8.internal.EA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():45:45 -> <clinit>
     1:1:void <init>():45:45 -> <init>
-    1:1:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():61:61 -> a
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):155 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:18:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):155:171 -> a
-    19:19:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):67:67 -> a
-    20:24:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.readApp(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):138:142 -> a
-    20:24:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):68 -> a
-    25:25:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):69:69 -> a
-    26:33:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):213:220 -> a
-    26:33:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):69 -> a
-    34:36:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):219:221 -> a
-    34:36:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):69 -> a
-    37:41:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):71:75 -> a
-    42:43:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):106:107 -> a
-    42:43:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
-    44:44:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():61:61 -> a
-    44:44:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):109 -> a
-    44:44:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
-    45:45:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):109:109 -> a
-    45:45:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
-    46:46:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():61:61 -> a
-    46:46:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):110 -> a
-    46:46:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
-    47:62:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):114:129 -> a
-    47:62:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
-    63:70:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):127:134 -> a
-    63:70:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
-    71:71:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):79:79 -> a
-    72:76:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.readApp(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):138:142 -> a
-    72:76:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):86 -> a
-    77:77:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):87:87 -> a
-    78:85:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):213:220 -> a
-    78:85:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):87 -> a
-    86:88:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):219:221 -> a
-    86:88:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):87 -> a
-    89:96:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):93:100 -> a
-    97:97:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():61:61 -> a
-    97:97:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):101 -> a
-    98:98:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):101:101 -> a
-    99:100:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap convertRewritingFlagMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):147:148 -> a
-    101:101:void lambda$convertRewritingFlagMap$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin,java.lang.Integer,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags):148:148 -> a
-    102:106:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertDontRewriteInvocation(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Pair):176:180 -> a
-    102:106:void lambda$convertRewritingFlags$2(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Pair):169 -> a
-    107:107:void convertRetargetCoreLibMember(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.Map):189:189 -> a
-    108:112:void lambda$convertRetargetCoreLibMember$3(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):191:195 -> a
-    113:115:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):201:203 -> a
-    116:116:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":322,"2":323,"3":324}}
-    322:322:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):203:203 -> a
-    323:323:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):203:203 -> a
-    324:324:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):203:203 -> a
-    321:321:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):205:205 -> a
-    325:325:boolean lambda$findMethodsWithName$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):202:202 -> a
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):67:67 -> a
+    2:6:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.readApp(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):138:142 -> a
+    2:6:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):68 -> a
+    7:7:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):69:69 -> a
+    8:15:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):213:220 -> a
+    8:15:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):69 -> a
+    16:18:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):219:221 -> a
+    16:18:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):69 -> a
+    19:23:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):71:75 -> a
+    24:27:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):106:109 -> a
+    24:27:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
+    28:28:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():61:61 -> a
+    28:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):109 -> a
+    28:28:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
+    29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):109:109 -> a
+    29:29:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
+    30:30:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():61:61 -> a
+    30:30:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):110 -> a
+    30:30:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
+    31:46:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):114:129 -> a
+    31:46:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
+    47:54:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):127:134 -> a
+    47:54:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77 -> a
+    55:55:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):79:79 -> a
+    56:60:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.readApp(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):138:142 -> a
+    56:60:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):86 -> a
+    61:61:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):87:87 -> a
+    62:69:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):213:220 -> a
+    62:69:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):87 -> a
+    70:72:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):219:221 -> a
+    70:72:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):87 -> a
+    73:80:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):93:100 -> a
+    81:81:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():61:61 -> a
+    81:81:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):101 -> a
+    82:82:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):101:101 -> a
+    83:84:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap convertRewritingFlagMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):147:148 -> a
+    85:85:void lambda$convertRewritingFlagMap$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin,java.lang.Integer,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags):148:148 -> a
+    86:86:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):155:155 -> a
+    87:87:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():61:61 -> a
+    87:87:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):155 -> a
+    88:104:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):155:171 -> a
+    105:109:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertDontRewriteInvocation(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Pair):176:180 -> a
+    105:109:void lambda$convertRewritingFlags$2(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Pair):169 -> a
+    110:110:void convertRetargetCoreLibMember(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.Map):189:189 -> a
+    111:115:void lambda$convertRetargetCoreLibMember$3(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):191:195 -> a
+    116:118:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):201:203 -> a
+    119:119:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":325,"2":326,"3":327}}
+    325:325:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):203:203 -> a
+    326:326:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):203:203 -> a
+    327:327:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):203:203 -> a
+    324:324:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):205:205 -> a
+    328:328:boolean lambda$findMethodsWithName$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):202:202 -> a
     1:1:void lambda$convertRewritingFlags$1(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.Map):166:166 -> b
 com.android.tools.r8.ir.desugar.icce.AlwaysThrowingInstructionDesugaring -> com.android.tools.r8.internal.H1:
     com.android.tools.r8.graph.AppView appView -> a
@@ -58425,7 +58099,7 @@
     55:87:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):142:174 -> a
     88:110:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):170:192 -> a
     111:118:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):189:196 -> a
-com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.Ru:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.lu:
     com.android.tools.r8.graph.CfCode virtualMethodCode -> d
     com.android.tools.r8.graph.ProgramMethod newDirectMethod -> b
     com.android.tools.r8.graph.ProgramMethod virtualMethod -> c
@@ -58444,7 +58118,7 @@
     4:4:int compareTo(java.lang.Object):10 -> compareTo
     5:5:int com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo.compareTo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):37:37 -> compareTo
     5:5:int compareTo(java.lang.Object):10 -> compareTo
-com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring -> com.android.tools.r8.internal.Su:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring -> com.android.tools.r8.internal.mu:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
     1:2:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):41:42 -> a
@@ -58464,11 +58138,7 @@
     28:28:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
     28:28:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
     29:29:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":58,"2":59,"3":60}}
-    58:58:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):136:136 -> a
-    58:58:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):109 -> a
-    58:58:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
-    58:58:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":59,"2":60,"3":61}}
     59:59:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):136:136 -> a
     59:59:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):109 -> a
     59:59:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
@@ -58477,6 +58147,10 @@
     60:60:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):109 -> a
     60:60:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
     60:60:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
+    61:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):136:136 -> a
+    61:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):109 -> a
+    61:61:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
+    61:61:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
     30:30:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
     30:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):138 -> a
     30:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):109 -> a
@@ -58486,20 +58160,24 @@
     31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):109 -> a
     31:31:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
     31:31:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
-    32:32:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):322:322 -> a
-    32:32:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):137 -> a
+    32:32:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):137:137 -> a
     32:32:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):109 -> a
     32:32:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
     32:32:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
-    33:53:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):110:130 -> a
-    33:53:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
-    33:53:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
-    54:56:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):103:103 -> a
-    54:56:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
-    57:57:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):130:130 -> a
-    57:57:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
-    57:57:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.Na:
+    33:33:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):322:322 -> a
+    33:33:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):137 -> a
+    33:33:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):109 -> a
+    33:33:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
+    33:33:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
+    34:54:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):110:130 -> a
+    34:54:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
+    34:54:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
+    55:57:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):103:103 -> a
+    55:57:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
+    58:58:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):130:130 -> a
+    58:58:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
+    58:58:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
+com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.ya:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> c
@@ -58546,7 +58224,6 @@
     67:70:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):504:507 -> a
     71:71:java.util.Set com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.getEmulatedInterfaces():239:239 -> a
     71:71:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):507 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     72:73:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):507:508 -> a
     74:74:java.util.Set com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.getEmulatedInterfaces():239:239 -> a
     74:74:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):509 -> a
@@ -58609,175 +58286,174 @@
     831:831:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):726 -> a
     832:832:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):768:768 -> a
     832:832:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):726 -> a
-    833:833:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
-    833:833:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):731 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    834:834:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):732:732 -> a
-    835:835:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
-    835:835:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):737 -> a
-    836:836:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():400:400 -> a
+    833:833:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):731:731 -> a
+    834:834:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
+    834:834:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):731 -> a
+    835:835:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):732:732 -> a
+    836:836:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
     836:836:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):737 -> a
-    837:837:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):741:741 -> a
-    838:838:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():396:396 -> a
-    838:838:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):761 -> a
-    838:838:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):742 -> a
-    839:842:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):761:764 -> a
-    839:842:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):742 -> a
-    843:855:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):743:755 -> a
-    856:856:void lambda$resolveForwardForSignature$9(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):698:698 -> a
-    857:859:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):774:776 -> a
-    860:860:boolean com.android.tools.r8.utils.collections.ProgramMethodSet.createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
-    860:860:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):776 -> a
-    861:861:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$addSyntheticMethod$10(com.android.tools.r8.graph.DexProgramClass):775:775 -> a
-    862:865:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):792:795 -> a
-    866:866:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic():343:343 -> a
-    866:866:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):795 -> a
-    867:872:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):795:800 -> a
-    873:876:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):813:816 -> a
-    873:876:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):802 -> a
-    877:887:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):814:824 -> a
-    877:887:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):802 -> a
-    888:892:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):801:805 -> a
-    893:894:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):905:906 -> a
-    895:895:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    895:895:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):906 -> a
-    896:898:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):907:909 -> a
-    899:910:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):884:895 -> a
-    899:910:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):909 -> a
-    911:911:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):909:909 -> a
-    912:912:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):896:896 -> a
-    912:912:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):909 -> a
-    913:914:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):915:916 -> a
-    913:914:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    915:920:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):868:873 -> a
-    915:920:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):900 -> a
-    915:920:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):916 -> a
-    915:920:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    921:921:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):901:901 -> a
-    921:921:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):916 -> a
-    921:921:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    922:922:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):917:917 -> a
+    837:837:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():400:400 -> a
+    837:837:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):737 -> a
+    838:838:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):741:741 -> a
+    839:839:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():396:396 -> a
+    839:839:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):761 -> a
+    839:839:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):742 -> a
+    840:843:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):761:764 -> a
+    840:843:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):742 -> a
+    844:856:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):743:755 -> a
+    857:857:void lambda$resolveForwardForSignature$9(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):698:698 -> a
+    858:860:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):774:776 -> a
+    861:861:boolean com.android.tools.r8.utils.collections.ProgramMethodSet.createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
+    861:861:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):776 -> a
+    862:862:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$addSyntheticMethod$10(com.android.tools.r8.graph.DexProgramClass):775:775 -> a
+    863:866:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):792:795 -> a
+    867:867:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic():343:343 -> a
+    867:867:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):795 -> a
+    868:873:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):795:800 -> a
+    874:877:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):813:816 -> a
+    874:877:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):802 -> a
+    878:888:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):814:824 -> a
+    878:888:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):802 -> a
+    889:893:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):801:805 -> a
+    894:895:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):905:906 -> a
+    896:896:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    896:896:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):906 -> a
+    897:899:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):907:909 -> a
+    900:911:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):884:895 -> a
+    900:911:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):909 -> a
+    912:912:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):909:909 -> a
+    913:913:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):896:896 -> a
+    913:913:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):909 -> a
+    914:915:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):915:916 -> a
+    914:915:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    916:921:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):868:873 -> a
+    916:921:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):900 -> a
+    916:921:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):916 -> a
+    916:921:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    922:922:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):901:901 -> a
+    922:922:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):916 -> a
     922:922:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    923:923:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():400:400 -> a
-    923:923:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):930 -> a
-    923:923:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):917 -> a
+    923:923:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):917:917 -> a
     923:923:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    924:924:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):931:931 -> a
+    924:924:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():400:400 -> a
+    924:924:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):930 -> a
     924:924:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):917 -> a
     924:924:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    925:928:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):868:871 -> a
-    925:928:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):933 -> a
-    925:928:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):917 -> a
-    925:928:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    929:929:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):341:341 -> a
-    929:929:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):871 -> a
-    929:929:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):933 -> a
-    929:929:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):917 -> a
-    929:929:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    930:930:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):934:934 -> a
+    925:925:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):931:931 -> a
+    925:925:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):917 -> a
+    925:925:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    926:929:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):868:871 -> a
+    926:929:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):933 -> a
+    926:929:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):917 -> a
+    926:929:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    930:930:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):341:341 -> a
+    930:930:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):871 -> a
+    930:930:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):933 -> a
     930:930:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):917 -> a
     930:930:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    931:931:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):920:920 -> a
+    931:931:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):934:934 -> a
+    931:931:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):917 -> a
     931:931:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    932:932:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.isEmpty():143:143 -> a
-    932:932:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):920 -> a
+    932:932:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):920:920 -> a
     932:932:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    933:933:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195:195 -> a
+    933:933:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.isEmpty():143:143 -> a
     933:933:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):920 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     933:933:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    934:934:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
-    934:934:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195 -> a
-    934:934:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):920 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    934:934:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):920:920 -> a
     934:934:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
     935:935:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195:195 -> a
     935:935:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):920 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     935:935:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    936:938:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):920:922 -> a
-    936:938:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    939:944:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):868:873 -> a
-    939:944:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):955 -> a
-    939:944:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):923 -> a
-    939:944:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    945:945:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):956:956 -> a
-    945:945:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):923 -> a
-    945:945:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    946:946:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):923:923 -> a
-    946:946:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    947:952:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):480:485 -> a
-    947:952:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
-    947:952:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    953:961:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):645:653 -> a
-    953:961:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):485 -> a
-    953:961:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
-    953:961:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    962:962:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    962:962:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):653 -> a
-    962:962:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):485 -> a
-    962:962:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
-    962:962:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    963:963:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):653:653 -> a
-    963:963:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):485 -> a
-    963:963:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
-    963:963:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    964:964:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):287:287 -> a
-    964:964:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):654 -> a
+    936:936:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
+    936:936:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195 -> a
+    936:936:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):920 -> a
+    936:936:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    937:937:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195:195 -> a
+    937:937:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):920 -> a
+    937:937:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    938:940:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):920:922 -> a
+    938:940:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    941:946:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):868:873 -> a
+    941:946:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):955 -> a
+    941:946:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):923 -> a
+    941:946:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    947:947:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):956:956 -> a
+    947:947:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):923 -> a
+    947:947:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    948:948:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):923:923 -> a
+    948:948:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    949:954:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):480:485 -> a
+    949:954:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
+    949:954:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    955:963:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):645:653 -> a
+    955:963:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):485 -> a
+    955:963:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
+    955:963:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    964:964:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    964:964:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):653 -> a
     964:964:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):485 -> a
     964:964:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
     964:964:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    965:965:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.contains(com.android.tools.r8.graph.DexType):235:235 -> a
-    965:965:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):287 -> a
-    965:965:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):654 -> a
+    965:965:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):653:653 -> a
     965:965:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):485 -> a
     965:965:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
     965:965:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    966:966:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():191:191 -> a
-    966:966:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):490 -> a
+    966:966:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):287:287 -> a
+    966:966:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):654 -> a
+    966:966:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):485 -> a
     966:966:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
     966:966:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    967:969:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.withoutAll(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):100:102 -> a
-    967:969:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():191 -> a
-    967:969:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):490 -> a
-    967:969:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
-    967:969:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    970:976:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):487:493 -> a
-    970:976:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
-    970:976:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    977:979:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.create(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):137:139 -> a
-    977:979:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):493 -> a
-    977:979:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
-    977:979:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    980:980:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):496:496 -> a
-    980:980:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
-    980:980:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    981:983:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.create(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):137:139 -> a
-    981:983:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):495 -> a
-    981:983:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
-    981:983:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
-    984:984:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946:946 -> a
-    985:985:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():400:400 -> a
-    985:985:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):930 -> a
-    985:985:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946 -> a
-    986:986:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):931:931 -> a
-    986:986:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946 -> a
-    987:990:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):868:871 -> a
-    987:990:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):933 -> a
-    987:990:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946 -> a
-    991:991:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):341:341 -> a
-    991:991:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):871 -> a
-    991:991:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):933 -> a
-    991:991:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946 -> a
-    992:992:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):934:934 -> a
-    992:992:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946 -> a
-    993:994:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):947:948 -> a
-    995:998:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):868:871 -> a
-    995:998:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):955 -> a
-    995:998:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):949 -> a
-    999:999:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):956:956 -> a
-    999:999:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):949 -> a
-    1000:1000:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):949:949 -> a
+    967:967:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.contains(com.android.tools.r8.graph.DexType):235:235 -> a
+    967:967:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):287 -> a
+    967:967:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):654 -> a
+    967:967:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):485 -> a
+    967:967:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
+    967:967:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    968:968:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():191:191 -> a
+    968:968:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):490 -> a
+    968:968:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
+    968:968:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    969:971:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.withoutAll(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):100:102 -> a
+    969:971:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():191 -> a
+    969:971:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):490 -> a
+    969:971:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
+    969:971:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    972:978:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):487:493 -> a
+    972:978:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
+    972:978:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    979:981:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.create(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):137:139 -> a
+    979:981:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):493 -> a
+    979:981:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
+    979:981:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    982:982:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):496:496 -> a
+    982:982:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
+    982:982:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    983:985:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.create(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):137:139 -> a
+    983:985:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):495 -> a
+    983:985:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):925 -> a
+    983:985:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):909 -> a
+    986:986:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946:946 -> a
+    987:987:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():400:400 -> a
+    987:987:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):930 -> a
+    987:987:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946 -> a
+    988:988:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):931:931 -> a
+    988:988:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946 -> a
+    989:992:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):868:871 -> a
+    989:992:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):933 -> a
+    989:992:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946 -> a
+    993:993:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):341:341 -> a
+    993:993:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):871 -> a
+    993:993:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):933 -> a
+    993:993:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946 -> a
+    994:994:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):934:934 -> a
+    994:994:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):946 -> a
+    995:996:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):947:948 -> a
+    997:1000:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):868:871 -> a
+    997:1000:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):955 -> a
+    997:1000:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):949 -> a
+    1001:1001:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):956:956 -> a
+    1001:1001:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):949 -> a
+    1002:1002:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):949:949 -> a
     1:1:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
     1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):960 -> b
     2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():400:400 -> b
@@ -58835,8 +58511,7 @@
     75:77:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):441:443 -> b
     75:77:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):975 -> b
     75:77:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$12(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):964 -> b
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$1 -> com.android.tools.r8.internal.Fa:
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.Ga:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.ra:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo parent -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo EMPTY -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardedMethodTargets -> b
@@ -58845,7 +58520,7 @@
     1:4:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):127:130 -> <init>
     1:5:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):147:151 -> a
     6:6:boolean lambda$isTargetedByForwards$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod):150:150 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.Ha:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.sa:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures signatures -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces emulatedInterfaces -> b
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo EMPTY -> c
@@ -58857,41 +58532,38 @@
     9:9:boolean isEmpty():282:282 -> a
     10:10:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.isEmpty():231:231 -> a
     10:10:boolean isEmpty():282 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:boolean isEmpty():282:282 -> a
     12:12:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
     12:12:boolean isEmpty():282 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:14:boolean isEmpty():282:283 -> a
     15:15:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.isEmpty():231:231 -> a
     15:15:boolean isEmpty():283 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.Ia:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.ta:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces EMPTY -> b
     java.util.Set emulatedInterfaces -> a
     1:1:void <clinit>():218:218 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):222:223 -> <init>
     3:4:void <init>(java.util.Set):226:227 -> <init>
     1:4:com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):243:246 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.Ja:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.ua:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> d
     1:1:void <clinit>():328:328 -> <clinit>
     1:1:void <init>():331:331 -> <init>
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass) -> a
     void reportMissingType(com.android.tools.r8.graph.DexType) -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):341:341 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.Ka:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.va:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures EMPTY -> b
     java.util.Set signatures -> a
     1:1:void <clinit>():71:71 -> <clinit>
     1:2:void <init>(java.util.Set):79:80 -> <init>
     1:1:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
     1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):84 -> a
-    2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
-    2:2:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):90:92 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.La:
+    2:2:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):87:87 -> a
+    3:3:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
+    3:3:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):87 -> a
+    4:6:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):90:92 -> a
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.wa:
     com.android.tools.r8.graph.DexClass directSubClass -> a
     com.android.tools.r8.graph.DexProgramClass closestProgramSubClass -> b
     java.util.function.BiConsumer reportMissingTypeCallback -> c
@@ -58906,36 +58578,34 @@
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppInfo.definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):158:158 -> a
     12:12:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):317 -> a
     13:13:void reportMissingType(com.android.tools.r8.graph.DexType):321:321 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.Ma:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.xa:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo EMPTY -> c
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures signatures -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo emulatedInterfaceInfo -> b
     1:1:void <clinit>():159:159 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):166:168 -> <init>
-    1:1:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
-    1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withSignatures(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):199 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:3:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withSignatures(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):202:203 -> a
-    4:4:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195:195 -> a
-    4:4:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):179 -> a
-    5:5:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
-    5:5:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195 -> a
-    5:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):179 -> a
-    6:6:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195:195 -> a
-    6:6:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):179 -> a
+    1:1:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195:195 -> a
+    1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):179 -> a
+    2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
+    2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195 -> a
+    2:2:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):179 -> a
+    3:3:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195:195 -> a
+    3:3:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):179 -> a
+    4:4:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):182:182 -> a
+    5:5:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195:195 -> a
+    5:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):182 -> a
+    6:6:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
+    6:6:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195 -> a
+    6:6:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):182 -> a
     7:7:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195:195 -> a
     7:7:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):182 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
-    8:8:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195 -> a
-    8:8:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):182 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    9:9:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():195:195 -> a
-    9:9:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):182 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:12:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):185:187 -> a
-    13:17:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withEmulatedInterfaceInfo(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):208:212 -> a
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.ef:
+    8:10:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):185:187 -> a
+    11:11:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withSignatures(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):199:199 -> a
+    12:12:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
+    12:12:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withSignatures(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):199 -> a
+    13:14:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withSignatures(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):202:203 -> a
+    15:19:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withEmulatedInterfaceInfo(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):208:212 -> a
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.Ie:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
@@ -58943,7 +58613,7 @@
     3:8:void hideMatches(com.android.tools.r8.graph.DexMethod):65:70 -> a
     9:9:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
     10:13:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection wrapInCollection():81:84 -> a
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.df:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.He:
     java.util.List hidden -> b
     java.util.List live -> a
     com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection EMPTY -> c
@@ -58953,16 +58623,15 @@
     1:1:java.util.List access$000(com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection):28:28 -> a
     2:4:com.android.tools.r8.graph.DexMethod getSingleCandidate(com.android.tools.r8.graph.DexMethod):46:48 -> a
     1:1:java.util.List access$100(com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection):28:28 -> b
-com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter -> com.android.tools.r8.internal.ai:
+com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter -> com.android.tools.r8.internal.Kh:
     java.util.Map emulatedInterfaces -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():21:21 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):26:29 -> <init>
     1:1:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):33:33 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     2:2:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):33 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:6:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):33:36 -> a
     7:13:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):48:54 -> a
     7:13:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):37 -> a
@@ -58990,7 +58659,7 @@
     66:66:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):82:82 -> a
     66:66:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):37 -> a
     67:72:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):37:42 -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringForTesting -> com.android.tools.r8.internal.Pt:
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringForTesting -> com.android.tools.r8.internal.jt:
     1:1:java.lang.String getCompanionClassNameSuffix():14:14 -> a
     2:2:java.lang.String getCompanionClassDescriptor(java.lang.String):26:26 -> a
     3:3:java.lang.String com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getCompanionClassDescriptor(java.lang.String):154:154 -> a
@@ -58998,7 +58667,7 @@
     1:1:java.lang.String getDefaultMethodPrefix():18:18 -> b
     1:1:java.lang.String getEmulateLibraryClassNameSuffix():10:10 -> c
     1:1:java.lang.String getPrivateMethodPrefix():22:22 -> d
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper -> com.android.tools.r8.internal.Qt:
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper -> com.android.tools.r8.internal.kt:
     java.util.Map emulatedInterfaces -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> e
@@ -59013,9 +58682,8 @@
     3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):94 -> a
     4:4:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):94:94 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     5:5:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):94 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:7:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):94:95 -> a
     8:8:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isEmulatedInterface(com.android.tools.r8.graph.DexType):78:78 -> a
     8:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):95 -> a
@@ -59035,9 +58703,8 @@
     38:38:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     38:38:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):203 -> a
     39:39:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):204:204 -> a
-    40:40:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
+    40:40:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
     40:40:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):204 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     41:47:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):204:210 -> a
     48:60:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):208:220 -> a
     61:61:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):216:216 -> a
@@ -59074,7 +58741,7 @@
     487:487:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):461 -> a
     488:488:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):461:461 -> a
     489:491:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):460:462 -> a
-    492:492:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():475:475 -> a
+    492:492:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():498:498 -> a
     492:492:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):464 -> a
     493:493:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):465:465 -> a
     494:494:boolean lambda$createStaticClinitFieldToTriggerInterfaceInitialization$19(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):457:457 -> a
@@ -59102,57 +58769,60 @@
     541:541:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):530:530 -> a
     void lambda$ensureMethodOfClasspathCompanionClassStub$9(com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder) -> b
     1:1:com.android.tools.r8.graph.DexType getEmulatedInterface(com.android.tools.r8.graph.DexType):90:90 -> b
-    2:5:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):133:136 -> b
-    6:6:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> b
-    6:6:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):137 -> b
-    7:7:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):134:134 -> b
-    8:9:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):147:148 -> b
-    10:10:java.lang.String com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):141:141 -> b
-    10:10:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):149 -> b
-    11:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):150:150 -> b
-    12:12:com.android.tools.r8.graph.Code lambda$ensureEmulatedInterfaceMethod$1(com.android.tools.r8.graph.DexMethod):227:227 -> b
-    13:13:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):242:242 -> b
-    14:14:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> b
-    14:14:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):242 -> b
-    15:15:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):244:244 -> b
-    16:19:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):243:246 -> b
-    20:22:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):309:311 -> b
-    20:22:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):247 -> b
-    23:23:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):248:248 -> b
-    24:24:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):282:282 -> b
-    25:25:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):339:339 -> b
-    25:25:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):282 -> b
-    26:30:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):283:287 -> b
-    31:31:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):284:284 -> b
-    32:33:void lambda$ensureMethodOfClasspathCompanionClassStub$12(com.android.tools.r8.synthesis.SyntheticMethodBuilder):360:361 -> b
-    34:36:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):366:368 -> b
-    37:39:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):309:311 -> b
-    37:39:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):370 -> b
-    40:44:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):371:375 -> b
-    45:45:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):372:372 -> b
-    46:55:void lambda$ensureStaticAsMethodOfProgramCompanionClassStub$14(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):378:387 -> b
-    56:56:void lambda$ensureCompanionClassInitializesInterface$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):416:416 -> b
-    57:57:boolean lambda$hasStaticMethodThatTriggersNonTrivialClassInitializer$17(com.android.tools.r8.graph.DexEncodedMethod):435:435 -> b
-    58:58:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):443:443 -> b
-    59:59:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):361:361 -> b
-    59:59:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):443 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    60:60:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):443:443 -> b
+    2:4:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):133:135 -> b
+    5:6:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):147:148 -> b
+    5:6:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):135 -> b
+    7:7:java.lang.String com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):141:141 -> b
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):149 -> b
+    7:7:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):135 -> b
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):150:150 -> b
+    8:8:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):135 -> b
+    9:9:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):136:136 -> b
+    10:10:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> b
+    10:10:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):137 -> b
+    11:11:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):134:134 -> b
+    12:12:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):181:181 -> b
+    13:13:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):167:167 -> b
+    13:13:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):181 -> b
+    14:19:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):181:186 -> b
+    20:20:com.android.tools.r8.graph.Code lambda$ensureEmulatedInterfaceMethod$1(com.android.tools.r8.graph.DexMethod):227:227 -> b
+    21:21:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):242:242 -> b
+    22:22:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> b
+    22:22:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):242 -> b
+    23:23:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):244:244 -> b
+    24:27:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):243:246 -> b
+    28:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):309:311 -> b
+    28:30:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):247 -> b
+    31:31:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):248:248 -> b
+    32:32:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):282:282 -> b
+    33:33:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):339:339 -> b
+    33:33:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):282 -> b
+    34:38:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):283:287 -> b
+    39:39:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):284:284 -> b
+    40:41:void lambda$ensureMethodOfClasspathCompanionClassStub$12(com.android.tools.r8.synthesis.SyntheticMethodBuilder):360:361 -> b
+    42:44:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):366:368 -> b
+    45:47:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):309:311 -> b
+    45:47:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):370 -> b
+    48:52:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):371:375 -> b
+    53:53:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):372:372 -> b
+    54:63:void lambda$ensureStaticAsMethodOfProgramCompanionClassStub$14(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):378:387 -> b
+    64:64:void lambda$ensureCompanionClassInitializesInterface$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):416:416 -> b
+    65:65:boolean lambda$hasStaticMethodThatTriggersNonTrivialClassInitializer$17(com.android.tools.r8.graph.DexEncodedMethod):435:435 -> b
+    66:66:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):443:443 -> b
+    67:67:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):361:361 -> b
+    67:67:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):443 -> b
+    68:68:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):443:443 -> b
     void lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$5(com.android.tools.r8.graph.ProgramMethod) -> c
     1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):176:176 -> c
-    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):181:181 -> c
-    3:3:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):167:167 -> c
-    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):181 -> c
-    4:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):181:186 -> c
-    10:10:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):231:231 -> c
-    11:11:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> c
-    11:11:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):231 -> c
-    12:16:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):232:236 -> c
-    17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):333:333 -> c
-    17:17:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):236 -> c
-    18:18:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):237:237 -> c
-    19:19:com.android.tools.r8.graph.Code lambda$ensureMethodOfClasspathCompanionClassStub$11(com.android.tools.r8.graph.DexMethod):361:361 -> c
-    20:23:boolean hasStaticMethodThatTriggersNonTrivialClassInitializer(com.android.tools.r8.graph.DexProgramClass):432:435 -> c
+    2:2:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):231:231 -> c
+    3:3:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> c
+    3:3:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):231 -> c
+    4:8:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):232:236 -> c
+    9:9:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):333:333 -> c
+    9:9:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):236 -> c
+    10:10:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):237:237 -> c
+    11:11:com.android.tools.r8.graph.Code lambda$ensureMethodOfClasspathCompanionClassStub$11(com.android.tools.r8.graph.DexMethod):361:361 -> c
+    12:15:boolean hasStaticMethodThatTriggersNonTrivialClassInitializer(com.android.tools.r8.graph.DexProgramClass):432:435 -> c
     void lambda$ensurePrivateAsMethodOfProgramCompanionClassStub$8(com.android.tools.r8.graph.ProgramMethod) -> d
     1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):78:78 -> d
     2:2:com.android.tools.r8.graph.Code lambda$ensurePrivateAsMethodOfProgramCompanionClassStub$6(com.android.tools.r8.graph.DexMethod):302:302 -> d
@@ -59161,15 +58831,15 @@
     4:4:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):343 -> d
     1:1:com.android.tools.r8.graph.Code lambda$ensureStaticAsMethodOfProgramCompanionClassStub$13(com.android.tools.r8.graph.DexMethod):387:387 -> e
     2:2:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):520:520 -> e
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer -> com.android.tools.r8.internal.St:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer -> com.android.tools.r8.internal.mt:
     void acceptCompanionClassClinit(com.android.tools.r8.graph.ProgramMethod) -> a
     void acceptCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade -> com.android.tools.r8.internal.Tt:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade -> com.android.tools.r8.internal.nt:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor classProcessor -> d
     com.android.tools.r8.ir.desugar.itf.InterfaceProcessor interfaceProcessor -> c
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor flavour -> b
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):31:35 -> <init>
+    1:36:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):0:35 -> <init>
     1:1:boolean lambda$processClassesConcurrently$0(com.android.tools.r8.graph.DexProgramClass):51:51 -> a
     2:5:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor):39:42 -> a
     2:5:boolean lambda$processClassesConcurrently$0(com.android.tools.r8.graph.DexProgramClass):51 -> a
@@ -59177,7 +58847,7 @@
     7:7:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):64:64 -> a
     1:3:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):50:50 -> b
     7:8:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):54:55 -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.Vt:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.pt:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> d
     com.android.tools.r8.graph.DexItemFactory factory -> c
     java.util.Set precedingDesugarings -> h
@@ -59187,351 +58857,325 @@
     java.util.Set emulatedMethods -> e
     com.android.tools.r8.utils.collections.ProgramMethodSet synthesizedMethods -> f
     java.util.Map cache -> g
-    1:1:void <clinit>():86:86 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):113:113 -> <init>
-    2:28:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):93:119 -> <init>
+    1:1:void <clinit>():85:85 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):112:112 -> <init>
+    2:28:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):92:118 -> <init>
     boolean hasPreciseNeedsDesugaring() -> a
-    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):123:127 -> a
-    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):127:127 -> a
-    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):131:131 -> a
-    8:9:void lambda$registerMapEntry$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):132:133 -> a
-    10:11:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):138:139 -> a
+    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):122:126 -> a
+    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):126:126 -> a
+    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):130:130 -> a
+    8:9:void lambda$registerMapEntry$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):131:132 -> a
+    10:11:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):137:138 -> a
     12:12:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    12:12:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):140 -> a
-    13:14:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):140:141 -> a
-    15:20:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):143:148 -> a
-    21:21:boolean isAlreadyDesugared(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):205:205 -> a
+    12:12:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):139 -> a
+    13:14:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):139:140 -> a
+    15:20:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):142:147 -> a
+    21:21:boolean isAlreadyDesugared(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):173:173 -> a
     22:22:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    22:22:boolean isAlreadyDesugared(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):205 -> a
-    23:23:boolean lambda$isAlreadyDesugared$3(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):206:206 -> a
-    24:24:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):254:254 -> a
-    25:25:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):629:629 -> a
-    25:25:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):254 -> a
-    26:28:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):254:256 -> a
-    29:29:void lambda$computeInvokeStatic$5(com.android.tools.r8.graph.ProgramMethod):365:365 -> a
-    30:35:java.util.Collection lambda$computeInvokeStatic$9(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):408:413 -> a
-    36:56:java.util.Collection lambda$computeInvokeStatic$9(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):411:431 -> a
-    57:59:void lambda$computeInvokeStatic$8(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.synthesis.SyntheticMethodBuilder):417:419 -> a
-    60:63:com.android.tools.r8.graph.Code lambda$computeInvokeStatic$7(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):421:424 -> a
-    64:64:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):485:485 -> a
-    65:77:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):816:828 -> a
-    65:77:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):485 -> a
+    22:22:boolean isAlreadyDesugared(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):173 -> a
+    23:23:boolean lambda$isAlreadyDesugared$3(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):174:174 -> a
+    24:24:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):222:222 -> a
+    25:25:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):597:597 -> a
+    25:25:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):222 -> a
+    26:28:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):222:224 -> a
+    29:29:void lambda$computeInvokeStatic$5(com.android.tools.r8.graph.ProgramMethod):333:333 -> a
+    30:35:java.util.Collection lambda$computeInvokeStatic$9(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):376:381 -> a
+    36:56:java.util.Collection lambda$computeInvokeStatic$9(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):379:399 -> a
+    57:59:void lambda$computeInvokeStatic$8(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.synthesis.SyntheticMethodBuilder):385:387 -> a
+    60:63:com.android.tools.r8.graph.Code lambda$computeInvokeStatic$7(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):389:392 -> a
+    64:64:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):453:453 -> a
+    65:77:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):784:796 -> a
+    65:77:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):453 -> a
     78:78:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    78:78:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):828 -> a
-    78:78:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):485 -> a
-    79:84:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):828:833 -> a
-    79:84:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):485 -> a
-    85:97:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):487:499 -> a
-    98:100:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):506:508 -> a
+    78:78:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):796 -> a
+    78:78:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):453 -> a
+    79:84:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):796:801 -> a
+    79:84:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):453 -> a
+    85:97:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):455:467 -> a
+    98:100:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):474:476 -> a
     101:101:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    101:101:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):511 -> a
-    102:158:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):519:575 -> a
-    159:182:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):574:597 -> a
-    183:183:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):594:594 -> a
-    184:184:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):512:512 -> a
+    101:101:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):479 -> a
+    102:158:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):487:543 -> a
+    159:182:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):542:565 -> a
+    183:183:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):562:562 -> a
+    184:184:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):480:480 -> a
     185:185:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":712,"2":713,"3":714}}
-    712:712:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):512:512 -> a
-    713:713:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):512:512 -> a
-    714:714:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):512:512 -> a
-    700:701:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):515:516 -> a
-    702:703:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):923:924 -> a
-    702:703:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):516 -> a
-    704:704:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):167:167 -> a
-    704:704:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):924 -> a
-    704:704:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):516 -> a
-    705:708:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):925:928 -> a
-    705:708:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):516 -> a
-    709:709:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    709:709:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):928 -> a
-    709:709:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):516 -> a
-    710:710:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    710:710:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    710:710:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):516 -> a
-    711:711:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):516:516 -> a
-    715:716:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeAsThrowRewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):602:603 -> a
-    717:717:java.util.Collection getInvokeStaticInstructions(com.android.tools.r8.graph.DexMethod):608:608 -> a
-    718:718:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):629:629 -> a
-    718:718:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):238 -> a
-    719:719:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):241:241 -> a
-    720:720:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):629:629 -> a
-    720:720:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):220 -> a
-    721:726:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):221:226 -> a
-    727:727:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
-    727:727:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):226 -> a
-    728:728:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):226:226 -> a
-    729:730:boolean com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring.isLambdaInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):190:191 -> a
-    729:730:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):227 -> a
-    731:731:boolean com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring.isLambdaInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):189:189 -> a
-    731:731:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):227 -> a
-    732:734:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):227:229 -> a
-    735:744:boolean com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.isStringConcatInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.DexItemFactory):225:234 -> a
-    735:744:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):228 -> a
-    745:745:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230:230 -> a
-    746:746:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):635:635 -> a
-    746:746:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    747:754:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):885:892 -> a
-    747:754:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):635 -> a
-    747:754:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    755:755:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":772,"2":773,"3":774}}
-    772:772:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):892:892 -> a
-    772:772:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):635 -> a
-    772:772:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    773:773:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):892:892 -> a
-    773:773:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):635 -> a
-    773:773:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    774:774:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):892:892 -> a
-    774:774:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):635 -> a
-    774:774:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    756:756:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):894:894 -> a
-    756:756:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):635 -> a
-    756:756:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    757:758:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):636:637 -> a
-    757:758:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    759:759:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    759:759:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):637 -> a
-    759:759:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    760:760:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):638:638 -> a
-    760:760:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    761:768:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):885:892 -> a
-    761:768:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):638 -> a
-    761:768:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    769:769:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":775,"2":776,"3":777}}
-    775:775:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):892:892 -> a
-    775:775:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):638 -> a
-    775:775:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    776:776:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):892:892 -> a
-    776:776:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):638 -> a
-    776:776:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    777:777:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):892:892 -> a
-    777:777:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):638 -> a
-    777:777:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    770:770:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):894:894 -> a
-    770:770:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):638 -> a
-    770:770:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):230 -> a
-    771:771:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):232:232 -> a
-    778:778:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):647:647 -> a
-    779:779:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    779:779:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):647 -> a
-    780:781:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):647:648 -> a
-    782:782:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    782:782:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):648 -> a
-    783:783:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):649:649 -> a
-    784:784:void lambda$rewriteInvokeSuper$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):661:661 -> a
-    785:785:java.util.Collection lambda$rewriteInvokeSuper$15(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):694:694 -> a
-    786:786:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    786:786:java.util.Collection lambda$rewriteInvokeSuper$15(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):696 -> a
-    787:789:java.util.Collection lambda$rewriteInvokeSuper$15(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):697:699 -> a
-    790:794:java.util.Collection lambda$rewriteInvokeSuper$15(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):698:702 -> a
-    795:800:java.util.Collection lambda$rewriteInvokeSuper$15(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):701:706 -> a
-    801:806:java.util.Collection lambda$rewriteInvokeSuper$16(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):718:723 -> a
-    807:809:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):904:906 -> a
-    807:809:java.util.Collection lambda$rewriteInvokeSuper$16(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):723 -> a
-    810:816:java.util.Collection lambda$rewriteInvokeSuper$16(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):724:730 -> a
-    817:817:java.util.Collection lambda$rewriteInvokeSuper$16(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):729:729 -> a
-    818:818:java.util.Collection lambda$rewriteInvokeSuper$16(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):728:728 -> a
-    819:823:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):741:745 -> a
-    824:824:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):626:626 -> a
-    824:824:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):745 -> a
-    825:827:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):746:748 -> a
-    828:828:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    828:828:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):748 -> a
-    829:854:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):748:773 -> a
-    855:855:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):626:626 -> a
-    855:855:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):773 -> a
-    856:856:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
-    856:856:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):774 -> a
-    857:874:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):778:795 -> a
-    875:892:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):794:811 -> a
-    893:896:java.util.Collection lambda$computeEmulatedInterfaceInvokeSpecial$17(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):757:760 -> a
-    897:897:java.util.Collection lambda$computeEmulatedInterfaceInvokeSpecial$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):788:788 -> a
-    898:898:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):912:912 -> a
-    899:899:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):919:919 -> a
-    900:900:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):933:933 -> a
-    901:907:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):944:950 -> a
-    901:907:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    908:908:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    908:908:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):881 -> a
-    908:908:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):959 -> a
-    908:908:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    909:909:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):881:881 -> a
-    909:909:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):959 -> a
-    909:909:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    910:936:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):964:990 -> a
-    910:936:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    937:937:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):938:938 -> a
-    938:938:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):951:951 -> a
-    938:938:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    939:939:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":945,"2":946,"3":947}}
-    945:945:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):951:951 -> a
-    945:945:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    946:946:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):951:951 -> a
-    946:946:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    947:947:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):951:951 -> a
-    947:947:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    940:940:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":949,"2":950,"3":951}}
-    949:949:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):953:953 -> a
-    949:949:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    950:950:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):953:953 -> a
-    950:950:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    951:951:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):953:953 -> a
-    951:951:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    941:941:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):955:955 -> a
-    941:941:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    942:942:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    942:942:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):955 -> a
-    942:942:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    943:943:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    943:943:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    943:943:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):955 -> a
-    943:943:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    944:944:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):955:955 -> a
-    944:944:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937 -> a
-    952:955:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):996:999 -> a
-    956:956:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    956:956:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):999 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    957:958:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):923:924 -> a
-    957:958:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1000 -> a
-    959:959:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):167:167 -> a
-    959:959:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):924 -> a
-    959:959:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1000 -> a
-    960:963:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):925:928 -> a
-    960:963:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1000 -> a
-    964:964:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    964:964:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):928 -> a
-    964:964:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1000 -> a
-    965:966:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1001:1002 -> a
-    967:967:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1007:1007 -> a
-    968:968:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    968:968:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1007 -> a
-    969:970:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1007:1008 -> a
-    971:971:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    971:971:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1008 -> a
-    972:973:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1008:1009 -> a
-    974:974:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    974:974:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1011 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    975:976:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1013:1014 -> a
-    977:977:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    977:977:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1026 -> a
-    977:977:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1015 -> a
-    978:978:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1028:1028 -> a
-    978:978:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1015 -> a
-    979:980:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1017:1018 -> a
-    981:981:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    981:981:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1026 -> a
-    981:981:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1018 -> a
-    982:982:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1028:1028 -> a
-    982:982:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1018 -> a
-    1:1:java.util.Set getEmulatedMethods():156:156 -> b
-    2:11:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):267:276 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":680,"2":681,"3":682}}
+    680:680:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):480:480 -> a
+    681:681:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):480:480 -> a
+    682:682:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):480:480 -> a
+    668:669:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):483:484 -> a
+    670:671:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):891:892 -> a
+    670:671:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):484 -> a
+    672:672:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):167:167 -> a
+    672:672:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):892 -> a
+    672:672:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):484 -> a
+    673:676:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):893:896 -> a
+    673:676:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):484 -> a
+    677:677:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    677:677:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):896 -> a
+    677:677:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):484 -> a
+    678:678:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    678:678:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    678:678:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):484 -> a
+    679:679:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):484:484 -> a
+    683:684:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeAsThrowRewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):570:571 -> a
+    685:685:java.util.Collection getInvokeStaticInstructions(com.android.tools.r8.graph.DexMethod):576:576 -> a
+    686:686:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):597:597 -> a
+    686:686:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):206 -> a
+    687:687:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):209:209 -> a
+    688:688:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):597:597 -> a
+    688:688:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):188 -> a
+    689:694:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):189:194 -> a
+    695:695:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
+    695:695:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):194 -> a
+    696:696:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):194:194 -> a
+    697:698:boolean com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring.isLambdaInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):190:191 -> a
+    697:698:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):195 -> a
+    699:699:boolean com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring.isLambdaInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):189:189 -> a
+    699:699:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):195 -> a
+    700:702:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):195:197 -> a
+    703:712:boolean com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.isStringConcatInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.DexItemFactory):225:234 -> a
+    703:712:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):196 -> a
+    713:713:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198:198 -> a
+    714:714:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):603:603 -> a
+    714:714:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    715:722:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):853:860 -> a
+    715:722:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):603 -> a
+    715:722:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    723:723:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":740,"2":741,"3":742}}
+    740:740:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):860:860 -> a
+    740:740:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):603 -> a
+    740:740:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    741:741:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):860:860 -> a
+    741:741:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):603 -> a
+    741:741:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    742:742:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):860:860 -> a
+    742:742:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):603 -> a
+    742:742:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    724:724:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):862:862 -> a
+    724:724:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):603 -> a
+    724:724:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    725:726:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):604:605 -> a
+    725:726:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    727:727:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
+    727:727:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):605 -> a
+    727:727:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    728:728:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):606:606 -> a
+    728:728:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    729:736:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):853:860 -> a
+    729:736:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):606 -> a
+    729:736:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    737:737:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":743,"2":744,"3":745}}
+    743:743:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):860:860 -> a
+    743:743:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):606 -> a
+    743:743:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    744:744:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):860:860 -> a
+    744:744:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):606 -> a
+    744:744:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    745:745:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):860:860 -> a
+    745:745:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):606 -> a
+    745:745:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    738:738:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):862:862 -> a
+    738:738:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):606 -> a
+    738:738:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
+    739:739:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):200:200 -> a
+    746:746:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):615:615 -> a
+    747:747:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    747:747:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):615 -> a
+    748:749:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):615:616 -> a
+    750:750:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    750:750:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):616 -> a
+    751:751:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):617:617 -> a
+    752:752:void lambda$rewriteInvokeSuper$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):629:629 -> a
+    753:753:java.util.Collection lambda$rewriteInvokeSuper$15(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):662:662 -> a
+    754:754:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    754:754:java.util.Collection lambda$rewriteInvokeSuper$15(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):664 -> a
+    755:757:java.util.Collection lambda$rewriteInvokeSuper$15(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):665:667 -> a
+    758:762:java.util.Collection lambda$rewriteInvokeSuper$15(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):666:670 -> a
+    763:768:java.util.Collection lambda$rewriteInvokeSuper$15(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):669:674 -> a
+    769:774:java.util.Collection lambda$rewriteInvokeSuper$16(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):686:691 -> a
+    775:777:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):872:874 -> a
+    775:777:java.util.Collection lambda$rewriteInvokeSuper$16(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):691 -> a
+    778:784:java.util.Collection lambda$rewriteInvokeSuper$16(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):692:698 -> a
+    785:785:java.util.Collection lambda$rewriteInvokeSuper$16(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):697:697 -> a
+    786:786:java.util.Collection lambda$rewriteInvokeSuper$16(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):696:696 -> a
+    787:791:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):709:713 -> a
+    792:792:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):626:626 -> a
+    792:792:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):713 -> a
+    793:795:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):714:716 -> a
+    796:796:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    796:796:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):716 -> a
+    797:822:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):716:741 -> a
+    823:823:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):626:626 -> a
+    823:823:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):741 -> a
+    824:824:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
+    824:824:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):742 -> a
+    825:842:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):746:763 -> a
+    843:860:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):762:779 -> a
+    861:864:java.util.Collection lambda$computeEmulatedInterfaceInvokeSpecial$17(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):725:728 -> a
+    865:865:java.util.Collection lambda$computeEmulatedInterfaceInvokeSpecial$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):756:756 -> a
+    866:866:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):880:880 -> a
+    867:867:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):887:887 -> a
+    868:868:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):901:901 -> a
+    869:875:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):912:918 -> a
+    869:875:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    876:876:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    876:876:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):849 -> a
+    876:876:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):927 -> a
+    876:876:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    877:877:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):849:849 -> a
+    877:877:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):927 -> a
+    877:877:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    878:904:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):932:958 -> a
+    878:904:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    905:905:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):906:906 -> a
+    906:906:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):919:919 -> a
+    906:906:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    907:907:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":913,"2":914,"3":915}}
+    913:913:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):919:919 -> a
+    913:913:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    914:914:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):919:919 -> a
+    914:914:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    915:915:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):919:919 -> a
+    915:915:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    908:908:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":917,"2":918,"3":919}}
+    917:917:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):921:921 -> a
+    917:917:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    918:918:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):921:921 -> a
+    918:918:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    919:919:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):921:921 -> a
+    919:919:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    909:909:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):923:923 -> a
+    909:909:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    910:910:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    910:910:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):923 -> a
+    910:910:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    911:911:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    911:911:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    911:911:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):923 -> a
+    911:911:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    912:912:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):923:923 -> a
+    912:912:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):905 -> a
+    920:923:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):964:967 -> a
+    924:924:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    924:924:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):967 -> a
+    925:926:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):891:892 -> a
+    925:926:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):968 -> a
+    927:927:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):167:167 -> a
+    927:927:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):892 -> a
+    927:927:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):968 -> a
+    928:931:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):893:896 -> a
+    928:931:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):968 -> a
+    932:932:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    932:932:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):896 -> a
+    932:932:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):968 -> a
+    933:934:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):969:970 -> a
+    935:935:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):975:975 -> a
+    936:936:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    936:936:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):975 -> a
+    937:938:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):975:976 -> a
+    939:939:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    939:939:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):976 -> a
+    940:943:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):976:979 -> a
+    944:944:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    944:944:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):979 -> a
+    945:946:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):981:982 -> a
+    947:947:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    947:947:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):994 -> a
+    947:947:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):983 -> a
+    948:948:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):996:996 -> a
+    948:948:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):983 -> a
+    949:950:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):985:986 -> a
+    951:951:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):994:994 -> a
+    951:951:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):986 -> a
+    952:952:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    952:952:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):994 -> a
+    952:952:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):986 -> a
+    953:953:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):996:996 -> a
+    953:953:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):986 -> a
+    1:1:java.util.Set getEmulatedMethods():155:155 -> b
+    2:11:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):235:244 -> b
     12:12:boolean com.android.tools.r8.cf.code.CfInvoke.isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):141:141 -> b
-    12:12:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):276 -> b
-    13:18:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):277:282 -> b
-    19:22:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):317:320 -> b
-    19:22:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):283 -> b
+    12:12:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):244 -> b
+    13:18:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):245:250 -> b
+    19:22:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):285:288 -> b
+    19:22:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):251 -> b
     23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> b
-    23:23:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):320 -> b
-    23:23:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):283 -> b
-    24:45:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):322:343 -> b
-    24:45:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):283 -> b
+    23:23:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):288 -> b
+    23:23:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):251 -> b
+    24:45:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):290:311 -> b
+    24:45:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):251 -> b
     46:46: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 -> b
-    46:46:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):343 -> b
-    46:46:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):283 -> b
-    47:47:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):344:344 -> b
-    47:47:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):283 -> b
+    46:46:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):311 -> b
+    46:46:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):251 -> b
+    47:47:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):312:312 -> b
+    47:47:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):251 -> b
     48:48:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> b
-    48:48:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):345 -> b
-    48:48:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):283 -> b
-    49:51:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):348:350 -> b
-    49:51:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):283 -> b
-    52:52:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):341:341 -> b
-    52:52:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):283 -> b
-    53:53:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):286:286 -> b
+    48:48:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):313 -> b
+    48:48:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):251 -> b
+    49:51:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):316:318 -> b
+    49:51:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):251 -> b
+    52:52:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeNonInterfaceInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):309:309 -> b
+    52:52:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):251 -> b
+    53:53:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):254:254 -> b
     54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> b
-    54:54:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):286 -> b
-    55:68:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):288:301 -> b
-    69:86:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):290:307 -> b
-    87:90:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):355:358 -> b
-    87:90:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):308 -> b
-    91:94:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):310:313 -> b
-    95:110:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeInvokeVirtualDispatch(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):465:480 -> b
-    95:110:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):311 -> b
-    111:114:void lambda$computeDescription$4(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):296:299 -> b
-    115:123:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):363:371 -> b
+    54:54:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):254 -> b
+    55:68:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):256:269 -> b
+    69:86:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):258:275 -> b
+    87:90:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):323:326 -> b
+    87:90:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):276 -> b
+    91:94:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):278:281 -> b
+    95:110:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.computeInvokeVirtualDispatch(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):433:448 -> b
+    95:110:com.android.tools.r8.ir.desugar.DesugarDescription computeDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):279 -> b
+    111:114:void lambda$computeDescription$4(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):264:267 -> b
+    115:123:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):331:339 -> b
     124:124:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    124:124:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):881 -> b
-    124:124:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):373 -> b
-    125:125:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):881:881 -> b
-    125:125:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):373 -> b
-    126:184:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):383:441 -> b
-    185:185:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldRewriteToInvokeToThrow(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,boolean):843:843 -> b
-    185:185:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):441 -> b
-    186:204:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):442:460 -> b
-    205:205:void lambda$computeInvokeStatic$6(com.android.tools.r8.graph.ProgramMethod):386:386 -> b
-    206:208:java.util.Collection lambda$computeEmulatedInterfaceInvokeSpecial$19(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):805:807 -> b
-    209:236:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):848:875 -> b
+    124:124:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):849 -> b
+    124:124:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):341 -> b
+    125:125:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):849:849 -> b
+    125:125:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):341 -> b
+    126:184:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):351:409 -> b
+    185:185:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldRewriteToInvokeToThrow(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,boolean):811:811 -> b
+    185:185:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):409 -> b
+    186:204:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):410:428 -> b
+    205:205:void lambda$computeInvokeStatic$6(com.android.tools.r8.graph.ProgramMethod):354:354 -> b
+    206:208:java.util.Collection lambda$computeEmulatedInterfaceInvokeSpecial$19(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):773:775 -> b
+    209:236:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):816:843 -> b
     boolean lambda$getPostProcessingDesugaringD8$20(com.android.tools.r8.graph.ProgramMethod) -> c
-    1:5:void initializeEmulatedInterfaceVariables():160:164 -> c
-    6:6:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):188:188 -> c
-    6:6:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):177 -> c
-    6:6:void initializeEmulatedInterfaceVariables():163 -> c
-    7:9:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.AppView):193:195 -> c
-    7:9:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):188 -> c
-    7:9:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):177 -> c
-    7:9:void initializeEmulatedInterfaceVariables():163 -> c
-    10:15:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.AppView):194:199 -> c
-    10:15:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):188 -> c
-    10:15:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):177 -> c
-    10:15:void initializeEmulatedInterfaceVariables():163 -> c
-    16:16:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.AppView):198:198 -> c
-    16:16:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):188 -> c
-    16:16:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):177 -> c
-    16:16:void initializeEmulatedInterfaceVariables():163 -> c
-    17:17:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.AppView):193:193 -> c
-    17:17:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):188 -> c
-    17:17:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):177 -> c
-    17:17:void initializeEmulatedInterfaceVariables():163 -> c
-    18:22:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):178:182 -> c
-    18:22:void initializeEmulatedInterfaceVariables():163 -> c
-    23:23:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):181:181 -> c
-    23:23:void initializeEmulatedInterfaceVariables():163 -> c
-    24:24:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):178:178 -> c
-    24:24:void initializeEmulatedInterfaceVariables():163 -> c
-    25:29:void initializeEmulatedInterfaceVariables():165:169 -> c
-    30:34:java.util.Collection lambda$computeEmulatedInterfaceVirtualDispatchOrNull$11(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):495:495 -> c
-    35:36:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):654:655 -> c
-    37:37: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 -> c
-    37:37:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):655 -> c
-    38:45:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):660:667 -> c
-    46:46:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldRewriteToInvokeToThrow(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,boolean):843:843 -> c
-    46:46:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):667 -> c
-    47:50:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):668:671 -> c
-    51:51:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> c
-    51:51:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):671 -> c
-    52:107:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):681:736 -> c
-    1:1:java.util.Collection lambda$computeInvokeDirect$12(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):547:547 -> d
+    1:8:void initializeEmulatedInterfaceVariables():159:166 -> c
+    9:13:java.util.Collection lambda$computeEmulatedInterfaceVirtualDispatchOrNull$11(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):463:463 -> c
+    14:15:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):622:623 -> c
+    16:16: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 -> c
+    16:16:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):623 -> c
+    17:24:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):628:635 -> c
+    25:25:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldRewriteToInvokeToThrow(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,boolean):811:811 -> c
+    25:25:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):635 -> c
+    26:29:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):636:639 -> c
+    30:30:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> c
+    30:30:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):639 -> c
+    31:86:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):649:704 -> c
+    1:1:java.util.Collection lambda$computeInvokeDirect$12(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):515:515 -> d
     2:2:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> d
-    2:2:java.util.Collection lambda$computeInvokeDirect$12(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):548 -> d
-    3:5:java.util.Collection lambda$computeInvokeDirect$12(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):549:551 -> d
-    6:21:java.util.Collection lambda$computeInvokeDirect$12(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):550:565 -> d
-    22:26:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):618:622 -> d
+    2:2:java.util.Collection lambda$computeInvokeDirect$12(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):516 -> d
+    3:5:java.util.Collection lambda$computeInvokeDirect$12(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):517:519 -> d
+    6:21:java.util.Collection lambda$computeInvokeDirect$12(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):518:533 -> d
+    22:26:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):586:590 -> d
     27:27:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> d
-    27:27:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):622 -> d
-    28:31:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):621:624 -> d
-    1:4:java.util.Collection lambda$computeInvokeDirect$13(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):585:588 -> e
-    1:3:java.util.Collection lambda$computeInvokeStatic$10(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):456:458 -> f
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.Ut:
+    27:27:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):590 -> d
+    28:31:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):589:592 -> d
+    1:4:java.util.Collection lambda$computeInvokeDirect$13(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):553:556 -> e
+    1:3:java.util.Collection lambda$computeInvokeStatic$10(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):424:426 -> f
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.ot:
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor ExcludeDexResources -> c
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor IncludeAllResources -> b
-    1:3:void <clinit>():107:109 -> <clinit>
-    1:1:void <init>(java.lang.String,int):105:105 -> <init>
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.Wt:
+    1:3:void <clinit>():106:108 -> <clinit>
+    1:1:void <init>(java.lang.String,int):104:104 -> <init>
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.qt:
     com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens graphLens -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens):17:19 -> <init>
@@ -59541,14 +59185,14 @@
     13:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup.fixupDexMethodForEnclosingMethod(com.android.tools.r8.graph.DexMethod):53:58 -> a
     13:18:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):42 -> a
     13:18:void run():33 -> a
-    19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
+    19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
     19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup.fixupDexMethodForEnclosingMethod(com.android.tools.r8.graph.DexMethod):58 -> a
     19:19:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):42 -> a
     19:19:void run():33 -> a
     20:20:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):44:44 -> a
     20:20:void run():33 -> a
     21:21:void run():32:32 -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.internal.au:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.internal.ut:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> b
     java.util.Map postProcessingInterfaceInfos -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -59650,35 +59294,33 @@
     2:2:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():429:429 -> c
     2:2:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():260 -> c
     3:29:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():261:287 -> c
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.Yt:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.st:
     int $r8$clinit -> o
     com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap extraNewMethodSignatures -> n
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap):402:403 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):418:418 -> f
-    2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> f
-    2:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):419 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):419:419 -> f
-    4:4:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> f
-    4:4:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):418 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):418:418 -> f
-    1:1:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):424:424 -> g
-    2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):29:29 -> g
-    2:2:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):425 -> g
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):425:425 -> g
-    4:4:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):29:29 -> g
-    4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):424 -> g
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):424:424 -> g
-    1:1:com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap getExtraNewMethodSignatures():408:408 -> l
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.Xt:
+    1:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):418:419 -> e
+    3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> e
+    3:3:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):419 -> e
+    4:4:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):419:419 -> e
+    5:5:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):418:418 -> e
+    6:6:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> e
+    6:6:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):418 -> e
+    7:7:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):418:418 -> e
+    1:2:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):424:425 -> f
+    3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):29:29 -> f
+    3:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):425 -> f
+    4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):425:425 -> f
+    5:5:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):424:424 -> f
+    6:6:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):29:29 -> f
+    6:6:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):424 -> f
+    7:7:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):424:424 -> f
+    1:1:com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap getExtraNewMethodSignatures():408:408 -> n
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.rt:
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap extraNewMethodSignatures -> d
     1:3:void <init>():432:434 -> <init>
     1:4:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens build(com.android.tools.r8.graph.AppView):443:446 -> a
     1:1:void recordCodeMovedToCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):438:438 -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.Zt:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.tt:
     java.util.Map defaultMethodsToImplementation -> a
     java.util.Map methodsToMove -> b
     boolean hasNonClinitDirectMethods -> c
@@ -59695,94 +59337,89 @@
     1:1:boolean hasNonClinitDirectMethods():372:372 -> f
     1:1:void setHasBridgesToRemove():384:384 -> g
     1:1:void setHasNonClinitDirectMethods():376:376 -> h
-com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.zN:
+com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.qM:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> b
     java.util.Map emulatedInterfacesHierarchy -> c
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:8:void <init>(com.android.tools.r8.graph.AppView):50:57 -> <init>
-    1:6:java.util.Map processEmulatedInterfaceHierarchy():61:66 -> a
-    7:24:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):75:92 -> a
-    25:27:com.android.tools.r8.graph.DexProgramClass synthesizeProgramEmulatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):101:103 -> a
-    28:28:void lambda$synthesizeProgramEmulatedInterface$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):107:107 -> a
-    29:29:void lambda$synthesizeEmulateInterfaceMethods$2(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):117:117 -> a
-    30:30:void lambda$synthesizeEmulateInterfaceMethods$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):119:119 -> a
-    31:31:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135:135 -> a
-    32:35:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):142:145 -> a
-    32:35:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    36:42:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):163:169 -> a
-    36:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):147 -> a
-    36:42:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    43:43:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    43:43:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):170 -> a
-    43:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):147 -> a
-    43:43:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    44:46:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):171:173 -> a
-    44:46:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):147 -> a
-    44:46:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    47:55:boolean com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211:219 -> a
-    47:55:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):173 -> a
-    47:55:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):147 -> a
-    47:55:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    56:64:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):174:182 -> a
-    56:64:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):147 -> a
-    56:64:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    65:67:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2578:2580 -> a
-    65:67:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):182 -> a
-    65:67:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):147 -> a
-    65:67:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    68:68:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    68:68:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):183 -> a
-    68:68:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):147 -> a
-    68:68:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    69:69:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):178:178 -> a
-    69:69:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):147 -> a
-    69:69:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    70:97:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):174:201 -> a
-    70:97:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):147 -> a
-    70:97:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    98:98:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):200:200 -> a
-    98:98:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):147 -> a
-    98:98:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    99:106:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):198:205 -> a
-    99:106:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):147 -> a
-    99:106:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    107:113:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):148:154 -> a
-    107:113:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
-    114:114:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):227:227 -> a
-    115:115:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    115:115:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):227 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    116:127:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):227:238 -> a
-    128:128:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):248:248 -> a
-    128:128:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):231 -> a
-    129:129:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":133,"2":134,"3":135}}
-    133:133:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):248:248 -> a
-    133:133:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):231 -> a
-    134:134:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):248:248 -> a
-    134:134:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):231 -> a
-    135:135:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):248:248 -> a
-    135:135:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):231 -> a
-    130:132:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):251:253 -> a
-    130:132:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):231 -> a
-    136:136:boolean needsEmulateInterfaceLibrary(com.android.tools.r8.graph.DexClass):244:244 -> a
-    137:137:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    137:137:boolean needsEmulateInterfaceLibrary(com.android.tools.r8.graph.DexClass):244 -> a
-    1:10:void synthesizeEmulateInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):113:122 -> b
-    11:11:void synthesizeEmulateInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121:121 -> b
-    12:12:void synthesizeEmulateInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120:120 -> b
-    13:19:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):127:133 -> b
-com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.Vk:
+    1:1:void <clinit>():40:40 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.graph.AppView):54:61 -> <init>
+    1:6:java.util.Map processEmulatedInterfaceHierarchy():65:70 -> a
+    7:24:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):79:96 -> a
+    25:27:com.android.tools.r8.graph.DexProgramClass synthesizeProgramEmulatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):105:107 -> a
+    28:28:void lambda$synthesizeProgramEmulatedInterface$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):111:111 -> a
+    29:29:void lambda$synthesizeEmulateInterfaceMethods$2(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):121:121 -> a
+    30:30:void lambda$synthesizeEmulateInterfaceMethods$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.synthesis.SyntheticMethodBuilder):124:124 -> a
+    31:31:void lambda$synthesizeEmulateInterfaceMethods$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.synthesis.SyntheticMethodBuilder):123:123 -> a
+    32:44:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):143:155 -> a
+    45:51:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):244:250 -> a
+    45:51:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
+    52:52:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
+    52:52:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):251 -> a
+    52:52:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
+    53:55:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):252:254 -> a
+    53:55:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
+    56:64:boolean com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):292:300 -> a
+    56:64:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):254 -> a
+    56:64:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
+    65:73:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):255:263 -> a
+    65:73:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
+    74:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2578:2580 -> a
+    74:76:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):263 -> a
+    74:76:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
+    77:77:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
+    77:77:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):264 -> a
+    77:77:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
+    78:78:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):259:259 -> a
+    78:78:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
+    79:106:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):255:282 -> a
+    79:106:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
+    107:107:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):281:281 -> a
+    107:107:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
+    108:115:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.getDispatchCases(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):279:286 -> a
+    108:115:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
+    116:119:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):159:162 -> a
+    120:126:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.LinkedHashMap,com.android.tools.r8.graph.DexMethod):164:170 -> a
+    127:130:java.util.LinkedHashMap resolveDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):214:217 -> a
+    131:142:void lambda$resolveDispatchCases$5(java.util.LinkedHashMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):220:231 -> a
+    143:146:void lambda$resolveDispatchCases$5(java.util.LinkedHashMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):230:233 -> a
+    147:147:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):308:308 -> a
+    148:148:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    148:148:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):308 -> a
+    149:160:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):308:319 -> a
+    161:161:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):329:329 -> a
+    161:161:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):312 -> a
+    162:162:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":166,"2":167,"3":168}}
+    166:166:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):329:329 -> a
+    166:166:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):312 -> a
+    167:167:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):329:329 -> a
+    167:167:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):312 -> a
+    168:168:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):329:329 -> a
+    168:168:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):312 -> a
+    163:165:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):332:334 -> a
+    163:165:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):312 -> a
+    169:169:boolean needsEmulateInterfaceLibrary(com.android.tools.r8.graph.DexClass):325:325 -> a
+    170:170:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
+    170:170:boolean needsEmulateInterfaceLibrary(com.android.tools.r8.graph.DexClass):325 -> a
+    1:2:void synthesizeEmulateInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):117:118 -> b
+    3:13:void synthesizeEmulatedInterfaceMethodFromMachineSpecification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):178:188 -> b
+    14:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.emulatedMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.graph.DexType):128:130 -> b
+    14:16:void synthesizeEmulatedInterfaceMethodFromMachineSpecification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):188 -> b
+    17:17:void synthesizeEmulatedInterfaceMethodFromMachineSpecification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):189:189 -> b
+    18:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.interfaceMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):134:135 -> b
+    18:19:void synthesizeEmulatedInterfaceMethodFromMachineSpecification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):189 -> b
+    20:30:void synthesizeEmulatedInterfaceMethodFromMachineSpecification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):191:201 -> b
+    31:37:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethodFromMachineSpecification$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.LinkedHashMap,com.android.tools.r8.graph.DexMethod):203:209 -> b
+com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.zk:
     void lambda$emptyForcefullyMovedLambdaMethodConsumer$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod) -> a
     1:1:com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer emptyForcefullyMovedLambdaMethodConsumer():14:14 -> a
     void acceptForcefullyMovedLambdaMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod) -> b
-com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover -> com.android.tools.r8.internal.bB:
+com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover -> com.android.tools.r8.internal.kA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:4:void run(com.android.tools.r8.graph.AppView,java.util.Collection):24:27 -> a
-com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.android.tools.r8.internal.dB:
+com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.android.tools.r8.internal.mA:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set directTargetedLambdaImplementationMethods -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView):54:54 -> <init>
@@ -59816,7 +59453,7 @@
     78:79:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):183 -> a
     80:80:boolean com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring.isLambdaInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):189:189 -> a
     80:80:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):183 -> a
-com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke -> com.android.tools.r8.internal.cB:
+com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke -> com.android.tools.r8.internal.lA:
     java.util.Collection desugarInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator) -> a
 com.android.tools.r8.ir.desugar.nest.AccessBridgeFactory -> com.android.tools.r8.internal.u1:
     boolean $assertionsDisabled -> a
@@ -59826,11 +59463,9 @@
     27:35:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):32:40 -> a
     36:36:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedField.getApiLevel():112:112 -> a
     36:36:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):40 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     37:38:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):40:41 -> a
     39:39:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedField.getApiLevel():112:112 -> a
     39:39:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):41 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:41:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):41:42 -> a
     42:54:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):47:59 -> a
     55:55:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.setConstructorTarget(com.android.tools.r8.graph.DexMethod):125:125 -> a
@@ -59843,7 +59478,7 @@
     27:31:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):86:90 -> b
     32:43:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):83:94 -> b
     44:44:void lambda$createMethodAccessorBridge$1(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):89:89 -> b
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.we:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.Xd:
     1:1:void <init>(com.android.tools.r8.graph.AppView):36:36 -> <init>
     void lambda$clearNestAttributes$3(com.android.tools.r8.graph.DexClass) -> a
     1:2:void lambda$clearNestAttributes$2(com.android.tools.r8.ir.desugar.nest.Nest):61:62 -> a
@@ -59859,68 +59494,54 @@
     31:31:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):106:106 -> a
     32:32:void com.android.tools.r8.graph.DexClasspathClass.forEachClasspathMethod(java.util.function.Consumer):76:76 -> a
     32:32:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):106 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:33:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108:108 -> a
     34:36:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):17:19 -> a
     34:36:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     37:37:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
     37:37:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):20 -> a
     37:37:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     38:38:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):22:22 -> a
     38:38:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:8:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):42:49 -> b
     9:9:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):43:43 -> b
     10:10:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54:54 -> b
-    11:11:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):940:940 -> b
-    11:11:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:12:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> b
-    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):942 -> b
-    12:12:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):942:942 -> b
-    13:13:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):946:946 -> b
-    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):942 -> b
+    11:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):950:952 -> b
+    11:13:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
+    14:14:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> b
+    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):952 -> b
     14:14:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    15:15:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":20,"2":21,"3":22}}
-    20:20:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):947:947 -> b
-    20:20:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):942 -> b
-    20:20:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    21:21:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):947:947 -> b
-    21:21:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):942 -> b
-    21:21:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    22:22:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):947:947 -> b
-    22:22:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):942 -> b
+    15:15:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):952:952 -> b
+    15:15:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
+    16:16:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):956:956 -> b
+    16:16:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):952 -> b
+    16:16:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
+    17:17:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":22,"2":23,"3":24}}
+    22:22:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):957:957 -> b
+    22:22:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):952 -> b
     22:22:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    16:17:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):947:948 -> b
-    16:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):942 -> b
-    16:17:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    18:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):942:942 -> b
-    18:18:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):940:940 -> b
-    19:19:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    23:23:void clearNestAttributes():59:59 -> b
+    23:23:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):957:957 -> b
+    23:23:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):952 -> b
+    23:23:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
+    24:24:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):957:957 -> b
+    24:24:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):952 -> b
+    24:24:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
+    18:19:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):957:958 -> b
+    18:19:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):952 -> b
+    18:19:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
+    20:20:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):952:952 -> b
+    20:20:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
+    21:21:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):950:950 -> b
+    21:21:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
+    25:25:void clearNestAttributes():59:59 -> b
     1:1:void reportDesugarDependencies():40:40 -> c
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.ue:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.Vd:
     com.android.tools.r8.ir.conversion.MethodProcessor val$methodProcessor -> a
     1:1:void <init>(com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring,com.android.tools.r8.ir.conversion.MethodProcessor):81:81 -> <init>
     1:1:void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):85:85 -> b
     1:1:void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):95:95 -> c
     1:1:void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):90:90 -> d
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.ve:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.Wd:
     com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring this$0 -> f
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer eventConsumer -> e
     1:3:void <init>(com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring,com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):117:119 -> <init>
@@ -59952,7 +59573,7 @@
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> h
     6:6:void registerInvoke(com.android.tools.r8.graph.DexMethod):135 -> h
     7:9:void registerInvoke(com.android.tools.r8.graph.DexMethod):135:137 -> h
-com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.QG:
+com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.NF:
     com.android.tools.r8.graph.DexClass hostClass -> a
     java.util.List members -> b
     java.util.List missingMembers -> c
@@ -59966,7 +59587,7 @@
     1:1:java.util.List getMembers():69:69 -> c
     1:1:java.util.List getMissingMembers():73:73 -> d
     1:1:boolean hasMissingMembers():81:81 -> e
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.tools.r8.internal.SG:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.tools.r8.internal.PF:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map syntheticNestConstructorTypes -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -60014,10 +59635,9 @@
     void lambda$getMethodBridgeReference$5(com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder) -> a
     void lambda$getMethodBridgeReference$6(com.android.tools.r8.graph.DexClasspathClass) -> a
     60:60:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):78:78 -> a
-    61:61:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1835:1835 -> a
-    61:61:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():518 -> a
+    61:61:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1857:1857 -> a
+    61:61:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():519 -> a
     61:61:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):78 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     62:64:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):79:81 -> a
     65:73:void forEachNest(java.util.function.Consumer,java.util.function.Consumer):91:99 -> a
     74:78:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):130:134 -> a
@@ -60148,7 +59768,6 @@
     286:286:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):466:466 -> a
     287:287:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
     287:287:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):466 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     288:291:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):469:472 -> a
     292:295:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getMethodBridgeName(com.android.tools.r8.graph.DexClassAndMethod):477:480 -> a
     292:295:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):472 -> a
@@ -60175,7 +59794,7 @@
     318:318:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$7(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):453 -> a
     319:324:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$7(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):453:458 -> a
     325:331:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$7(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):456:462 -> a
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -> com.android.tools.r8.internal.RG:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -> com.android.tools.r8.internal.OF:
     com.android.tools.r8.graph.DexClassAndMember target -> b
     com.android.tools.r8.graph.DexMethod bridge -> a
     boolean $assertionsDisabled -> c
@@ -60184,11 +59803,11 @@
     1:1:com.android.tools.r8.graph.DexMethod getBridge():115:115 -> a
     1:1:com.android.tools.r8.graph.DexClassAndMember getTarget():119:119 -> b
     1:1:boolean shouldAddBridge():123:123 -> c
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.TG:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.QF:
     void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod) -> b
     void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> c
     void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.internal.FQ:
+com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.internal.pP:
     1:17:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):52:68 -> a
     18:21:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):66:69 -> a
     22:36:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):64:78 -> a
@@ -60230,27 +59849,31 @@
     296:507:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):106:317 -> b
     508:508:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> b
     508:508:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):317 -> b
-com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter -> com.android.tools.r8.internal.GQ:
+com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter -> com.android.tools.r8.internal.qP:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):42:43 -> <init>
     1:2:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):34:35 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     3:3:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):35 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:5:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):36:37 -> a
     6:6:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):49:49 -> a
     7:7:boolean com.android.tools.r8.ir.desugar.records.RecordRewriterHelper.isInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):28:28 -> a
     7:7:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):49 -> a
     8:14:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):52:58 -> a
     15:17:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):57:59 -> a
-    18:30:com.android.tools.r8.graph.DexField[] com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter.computePresentFields(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic):66:78 -> a
-    18:30:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):59 -> a
-    31:31:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):61:61 -> a
-    32:47:com.android.tools.r8.cf.code.CfInvokeDynamic com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter.writeRecordInvokeDynamic(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic):84:99 -> a
-    32:47:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):60 -> a
-    48:48:com.android.tools.r8.cf.code.CfInvokeDynamic com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter.writeRecordInvokeDynamic(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic):97:97 -> a
-    48:48:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):60 -> a
-com.android.tools.r8.ir.desugar.records.RecordDesugaring -> com.android.tools.r8.internal.KQ:
+    18:23:com.android.tools.r8.graph.DexField[] com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter.computePresentFields(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic):66:71 -> a
+    18:23:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):59 -> a
+    24:24:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    24:24:com.android.tools.r8.graph.DexField[] com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter.computePresentFields(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic):71 -> a
+    24:24:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):59 -> a
+    25:32:com.android.tools.r8.graph.DexField[] com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter.computePresentFields(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic):71:78 -> a
+    25:32:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):59 -> a
+    33:33:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):61:61 -> a
+    34:49:com.android.tools.r8.cf.code.CfInvokeDynamic com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter.writeRecordInvokeDynamic(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic):84:99 -> a
+    34:49:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):60 -> a
+    50:50:com.android.tools.r8.cf.code.CfInvokeDynamic com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter.writeRecordInvokeDynamic(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic):97:97 -> a
+    50:50:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):60 -> a
+com.android.tools.r8.ir.desugar.records.RecordDesugaring -> com.android.tools.r8.internal.uP:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto recordToStringHelperProto -> c
@@ -60397,9 +60020,9 @@
     10:12:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):333 -> b
     13:23:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):334:344 -> b
     24:37:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):341:354 -> b
-com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.LQ:
+com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.vP:
     void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter -> com.android.tools.r8.internal.RQ:
+com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter -> com.android.tools.r8.internal.AP:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.conversion.IRConverter irConverter -> b
@@ -60421,38 +60044,47 @@
     26:34:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):95 -> a
     26:34:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
     26:34:void rewriteRecordFieldValues():61 -> a
-    35:35:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfo.resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):232:232 -> a
+    35:35:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
     35:35:java.util.List com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.computePresentFields(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.graph.ProgramMethod):167 -> a
     35:35:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):95 -> a
     35:35:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
     35:35:void rewriteRecordFieldValues():61 -> a
-    36:37:java.util.List com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.computePresentFields(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.graph.ProgramMethod):168:169 -> a
-    36:37:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):95 -> a
-    36:37:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
-    36:37:void rewriteRecordFieldValues():61 -> a
-    38:38:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):96:96 -> a
-    38:38:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
-    38:38:void rewriteRecordFieldValues():61 -> a
-    39:39:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1150:1150 -> a
-    39:39:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):96 -> a
-    39:39:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
-    39:39:void rewriteRecordFieldValues():61 -> a
-    40:52:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):98:110 -> a
-    40:52:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
-    40:52:void rewriteRecordFieldValues():61 -> a
-    53:53:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1150:1150 -> a
-    53:53:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):111 -> a
-    53:53:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
-    53:53:void rewriteRecordFieldValues():61 -> a
-    54:66:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):112:124 -> a
-    54:66:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
-    54:66:void rewriteRecordFieldValues():61 -> a
-    67:69:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):85:87 -> a
-    67:69:void rewriteRecordFieldValues():61 -> a
-    70:70:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):86:86 -> a
-    70:70:void rewriteRecordFieldValues():61 -> a
-    71:88:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):133:150 -> a
-com.android.tools.r8.ir.desugar.records.RecordRewriterHelper -> com.android.tools.r8.internal.UQ:
+    36:36:java.util.List com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.computePresentFields(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.graph.ProgramMethod):167:167 -> a
+    36:36:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):95 -> a
+    36:36:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
+    36:36:void rewriteRecordFieldValues():61 -> a
+    37:37:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfo.resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):232:232 -> a
+    37:37:java.util.List com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.computePresentFields(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.graph.ProgramMethod):167 -> a
+    37:37:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):95 -> a
+    37:37:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
+    37:37:void rewriteRecordFieldValues():61 -> a
+    38:39:java.util.List com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.computePresentFields(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.graph.ProgramMethod):168:169 -> a
+    38:39:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):95 -> a
+    38:39:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
+    38:39:void rewriteRecordFieldValues():61 -> a
+    40:40:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):96:96 -> a
+    40:40:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
+    40:40:void rewriteRecordFieldValues():61 -> a
+    41:41:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1174:1174 -> a
+    41:41:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):96 -> a
+    41:41:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
+    41:41:void rewriteRecordFieldValues():61 -> a
+    42:54:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):98:110 -> a
+    42:54:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
+    42:54:void rewriteRecordFieldValues():61 -> a
+    55:55:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1174:1174 -> a
+    55:55:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):111 -> a
+    55:55:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
+    55:55:void rewriteRecordFieldValues():61 -> a
+    56:68:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldArray(com.android.tools.r8.ir.code.RecordFieldValues,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):112:124 -> a
+    56:68:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):79 -> a
+    56:68:void rewriteRecordFieldValues():61 -> a
+    69:71:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):85:87 -> a
+    69:71:void rewriteRecordFieldValues():61 -> a
+    72:72:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):86:86 -> a
+    72:72:void rewriteRecordFieldValues():61 -> a
+    73:90:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):133:150 -> a
+com.android.tools.r8.ir.desugar.records.RecordRewriterHelper -> com.android.tools.r8.internal.CP:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:31:boolean isInvokeDynamicOnRecord(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):33:63 -> a
@@ -60468,8 +60100,7 @@
     74:74:boolean com.android.tools.r8.ir.desugar.records.RecordRewriterHelper.isInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):28:28 -> a
     74:74:com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic parseInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):106 -> a
     75:87:com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic parseInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):106:118 -> a
-com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$1 -> com.android.tools.r8.internal.SQ:
-com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic -> com.android.tools.r8.internal.TQ:
+com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic -> com.android.tools.r8.internal.BP:
     com.android.tools.r8.graph.DexString methodName -> a
     com.android.tools.r8.graph.DexString fieldNames -> c
     com.android.tools.r8.graph.DexField[] fields -> d
@@ -60489,7 +60120,7 @@
     1:1:com.android.tools.r8.graph.DexProto getMethodProto():168:168 -> e
     1:1:com.android.tools.r8.graph.DexProgramClass getRecordClass():156:156 -> f
     1:1:com.android.tools.r8.graph.DexType getRecordType():152:152 -> g
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.GX:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.bW:
     com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> b
     java.util.Map paramTypeToAppendMethod -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
@@ -60505,92 +60136,92 @@
     20:27:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcat(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator):112:119 -> a
     20:27:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):90 -> a
     28:28:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):92:92 -> a
-    29:30:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):127:128 -> a
-    29:30:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    31:31:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
-    31:31:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):129 -> a
-    31:31:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    32:65:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):130:163 -> a
-    32:65:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    66:78:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):162:174 -> a
-    66:78:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    79:79:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):171:171 -> a
-    79:79:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    80:94:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):167:181 -> a
-    80:94:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    95:96:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):241:242 -> a
-    95:96:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):181 -> a
-    95:96:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    97:97:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):181:181 -> a
-    97:97:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    98:98:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":154,"2":155,"3":156}}
-    154:154:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):244:244 -> a
-    154:154:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):181 -> a
-    154:154:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    29:31:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):127:129 -> a
+    29:31:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    32:32:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
+    32:32:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):129 -> a
+    32:32:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    33:66:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):130:163 -> a
+    33:66:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    67:79:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):162:174 -> a
+    67:79:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    80:80:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):171:171 -> a
+    80:80:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    81:95:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):167:181 -> a
+    81:95:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    96:97:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):241:242 -> a
+    96:97:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):181 -> a
+    96:97:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    98:98:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):181:181 -> a
+    98:98:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    99:99:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":155,"2":156,"3":157}}
     155:155:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):244:244 -> a
     155:155:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):181 -> a
     155:155:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
     156:156:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):244:244 -> a
     156:156:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):181 -> a
     156:156:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    99:99:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):246:246 -> a
-    99:99:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):181 -> a
-    99:99:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    100:100:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):244:244 -> a
+    157:157:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):244:244 -> a
+    157:157:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):181 -> a
+    157:157:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    100:100:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):246:246 -> a
     100:100:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):181 -> a
     100:100:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    101:134:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):179:212 -> a
-    101:134:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    135:140:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):211:216 -> a
-    135:140:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    141:141:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":157,"2":158,"3":159}}
-    157:157:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):198:198 -> a
-    157:157:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    101:101:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):244:244 -> a
+    101:101:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):181 -> a
+    101:101:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    102:135:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):179:212 -> a
+    102:135:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    136:141:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):211:216 -> a
+    136:141:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    142:142:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":158,"2":159,"3":160}}
     158:158:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):198:198 -> a
     158:158:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
     159:159:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):198:198 -> a
     159:159:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    142:145:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):202:205 -> a
-    142:145:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    146:146:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):198:198 -> a
-    146:146:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    147:147:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":160,"2":161,"3":162}}
-    160:160:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):188:188 -> a
+    160:160:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):198:198 -> a
     160:160:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    143:146:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):202:205 -> a
+    143:146:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    147:147:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):198:198 -> a
+    147:147:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    148:148:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":161,"2":162,"3":163}}
     161:161:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):188:188 -> a
     161:161:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
     162:162:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):188:188 -> a
     162:162:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    148:150:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):192:194 -> a
-    148:150:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    151:151:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):188:188 -> a
-    151:151:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    152:152:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):140:140 -> a
+    163:163:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):188:188 -> a
+    163:163:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    149:151:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):192:194 -> a
+    149:151:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    152:152:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):188:188 -> a
     152:152:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    153:153:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):134:134 -> a
+    153:153:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):140:140 -> a
     153:153:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    163:163:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):221:221 -> a
-    164:173:boolean com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.isStringConcatInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.DexItemFactory):225:234 -> a
-    164:173:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):221 -> a
-    174:174:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):420:420 -> a
-    175:175:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":599,"2":600,"3":601}}
-    599:599:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):420:420 -> a
+    154:154:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):134:134 -> a
+    154:154:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):93 -> a
+    164:164:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):221:221 -> a
+    165:174:boolean com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.isStringConcatInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.DexItemFactory):225:234 -> a
+    165:174:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):221 -> a
+    175:175:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):420:420 -> a
+    176:176:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":600,"2":601,"3":602}}
     600:600:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):420:420 -> a
     601:601:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):420:420 -> a
-    597:597:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):422:422 -> a
-    598:598:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    598:598:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):422 -> a
+    602:602:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):420:420 -> a
+    598:598:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):422:422 -> a
+    599:599:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    599:599:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):422 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):49:49 -> b
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.CX:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.XV:
     int variableIndex -> c
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,int):376:377 -> <init>
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk asArgumentChunk() -> a
     1:1:int getVariableIndex():381:381 -> d
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.DX:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.YV:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:1:void <clinit>():337:337 -> <clinit>
@@ -60601,9 +60232,8 @@
     1:1:com.android.tools.r8.ir.code.ValueType getValueType():350:350 -> c
     2:2:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> c
     2:2:com.android.tools.r8.ir.code.ValueType getValueType():350 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:com.android.tools.r8.ir.code.ValueType getValueType():350:351 -> c
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.EX:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.ZV:
     java.util.List chunks -> a
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring this$0 -> e
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk biggestArgumentChunk -> b
@@ -60629,12 +60259,12 @@
     37:37:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):312 -> a
     38:54:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):312:328 -> a
     55:59:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):326:330 -> a
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.FX:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.aW:
     com.android.tools.r8.graph.DexString stringConstant -> c
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):400:401 -> <init>
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk asConstantChunk() -> b
     1:1:com.android.tools.r8.graph.DexString getStringConstant():405:405 -> d
-com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tools.r8.internal.j00:
+com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tools.r8.internal.zY:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto twrCloseResourceProto -> c
@@ -60706,7 +60336,7 @@
     1:4:java.util.Collection rewriteTwrGetSuppressedInvoke(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):96:99 -> b
     5:13:java.util.Collection rewriteTwrGetSuppressedInvoke(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):98:106 -> b
     14:14:java.util.Collection rewriteTwrGetSuppressedInvoke(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):100:100 -> b
-com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.internal.z3:
+com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.internal.x3:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.AssertionsConfiguration$AssertionTransformation defaultTransformation -> c
@@ -60728,7 +60358,6 @@
     63:64:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForType(com.android.tools.r8.graph.DexType):123:124 -> a
     65:70:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):466:471 -> a
     65:70:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForType(com.android.tools.r8.graph.DexType):124 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     71:73:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForType(com.android.tools.r8.graph.DexType):125:127 -> a
     74:74:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
     74:74:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForType(com.android.tools.r8.graph.DexType):127 -> a
@@ -60739,7 +60368,7 @@
     93:93:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     94:112:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:332 -> a
     94:112:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    113:113:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    113:113:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     113:113:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334 -> a
     113:113:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     114:119:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335:340 -> a
@@ -60747,49 +60376,49 @@
     120:133:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):378:391 -> a
     120:133:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     120:133:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    134:134:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():23:23 -> a
+    134:134:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():24:24 -> a
     134:134:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):392 -> a
     134:134:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     134:134:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     135:136:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):393:394 -> a
     135:136:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     135:136:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    137:137:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():23:23 -> a
+    137:137:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():24:24 -> a
     137:137:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):396 -> a
     137:137:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     137:137:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     138:138:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):397:397 -> a
     138:138:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     138:138:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    139:139:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():23:23 -> a
+    139:139:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():24:24 -> a
     139:139:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):398 -> a
     139:139:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     139:139:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     140:142:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):399:401 -> a
     140:142:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     140:142:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    143:143:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1150:1150 -> a
+    143:143:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1174:1174 -> a
     143:143:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):402 -> a
     143:143:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     143:143:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    144:144:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    144:144:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     144:144:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):402 -> a
     144:144:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     144:144:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     145:145:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):406:406 -> a
     145:145:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     145:145:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    146:146:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1150:1150 -> a
+    146:146:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1174:1174 -> a
     146:146:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):406 -> a
     146:146:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     146:146:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    147:147:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    147:147:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     147:147:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):405 -> a
     147:147:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     147:147:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     148:148:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343:343 -> a
     148:148:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    149:149:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    149:149:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     149:149:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343 -> a
     149:149:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     150:154:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):346:350 -> a
@@ -60801,21 +60430,21 @@
     156:163:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     164:164:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):358:358 -> a
     164:164:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    165:165:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    165:165:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     165:165:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):357 -> a
     165:165:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     166:170:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):363:367 -> a
     166:170:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     171:171:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365:365 -> a
     171:171:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    172:172:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    172:172:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     172:172:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):364 -> a
     172:172:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     173:173:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):308:308 -> a
-com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.internal.x3:
+com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.internal.v3:
     int[] $SwitchMap$com$android$tools$r8$AssertionsConfiguration$AssertionTransformationScope -> a
     1:1:void <clinit>():41:41 -> <clinit>
-com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.internal.y3:
+com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.internal.w3:
     com.android.tools.r8.graph.DexString value -> b
     com.android.tools.r8.AssertionsConfiguration entry -> a
     1:1:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.AssertionsRewriter$1):33:33 -> <init>
@@ -60837,7 +60466,7 @@
     155:155:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):47:47 -> <init>
     1:1:com.android.tools.r8.AssertionsConfiguration access$000(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):33:33 -> a
     1:1:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):33:33 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal.R3:
+com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal.O3:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():62:62 -> <clinit>
@@ -60880,145 +60509,140 @@
     57:73:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):165 -> a
     74:74:boolean com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.isNonNull():64:64 -> a
     74:74:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesForFieldGet(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):300 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     74:74:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):165 -> a
     75:81:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesForFieldGet(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):301:307 -> a
     75:81:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):165 -> a
     82:82:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesForFieldGet(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):306:306 -> a
     82:82:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):165 -> a
-    83:87:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):174:178 -> a
-    88:88:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.peekPrevious():28:28 -> a
-    88:88:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):179 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    89:99:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):179:189 -> a
-    100:100:boolean com.android.tools.r8.ir.code.If.isNullTest():93:93 -> a
-    100:100:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():97 -> a
-    100:100:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):190 -> a
-    101:101:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():97:97 -> a
+    83:88:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):174:179 -> a
+    89:89:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.peekPrevious():28:28 -> a
+    89:89:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):179 -> a
+    90:100:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):179:189 -> a
+    101:101:boolean com.android.tools.r8.ir.code.If.isNullTest():93:93 -> a
+    101:101:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():97 -> a
     101:101:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):190 -> a
-    102:106:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):191:195 -> a
-    107:113:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):202:208 -> a
-    114:120:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesFromArrayClone(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):217:223 -> a
-    114:120:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):209 -> a
-    121:121:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    121:121:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65 -> a
-    121:121:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesFromArrayClone(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):223 -> a
-    121:121:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):209 -> a
-    122:122:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65:65 -> a
+    102:102:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():97:97 -> a
+    102:102:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):190 -> a
+    103:107:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):191:195 -> a
+    108:114:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):202:208 -> a
+    115:121:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesFromArrayClone(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):217:223 -> a
+    115:121:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):209 -> a
+    122:122:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    122:122:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65 -> a
     122:122:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesFromArrayClone(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):223 -> a
     122:122:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):209 -> a
-    123:123:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesFromArrayClone(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):224:224 -> a
+    123:123:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65:65 -> a
+    123:123:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesFromArrayClone(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):223 -> a
     123:123:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):209 -> a
-    124:124:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):212:212 -> a
-    125:148:boolean computeAssumedValuesForOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):314:337 -> a
-    149:149:void removeRedundantAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):344:344 -> a
-    150:153:java.util.Map computeDominanceForAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):384:387 -> a
-    154:156:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):390:392 -> a
-    157:157:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():700:700 -> a
-    157:157:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isSubsumedBy(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):733 -> a
-    157:157:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):394 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    158:158:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isSubsumedBy(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):733:733 -> a
-    158:158:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):394 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    159:159:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():954:954 -> a
-    159:159:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.redundant():945 -> a
-    159:159:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):397 -> a
-    160:160:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):737:737 -> a
-    160:160:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):401 -> a
-    161:161:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():729:729 -> a
-    161:161:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):738 -> a
-    161:161:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):401 -> a
-    162:162:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():700:700 -> a
-    162:162:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):740 -> a
-    162:162:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):401 -> a
-    163:163:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):708:708 -> a
-    163:163:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):741 -> a
-    163:163:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):401 -> a
-    164:164:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):406:406 -> a
-    165:165:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():933:933 -> a
-    165:165:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):407 -> a
-    166:182:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):414:430 -> a
-    183:183:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everythingElse():937:937 -> a
-    183:183:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):436 -> a
-    184:188:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):626:630 -> a
-    184:188:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):441 -> a
-    189:189:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":686,"2":687,"3":688}}
-    686:686:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    686:686:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):441 -> a
-    687:687:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    687:687:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):441 -> a
-    688:688:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    688:688:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):441 -> a
-    632:635:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):443:443 -> a
-    642:644:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):450:452 -> a
-    645:645:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.builder(com.android.tools.r8.ir.code.Value):929:929 -> a
-    645:645:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):455 -> a
-    646:664:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):456:474 -> a
-    665:670:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):638:643 -> a
-    665:670:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):476 -> a
-    671:671:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    671:671:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):643 -> a
-    671:671:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):476 -> a
-    672:680:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):645:653 -> a
-    672:680:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):476 -> a
-    681:685:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):477:481 -> a
-    689:689:java.util.Set lambda$computeDominanceForAssumedValues$3(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):453:453 -> a
-    690:690:java.util.Map lambda$computeDominanceForAssumedValues$5(com.android.tools.r8.ir.code.Instruction):470:470 -> a
-    691:691:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):524:524 -> a
-    692:692:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
-    692:692:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):524 -> a
-    693:699:void lambda$materializeAssumeInstructions$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):533:539 -> a
-    700:700:void materializeSelectedAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Set,java.util.Map,java.util.function.Predicate):554:554 -> a
-    701:705:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):556:560 -> a
-    706:710:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):626:630 -> a
-    706:710:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
-    711:711:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":778,"2":779,"3":780}}
-    778:778:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    778:778:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
-    779:779:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    779:779:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
-    780:780:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    780:780:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
-    712:712:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDominance():692:692 -> a
-    712:712:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):563 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    713:714:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():720:721 -> a
-    713:714:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):565 -> a
-    715:720:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):566:571 -> a
-    721:726:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):567:572 -> a
-    727:727:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
-    727:727:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):572 -> a
-    728:728:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):573:573 -> a
-    729:729:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverythingElse():0:0 -> a
-    729:729:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):574 -> a
-    730:731:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):575:576 -> a
-    732:732:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isSomething():0:0 -> a
-    732:732:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):577 -> a
-    733:750:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):578:595 -> a
-    751:756:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):592:597 -> a
-    757:758:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():720:721 -> a
-    757:758:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):600 -> a
-    759:777:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):601:619 -> a
-    781:786:void lambda$materializeSelectedAssumeInstructions$11(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):583:588 -> a
-    787:787:java.util.Map lambda$materializeSelectedAssumeInstructions$12(com.android.tools.r8.ir.code.BasicBlock):617:617 -> a
-    788:789:boolean com.android.tools.r8.ir.optimize.AssumeInserter.isNullableReferenceType(com.android.tools.r8.ir.code.Value):662:663 -> a
-    788:789:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):668 -> a
-    790:793:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):669:672 -> a
-    794:794:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():700:700 -> a
-    794:794:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):347 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    795:803:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):351:359 -> a
-    804:805:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.getAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):798:799 -> a
-    804:805:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):365 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    806:806:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):370:370 -> a
-    807:807:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDynamicTypeAssumption():704:704 -> a
-    807:807:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):374 -> a
-    808:808:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):708:708 -> a
-    808:808:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):373 -> a
+    124:124:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesFromArrayClone(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):224:224 -> a
+    124:124:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):209 -> a
+    125:125:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):212:212 -> a
+    126:149:boolean computeAssumedValuesForOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):314:337 -> a
+    150:150:void removeRedundantAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):344:344 -> a
+    151:151:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):347:347 -> a
+    152:152:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():700:700 -> a
+    152:152:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):347 -> a
+    153:167:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):351:365 -> a
+    168:169:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.getAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):798:799 -> a
+    168:169:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):365 -> a
+    170:170:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):370:370 -> a
+    171:171:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDynamicTypeAssumption():704:704 -> a
+    171:171:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):374 -> a
+    172:172:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):708:708 -> a
+    172:172:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):373 -> a
+    173:176:java.util.Map computeDominanceForAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):384:387 -> a
+    177:181:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):390:394 -> a
+    182:182:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():700:700 -> a
+    182:182:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isSubsumedBy(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):733 -> a
+    182:182:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):394 -> a
+    183:183:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isSubsumedBy(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):733:733 -> a
+    183:183:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):394 -> a
+    184:184:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():954:954 -> a
+    184:184:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.redundant():945 -> a
+    184:184:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):397 -> a
+    185:185:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):737:737 -> a
+    185:185:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):401 -> a
+    186:186:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():729:729 -> a
+    186:186:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):738 -> a
+    186:186:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):401 -> a
+    187:187:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():700:700 -> a
+    187:187:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):740 -> a
+    187:187:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):401 -> a
+    188:188:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):708:708 -> a
+    188:188:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):741 -> a
+    188:188:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):401 -> a
+    189:189:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):406:406 -> a
+    190:190:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():933:933 -> a
+    190:190:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):407 -> a
+    191:207:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):414:430 -> a
+    208:208:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everythingElse():937:937 -> a
+    208:208:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):436 -> a
+    209:213:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):626:630 -> a
+    209:213:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):441 -> a
+    214:214:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":711,"2":712,"3":713}}
+    711:711:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
+    711:711:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):441 -> a
+    712:712:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
+    712:712:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):441 -> a
+    713:713:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
+    713:713:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):441 -> a
+    657:660:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):443:443 -> a
+    667:669:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):450:452 -> a
+    670:670:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.builder(com.android.tools.r8.ir.code.Value):929:929 -> a
+    670:670:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):455 -> a
+    671:689:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):456:474 -> a
+    690:695:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):638:643 -> a
+    690:695:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):476 -> a
+    696:696:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    696:696:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):643 -> a
+    696:696:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):476 -> a
+    697:705:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):645:653 -> a
+    697:705:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):476 -> a
+    706:710:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):477:481 -> a
+    714:714:java.util.Set lambda$computeDominanceForAssumedValues$3(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):453:453 -> a
+    715:715:java.util.Map lambda$computeDominanceForAssumedValues$5(com.android.tools.r8.ir.code.Instruction):470:470 -> a
+    716:716:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):524:524 -> a
+    717:717:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
+    717:717:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):524 -> a
+    718:724:void lambda$materializeAssumeInstructions$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):533:539 -> a
+    725:725:void materializeSelectedAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Set,java.util.Map,java.util.function.Predicate):554:554 -> a
+    726:730:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):556:560 -> a
+    731:735:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):626:630 -> a
+    731:735:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
+    736:736:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1366,"2":1367,"3":1368}}
+    1366:1366:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
+    1366:1366:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
+    1367:1367:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
+    1367:1367:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
+    1368:1368:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
+    1368:1368:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
+    1299:1299:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):563:563 -> a
+    1300:1300:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDominance():692:692 -> a
+    1300:1300:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):563 -> a
+    1301:1302:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():720:721 -> a
+    1301:1302:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):565 -> a
+    1303:1308:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):566:571 -> a
+    1309:1314:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):567:572 -> a
+    1315:1315:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
+    1315:1315:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):572 -> a
+    1316:1316:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):573:573 -> a
+    1317:1317:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverythingElse():0:0 -> a
+    1317:1317:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):574 -> a
+    1318:1319:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):575:576 -> a
+    1320:1320:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isSomething():0:0 -> a
+    1320:1320:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):577 -> a
+    1321:1338:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):578:595 -> a
+    1339:1344:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):592:597 -> a
+    1345:1346:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():720:721 -> a
+    1345:1346:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):600 -> a
+    1347:1365:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):601:619 -> a
+    1369:1374:void lambda$materializeSelectedAssumeInstructions$11(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):583:588 -> a
+    1375:1375:java.util.Map lambda$materializeSelectedAssumeInstructions$12(com.android.tools.r8.ir.code.BasicBlock):617:617 -> a
+    1376:1377:boolean com.android.tools.r8.ir.optimize.AssumeInserter.isNullableReferenceType(com.android.tools.r8.ir.code.Value):662:663 -> a
+    1376:1377:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):668 -> a
+    1378:1381:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):669:672 -> a
     boolean lambda$materializeSelectedAssumeInstructions$10(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
     1:12:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):230:241 -> b
     13:20:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):22:29 -> b
@@ -61026,7 +60650,6 @@
     21:22:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):244:245 -> b
     23:23:boolean com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.isNonNull():64:64 -> b
     23:23:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):245 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:39:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):246:261 -> b
     40:53:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):260:273 -> b
     54:54:boolean lambda$computeDominanceForAssumedValues$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):420:420 -> b
@@ -61038,11 +60661,10 @@
     110:110:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> b
     110:110:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):530 -> b
     111:111:java.util.List lambda$materializeSelectedAssumeInstructions$13(com.android.tools.r8.ir.code.Instruction):618:618 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$1 -> com.android.tools.r8.internal.G3:
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.I3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.F3:
     1:1:void <init>():902:902 -> <init>
     com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance asSomething() -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.android.tools.r8.internal.H3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.android.tools.r8.internal.E3:
     java.util.Map dominatedPhiUsers -> c
     com.android.tools.r8.ir.code.Value assumedValue -> a
     java.util.Set dominatedUsers -> b
@@ -61060,7 +60682,7 @@
     13:13:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():986:986 -> a
     14:14:com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.something(java.util.Set,java.util.Map):950:950 -> a
     14:14:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():986 -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.internal.J3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.internal.G3:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption nonNullAssumption -> c
     com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance dominance -> a
     com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption dynamicTypeAssumption -> b
@@ -61069,7 +60691,7 @@
     1:2:void <init>(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):687:688 -> <init>
     1:1:boolean isNonNull():725:725 -> a
     1:1:void setNotNull():729:729 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.L3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.I3:
     java.util.Map assumedValues -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():746:746 -> <clinit>
@@ -61094,7 +60716,7 @@
     33:33:void removeAll(java.util.Map):815:815 -> a
     34:38:void lambda$removeAll$3(com.android.tools.r8.ir.code.Instruction,java.util.Map):817:821 -> a
     39:56:void removeIf(com.android.tools.r8.utils.TriPredicate):828:845 -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.internal.K3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.internal.H3:
     java.util.Map assumedValues -> a
     java.util.Set nonNullValuesKnownToDominateAllUsers -> b
     1:7:void <init>():850:856 -> <init>
@@ -61124,34 +60746,34 @@
     1:1:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):889 -> b
     2:2:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):889:889 -> b
     3:3:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):888:888 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.internal.M3:
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.internal.J3:
     com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance INSTANCE -> a
     1:1:void <clinit>():993:993 -> <clinit>
     1:1:void <init>():995:995 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance getInstance():998:998 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.internal.N3:
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.internal.K3:
     com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance INSTANCE -> a
     1:1:void <clinit>():1009:1009 -> <clinit>
     1:1:void <init>():1012:1012 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance getInstance():1015:1015 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.internal.O3:
+com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.internal.L3:
     com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance INSTANCE -> a
     1:1:void <clinit>():1026:1026 -> <clinit>
     1:1:void <init>():1028:1028 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance getInstance():1031:1031 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.internal.P3:
+com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.internal.M3:
     java.util.Map dominatedPhiUsers -> b
     java.util.Set dominatedUsers -> a
     1:3:void <init>(java.util.Set,java.util.Map):1046:1048 -> <init>
     com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance asSomething() -> a
     1:1:java.util.Map getDominatedPhiUsers():1056:1056 -> b
     1:1:java.util.Set getDominatedUsers():1052:1052 -> c
-com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.internal.Q3:
+com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.internal.N3:
     com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance INSTANCE -> a
     1:1:void <clinit>():1072:1072 -> <clinit>
     1:1:void <init>():1074:1074 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance getInstance():1077:1077 -> b
-com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.S3:
+com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.P3:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set affectedValues -> c
     java.util.Set assumeInstructionsToRemove -> d
@@ -61159,30 +60781,30 @@
     com.android.tools.r8.ir.code.IRCode code -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):45:45 -> <init>
     2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):37:48 -> <init>
-    1:3:void markUnusedAssumeValuesForRemoval(java.util.Collection):72:74 -> a
-    4:4:void com.android.tools.r8.ir.optimize.AssumeRemover.markForRemoval(com.android.tools.r8.ir.code.Assume):80:80 -> a
-    4:4:void markUnusedAssumeValuesForRemoval(java.util.Collection):74 -> a
-    5:19:void removeIfMarked(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.InstructionListIterator):85:99 -> a
-    20:28:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):108:116 -> a
-    29:29:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    29:29:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):116 -> a
-    30:30:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):117:117 -> a
-    31:32:void finish():126:127 -> a
-    33:33:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    33:33:void finish():127 -> a
-    34:34:void finish():127:127 -> a
-    35:35:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    35:35:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):60 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:37:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):60:61 -> a
+    1:1:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):60:60 -> a
+    2:2:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    2:2:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):60 -> a
+    3:4:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):60:61 -> a
+    5:5:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    5:5:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):61 -> a
+    6:8:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):62:64 -> a
+    9:9:void com.android.tools.r8.ir.optimize.AssumeRemover.markForRemoval(com.android.tools.r8.ir.code.Assume):80:80 -> a
+    9:9:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):65 -> a
+    10:12:void markUnusedAssumeValuesForRemoval(java.util.Collection):72:74 -> a
+    13:13:void com.android.tools.r8.ir.optimize.AssumeRemover.markForRemoval(com.android.tools.r8.ir.code.Assume):80:80 -> a
+    13:13:void markUnusedAssumeValuesForRemoval(java.util.Collection):74 -> a
+    14:28:void removeIfMarked(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.InstructionListIterator):85:99 -> a
+    29:37:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):108:116 -> a
     38:38:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    38:38:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):61 -> a
-    39:41:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):62:64 -> a
-    42:42:void com.android.tools.r8.ir.optimize.AssumeRemover.markForRemoval(com.android.tools.r8.ir.code.Assume):80:80 -> a
-    42:42:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):65 -> a
+    38:38:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):116 -> a
+    39:39:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):117:117 -> a
+    40:41:void finish():126:127 -> a
+    42:42:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    42:42:void finish():127 -> a
+    43:43:void finish():127:127 -> a
     1:1:java.util.Set getAffectedValues():52:52 -> b
     1:1:boolean mayHaveIntroducedTrivialPhi():56:56 -> c
-com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.internal.A4:
+com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.internal.x4:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     int[] hashes -> b
     boolean $assertionsDisabled -> c
@@ -61201,7 +60823,7 @@
     39:39:boolean doEquivalent(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):70 -> a
     40:40:void clearComputedHash(com.android.tools.r8.ir.code.BasicBlock):74:74 -> a
     1:12:int computeHash(com.android.tools.r8.ir.code.BasicBlock):90:101 -> b
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.da:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.S9:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction waveDoneAction -> d
@@ -61211,10 +60833,10 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):128:128 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):126:131 -> <init>
     1:71:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):135:205 -> a
-    72:72:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    72:72:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     72:72:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):209 -> a
     73:99:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):210:236 -> a
-    100:100:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    100:100:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     100:100:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):237 -> a
     101:101:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):237:237 -> a
     102:105:void com.android.tools.r8.utils.IteratorUtils.removeIf(java.util.Iterator,java.util.function.Predicate):140:143 -> a
@@ -61238,50 +60860,47 @@
     233:233:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization.getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):367:367 -> a
     233:233:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization.getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):324 -> a
     233:233:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):171 -> a
-    234:242:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):172:180 -> a
-    243:243:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():82:82 -> a
-    243:243:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):181 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    244:260:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):181:197 -> a
-    261:264:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):173:176 -> a
-    265:265:com.android.tools.r8.graph.DexField lambda$optimize$1(com.android.tools.r8.graph.DexEncodedField):256:256 -> a
-    266:266:void lambda$optimize$2(java.util.Set,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):274:274 -> a
-    267:268:void lambda$optimize$3():282:283 -> a
-    269:269:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():431:431 -> a
-    269:269:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):373 -> a
+    234:243:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):172:181 -> a
+    244:244:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():82:82 -> a
+    244:244:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):181 -> a
+    245:261:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):181:197 -> a
+    262:265:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):173:176 -> a
+    266:266:com.android.tools.r8.graph.DexField lambda$optimize$1(com.android.tools.r8.graph.DexEncodedField):256:256 -> a
+    267:267:void lambda$optimize$2(java.util.Set,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):274:274 -> a
+    268:269:void lambda$optimize$3():282:283 -> a
     270:270:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():431:431 -> a
-    270:270:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):374 -> a
-    271:281:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):375:385 -> a
-    282:282:boolean com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):629:629 -> a
-    282:282:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):386 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    283:388:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):387:492 -> a
-    389:389:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    389:389:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):389 -> a
-    390:492:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set) -> a
-    493:587:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):398:492 -> a
-    588:593:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):405:410 -> a
-    594:598:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():820:824 -> a
-    594:598:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):415 -> a
-    599:624:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):418:443 -> a
-    625:632:boolean com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization.isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):526:533 -> a
-    625:632:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):443 -> a
-    633:680:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):445:492 -> a
-    681:706:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):467:492 -> a
-    707:726:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):473:492 -> a
-    727:734:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):487:494 -> a
-    735:735:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):492:492 -> a
-    736:736:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$4(com.android.tools.r8.graph.DexField):461:461 -> a
-    737:737:java.util.Map validateFinalFieldPuts(java.util.Map,java.util.Map):519:519 -> a
-    738:740:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):537:539 -> a
-    741:741:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1584:1584 -> a
-    741:741:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):539 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    742:744:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):542:544 -> a
-    745:745:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    745:745:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544 -> a
-    746:747:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544:545 -> a
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.ba:
+    270:270:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):373 -> a
+    271:271:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():431:431 -> a
+    271:271:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):374 -> a
+    272:283:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):375:386 -> a
+    284:284:boolean com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):629:629 -> a
+    284:284:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):386 -> a
+    285:390:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):387:492 -> a
+    391:391:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    391:391:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):389 -> a
+    392:494:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):390:492 -> a
+    495:589:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):398:492 -> a
+    590:595:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):405:410 -> a
+    596:600:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():820:824 -> a
+    596:600:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):415 -> a
+    601:626:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):418:443 -> a
+    627:634:boolean com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization.isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):526:533 -> a
+    627:634:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):443 -> a
+    635:682:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):445:492 -> a
+    683:708:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):467:492 -> a
+    709:728:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):473:492 -> a
+    729:736:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):487:494 -> a
+    737:737:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):492:492 -> a
+    738:738:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$4(com.android.tools.r8.graph.DexField):461:461 -> a
+    739:739:java.util.Map validateFinalFieldPuts(java.util.Map,java.util.Map):519:519 -> a
+    740:742:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):537:539 -> a
+    743:743:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1584:1584 -> a
+    743:743:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):539 -> a
+    744:746:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):542:544 -> a
+    747:747:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    747:747:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544 -> a
+    748:749:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544:545 -> a
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.Q9:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -61291,13 +60910,13 @@
     2:3:void forEachOptimizedField(java.util.function.BiConsumer):80:81 -> a
     4:9:com.android.tools.r8.graph.DexValue getStaticValue(com.android.tools.r8.graph.DexEncodedField):94:99 -> a
     1:3:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):86:88 -> b
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.ca:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.R9:
     java.util.Map fieldsWithStaticValues -> b
     1:1:void <init>(java.util.Map):107:107 -> <init>
     2:5:void <init>(java.util.Map):105:108 -> <init>
     1:1:void join(java.util.Map):112:112 -> a
     2:2:void execute():118:118 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.Ob:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.ub:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -61308,498 +60927,489 @@
     boolean lambda$computeConstantArrayValues$8(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):243:243 -> a
     2:2:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):519:519 -> a
-    3:4:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():674:675 -> a
+    3:4:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():677:678 -> a
     3:4:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):519 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:16:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):526:537 -> a
-    17:17:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
+    17:17:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():39:39 -> a
     17:17:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):538 -> a
     18:25:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):539:546 -> a
     26:60:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):698:732 -> a
-    61:61:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
+    61:61:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
     61:61:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):732 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     62:62:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):562:562 -> a
     62:62:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):732 -> a
-    63:77:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):733:747 -> a
-    78:78:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    78:78:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):748 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    79:79:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):562:562 -> a
+    63:78:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):733:748 -> a
+    79:79:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
     79:79:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):748 -> a
-    80:89:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):749:758 -> a
-    90:103:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):808:821 -> a
-    104:104:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):818:818 -> a
-    105:116:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):831:842 -> a
-    117:117:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):847:847 -> a
-    118:118:int com.android.tools.r8.ir.code.If.estimatedSize(com.android.tools.r8.utils.InternalOutputMode):159:159 -> a
-    118:118:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):847 -> a
-    119:122:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):847:850 -> a
-    123:123:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
-    123:123:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
-    123:123:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():32 -> a
-    123:123:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):852 -> a
-    124:124:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):852:852 -> a
-    125:125:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
-    125:125:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
-    125:125:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):852 -> a
-    126:128:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):852:854 -> a
-    129:136:void rewriteSingleKeySwitchToIf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1074:1081 -> a
-    137:137:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IntSwitch.materializeFirstKey(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
-    137:137:void rewriteSingleKeySwitchToIf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1083 -> a
-    138:138:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1150:1150 -> a
-    138:138:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IntSwitch.materializeFirstKey(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
+    80:80:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):562:562 -> a
+    80:80:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):748 -> a
+    81:90:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):749:758 -> a
+    91:104:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):808:821 -> a
+    105:105:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):818:818 -> a
+    106:117:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):831:842 -> a
+    118:118:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):847:847 -> a
+    119:119:int com.android.tools.r8.ir.code.If.estimatedSize(com.android.tools.r8.utils.InternalOutputMode):159:159 -> a
+    119:119:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):847 -> a
+    120:123:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):847:850 -> a
+    124:124:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
+    124:124:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
+    124:124:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():32 -> a
+    124:124:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):852 -> a
+    125:125:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):852:852 -> a
+    126:126:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
+    126:126:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
+    126:126:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):852 -> a
+    127:129:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):852:854 -> a
+    130:137:void rewriteSingleKeySwitchToIf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1074:1081 -> a
+    138:138:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IntSwitch.materializeFirstKey(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
     138:138:void rewriteSingleKeySwitchToIf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1083 -> a
-    139:146:void rewriteSingleKeySwitchToIf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1084:1091 -> a
-    147:173:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1100:1126 -> a
-    174:174:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    174:174:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1126 -> a
-    175:189:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1127:1141 -> a
-    190:190:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    190:190:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1141 -> a
-    191:226:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1143:1178 -> a
-    227:227:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    227:227:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1178 -> a
-    228:228:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1180:1180 -> a
-    229:239:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):866:876 -> a
-    229:239:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    240:240:int com.android.tools.r8.ir.optimize.CodeRewriter.codeUnitMargin():861:861 -> a
-    240:240:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):877 -> a
-    240:240:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    241:242:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):879:880 -> a
-    241:242:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    243:243:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
-    243:243:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):880 -> a
-    243:243:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    244:255:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):886:897 -> a
-    244:255:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    256:256:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    256:256:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):897 -> a
-    256:256:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    257:262:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):898:903 -> a
-    257:262:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    263:263:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
-    263:263:long com.android.tools.r8.ir.code.IntSwitch.estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):103 -> a
-    263:263:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):903 -> a
-    263:263:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    264:264:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> a
+    139:139:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1174:1174 -> a
+    139:139:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IntSwitch.materializeFirstKey(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
+    139:139:void rewriteSingleKeySwitchToIf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1083 -> a
+    140:147:void rewriteSingleKeySwitchToIf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1084:1091 -> a
+    148:174:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1100:1126 -> a
+    175:175:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    175:175:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1126 -> a
+    176:190:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1127:1141 -> a
+    191:191:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    191:191:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1141 -> a
+    192:227:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1143:1178 -> a
+    228:228:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    228:228:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1178 -> a
+    229:229:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1180:1180 -> a
+    230:240:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):866:876 -> a
+    230:240:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    241:241:int com.android.tools.r8.ir.optimize.CodeRewriter.codeUnitMargin():861:861 -> a
+    241:241:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):877 -> a
+    241:241:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    242:243:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):879:880 -> a
+    242:243:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    244:244:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
+    244:244:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):880 -> a
+    244:244:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    245:256:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):886:897 -> a
+    245:256:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    257:257:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    257:257:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):897 -> a
+    257:257:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    258:263:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):898:903 -> a
+    258:263:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    264:264:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
     264:264:long com.android.tools.r8.ir.code.IntSwitch.estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):103 -> a
     264:264:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):903 -> a
     264:264:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    265:286:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):906:927 -> a
-    265:286:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    287:287:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
-    287:287:long com.android.tools.r8.ir.code.IntSwitch.estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):103 -> a
-    287:287:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):927 -> a
-    287:287:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    288:288:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> a
+    265:265:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> a
+    265:265:long com.android.tools.r8.ir.code.IntSwitch.estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):103 -> a
+    265:265:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):903 -> a
+    265:265:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    266:287:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):906:927 -> a
+    266:287:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    288:288:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
     288:288:long com.android.tools.r8.ir.code.IntSwitch.estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):103 -> a
     288:288:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):927 -> a
     288:288:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    289:303:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):931:945 -> a
-    289:303:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    304:304:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
-    304:304:long com.android.tools.r8.ir.code.IntSwitch.estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):103 -> a
-    304:304:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):945 -> a
-    304:304:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    305:305:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> a
+    289:289:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> a
+    289:289:long com.android.tools.r8.ir.code.IntSwitch.estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):103 -> a
+    289:289:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):927 -> a
+    289:289:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    290:304:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):931:945 -> a
+    290:304:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    305:305:long com.android.tools.r8.ir.code.IntSwitch.sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> a
     305:305:long com.android.tools.r8.ir.code.IntSwitch.estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):103 -> a
     305:305:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):945 -> a
     305:305:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    306:306:int com.android.tools.r8.ir.optimize.CodeRewriter.codeUnitMargin():861:861 -> a
-    306:306:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):946 -> a
+    306:306:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> a
+    306:306:long com.android.tools.r8.ir.code.IntSwitch.estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):103 -> a
+    306:306:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):945 -> a
     306:306:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    307:307:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):947:947 -> a
+    307:307:int com.android.tools.r8.ir.optimize.CodeRewriter.codeUnitMargin():861:861 -> a
+    307:307:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):946 -> a
     307:307:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    308:308:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
-    308:308:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):948 -> a
+    308:308:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):947:947 -> a
     308:308:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    309:309:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):953:953 -> a
+    309:309:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
+    309:309:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):948 -> a
     309:309:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
-    310:316:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1185:1191 -> a
-    317:317:int com.android.tools.r8.ir.optimize.CodeRewriter.codeUnitMargin():861:861 -> a
-    317:317:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1192 -> a
-    318:318:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1193:1193 -> a
-    319:319:int lambda$rewriteIntSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):1122:1122 -> a
-    320:335:boolean disableSwitchToIfRewritingForClassIdComparisons(com.android.tools.r8.ir.code.IntSwitch):1201:1216 -> a
-    336:336:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1274:1274 -> a
-    337:337:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph():616:616 -> a
-    337:337:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1274 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    338:348:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1275:1285 -> a
-    349:349:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":414,"2":415,"3":416}}
-    414:414:void com.android.tools.r8.ir.optimize.CodeRewriter.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:429 -> a
-    414:414:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
+    310:310:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):953:953 -> a
+    310:310:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1181 -> a
+    311:317:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1185:1191 -> a
+    318:318:int com.android.tools.r8.ir.optimize.CodeRewriter.codeUnitMargin():861:861 -> a
+    318:318:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1192 -> a
+    319:319:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1193:1193 -> a
+    320:320:int lambda$rewriteIntSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):1122:1122 -> a
+    321:336:boolean disableSwitchToIfRewritingForClassIdComparisons(com.android.tools.r8.ir.code.IntSwitch):1201:1216 -> a
+    337:337:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1274:1274 -> a
+    338:338:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph():619:619 -> a
+    338:338:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1274 -> a
+    339:349:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1275:1285 -> a
+    350:350:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":415,"2":416,"3":417}}
     415:415:void com.android.tools.r8.ir.optimize.CodeRewriter.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:429 -> a
     415:415:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
     416:416:void com.android.tools.r8.ir.optimize.CodeRewriter.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:429 -> a
     416:416:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
-    350:350:void com.android.tools.r8.ir.optimize.CodeRewriter.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):433:433 -> a
-    350:350:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
-    351:351:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":427,"2":428,"3":429}}
-    427:427:void com.android.tools.r8.ir.optimize.CodeRewriter.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):440:440 -> a
-    427:427:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
+    417:417:void com.android.tools.r8.ir.optimize.CodeRewriter.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:429 -> a
+    417:417:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
+    351:351:void com.android.tools.r8.ir.optimize.CodeRewriter.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):433:433 -> a
+    351:351:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
+    352:352:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":428,"2":429,"3":430}}
     428:428:void com.android.tools.r8.ir.optimize.CodeRewriter.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):440:440 -> a
     428:428:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
     429:429:void com.android.tools.r8.ir.optimize.CodeRewriter.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):440:440 -> a
     429:429:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
-    352:352:void com.android.tools.r8.ir.optimize.CodeRewriter.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):447:447 -> a
-    352:352:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
-    353:354:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):417:418 -> a
-    353:354:void com.android.tools.r8.ir.optimize.CodeRewriter.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):447 -> a
-    353:354:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
-    355:356:void com.android.tools.r8.ir.optimize.CodeRewriter.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):451:452 -> a
-    355:356:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
-    357:357:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1288:1288 -> a
-    358:375:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):472:489 -> a
-    358:375:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1289 -> a
-    376:376:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":430,"2":431,"3":432}}
-    430:430:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):490:490 -> a
-    430:430:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1289 -> a
+    430:430:void com.android.tools.r8.ir.optimize.CodeRewriter.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):440:440 -> a
+    430:430:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
+    353:353:void com.android.tools.r8.ir.optimize.CodeRewriter.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):447:447 -> a
+    353:353:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
+    354:355:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):417:418 -> a
+    354:355:void com.android.tools.r8.ir.optimize.CodeRewriter.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):447 -> a
+    354:355:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
+    356:357:void com.android.tools.r8.ir.optimize.CodeRewriter.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):451:452 -> a
+    356:357:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1286 -> a
+    358:358:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1288:1288 -> a
+    359:376:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):472:489 -> a
+    359:376:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1289 -> a
+    377:377:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":431,"2":432,"3":433}}
     431:431:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):490:490 -> a
     431:431:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1289 -> a
     432:432:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):490:490 -> a
     432:432:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1289 -> a
-    377:377:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):490:490 -> a
-    377:377:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1289 -> a
-    378:378:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1291:1291 -> a
-    379:392:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):496:509 -> a
-    379:392:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1292 -> a
-    393:401:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1296:1304 -> a
-    402:402:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":433,"2":434,"3":435}}
-    433:433:void com.android.tools.r8.ir.optimize.CodeRewriter.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:429 -> a
-    433:433:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
+    433:433:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):490:490 -> a
+    433:433:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1289 -> a
+    378:378:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):490:490 -> a
+    378:378:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1289 -> a
+    379:379:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1291:1291 -> a
+    380:393:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):496:509 -> a
+    380:393:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1292 -> a
+    394:402:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1296:1304 -> a
+    403:403:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":434,"2":435,"3":436}}
     434:434:void com.android.tools.r8.ir.optimize.CodeRewriter.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:429 -> a
     434:434:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
     435:435:void com.android.tools.r8.ir.optimize.CodeRewriter.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:429 -> a
     435:435:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
-    403:403:void com.android.tools.r8.ir.optimize.CodeRewriter.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):433:433 -> a
-    403:403:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
-    404:404:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":446,"2":447,"3":448}}
-    446:446:void com.android.tools.r8.ir.optimize.CodeRewriter.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):440:440 -> a
-    446:446:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
+    436:436:void com.android.tools.r8.ir.optimize.CodeRewriter.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:429 -> a
+    436:436:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
+    404:404:void com.android.tools.r8.ir.optimize.CodeRewriter.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):433:433 -> a
+    404:404:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
+    405:405:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":447,"2":448,"3":449}}
     447:447:void com.android.tools.r8.ir.optimize.CodeRewriter.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):440:440 -> a
     447:447:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
     448:448:void com.android.tools.r8.ir.optimize.CodeRewriter.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):440:440 -> a
     448:448:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
-    405:405:void com.android.tools.r8.ir.optimize.CodeRewriter.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):447:447 -> a
-    405:405:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
-    406:407:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):417:418 -> a
-    406:407:void com.android.tools.r8.ir.optimize.CodeRewriter.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):447 -> a
-    406:407:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
-    408:409:void com.android.tools.r8.ir.optimize.CodeRewriter.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):451:452 -> a
-    408:409:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
-    410:412:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1309:1311 -> a
-    413:413:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph():616:616 -> a
-    413:413:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1312 -> a
-    449:482:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1415:1448 -> a
-    483:483:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    483:483:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1448 -> a
-    484:484:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1449:1449 -> a
-    485:485:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
-    485:485:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1450 -> a
-    486:493:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1452:1459 -> a
-    494:505:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1505:1516 -> a
-    494:505:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    506:506:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):23:23 -> a
-    506:506:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1516 -> a
-    506:506:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    507:507:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):22:22 -> a
+    449:449:void com.android.tools.r8.ir.optimize.CodeRewriter.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):440:440 -> a
+    449:449:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
+    406:406:void com.android.tools.r8.ir.optimize.CodeRewriter.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):447:447 -> a
+    406:406:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
+    407:408:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):417:418 -> a
+    407:408:void com.android.tools.r8.ir.optimize.CodeRewriter.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):447 -> a
+    407:408:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
+    409:410:void com.android.tools.r8.ir.optimize.CodeRewriter.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):451:452 -> a
+    409:410:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1305 -> a
+    411:413:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1309:1311 -> a
+    414:414:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph():619:619 -> a
+    414:414:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1312 -> a
+    450:483:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1415:1448 -> a
+    484:484:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    484:484:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1448 -> a
+    485:485:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1449:1449 -> a
+    486:486:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
+    486:486:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1450 -> a
+    487:494:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1452:1459 -> a
+    495:506:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1505:1516 -> a
+    495:506:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    507:507:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):23:23 -> a
     507:507:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1516 -> a
     507:507:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    508:525:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1517:1534 -> a
-    508:525:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    526:526:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    526:526:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1534 -> a
-    526:526:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    527:527:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1536:1536 -> a
+    508:508:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):22:22 -> a
+    508:508:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1516 -> a
+    508:508:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    509:526:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1517:1534 -> a
+    509:526:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    527:527:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    527:527:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1534 -> a
     527:527:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    528:528:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):83:83 -> a
-    528:528:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1536 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    528:528:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1536:1536 -> a
     528:528:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    529:556:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1536:1563 -> a
-    529:556:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    557:557:boolean com.android.tools.r8.graph.DexType.isAlwaysNull(com.android.tools.r8.graph.AppView):153:153 -> a
-    557:557:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1564 -> a
-    557:557:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    558:558:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1565:1565 -> a
+    529:529:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):83:83 -> a
+    529:529:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1536 -> a
+    529:529:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    530:557:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1536:1563 -> a
+    530:557:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    558:558:boolean com.android.tools.r8.graph.DexType.isAlwaysNull(com.android.tools.r8.graph.AppView):153:153 -> a
+    558:558:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1564 -> a
     558:558:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    559:559:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():23:23 -> a
-    559:559:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1567 -> a
+    559:559:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1565:1565 -> a
     559:559:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    560:571:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1568:1579 -> a
-    560:571:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    572:572:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    572:572:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1579 -> a
-    572:572:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    573:573:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1580:1580 -> a
+    560:560:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():24:24 -> a
+    560:560:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1567 -> a
+    560:560:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    561:572:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1568:1579 -> a
+    561:572:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    573:573:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
+    573:573:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1579 -> a
     573:573:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    574:574:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):307:307 -> a
-    574:574:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1580 -> a
+    574:574:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1580:1580 -> a
     574:574:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    575:576:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1580:1581 -> a
-    575:576:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    577:577:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
-    577:577:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1581 -> a
-    577:577:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    578:580:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1581:1583 -> a
-    578:580:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    581:581:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
-    581:581:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1584 -> a
-    581:581:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    582:582:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1585:1585 -> a
+    575:575:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):307:307 -> a
+    575:575:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1580 -> a
+    575:575:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    576:577:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1580:1581 -> a
+    576:577:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    578:578:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
+    578:578:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1581 -> a
+    578:578:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    579:581:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1581:1583 -> a
+    579:581:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    582:582:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    582:582:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1584 -> a
     582:582:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    583:583:boolean com.android.tools.r8.ir.code.Instruction.isSafeCheckCast():0:0 -> a
-    583:583:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1591 -> a
+    583:583:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1585:1585 -> a
     583:583:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    584:584:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1593:1593 -> a
+    584:584:boolean com.android.tools.r8.ir.code.Instruction.isSafeCheckCast():0:0 -> a
+    584:584:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1591 -> a
     584:584:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    585:585:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
-    585:585:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1594 -> a
-    585:585:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    586:590:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1595:1599 -> a
-    586:590:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    591:591:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> a
-    591:591:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1609 -> a
-    591:591:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    592:593:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1609:1610 -> a
-    592:593:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
-    594:597:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1467:1470 -> a
-    598:598:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> a
-    598:598:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1472 -> a
-    599:601:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1473:1475 -> a
-    602:602:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1474:1474 -> a
-    603:603:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1226:1226 -> a
-    603:603:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1487 -> a
-    604:608:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1488:1492 -> a
-    609:615:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1620:1626 -> a
-    616:616:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):23:23 -> a
-    616:616:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1628 -> a
-    617:617:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):22:22 -> a
-    617:617:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1628 -> a
-    618:627:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1629:1638 -> a
-    628:628:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> a
-    628:628:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1641 -> a
-    629:667:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1643:1681 -> a
-    668:668:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():49:49 -> a
-    668:668:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1681 -> a
-    669:675:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1688:1694 -> a
-    676:676:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
-    676:676:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1695 -> a
-    677:677:boolean lambda$removeInstanceOfInstructionIfTrivial$2(com.android.tools.r8.ir.code.Value):1672:1672 -> a
-    678:682:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1702:1706 -> a
-    683:684:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1711:1712 -> a
-    685:685:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
-    685:685:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1713 -> a
-    686:692:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1715:1721 -> a
-    693:701:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):1842:1850 -> a
-    702:702:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1937:1937 -> a
-    703:703:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    703:703:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1938 -> a
-    704:704:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1938:1938 -> a
-    705:711:void lambda$shortenLiveRanges$6(java.util.Map,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2000:2006 -> a
-    712:715:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2034:2037 -> a
-    716:716:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    716:716:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2044 -> a
-    717:717:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    717:717:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2044 -> a
-    718:806:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2045:2133 -> a
-    807:809:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):46:48 -> a
-    807:809:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2133 -> a
-    810:811:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2134:2135 -> a
-    812:857:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2171:2216 -> a
-    858:858:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3077,"2":3078,"3":3079}}
-    3077:3077:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2216:2216 -> a
-    3078:3078:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2216:2216 -> a
+    585:586:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1593:1594 -> a
+    585:586:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    587:587:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    587:587:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1594 -> a
+    587:587:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    588:592:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1595:1599 -> a
+    588:592:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    593:593:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> a
+    593:593:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1609 -> a
+    593:593:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    594:595:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1609:1610 -> a
+    594:595:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1457 -> a
+    596:599:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1467:1470 -> a
+    600:600:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> a
+    600:600:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1472 -> a
+    601:603:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1473:1475 -> a
+    604:604:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1474:1474 -> a
+    605:605:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1250:1250 -> a
+    605:605:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1487 -> a
+    606:610:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1488:1492 -> a
+    611:617:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1620:1626 -> a
+    618:618:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):23:23 -> a
+    618:618:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1628 -> a
+    619:619:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):22:22 -> a
+    619:619:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1628 -> a
+    620:629:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1629:1638 -> a
+    630:630:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> a
+    630:630:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1641 -> a
+    631:669:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1643:1681 -> a
+    670:670:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():49:49 -> a
+    670:670:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1681 -> a
+    671:677:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1688:1694 -> a
+    678:678:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    678:678:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1695 -> a
+    679:679:boolean lambda$removeInstanceOfInstructionIfTrivial$2(com.android.tools.r8.ir.code.Value):1672:1672 -> a
+    680:684:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1702:1706 -> a
+    685:686:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1711:1712 -> a
+    687:687:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    687:687:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1713 -> a
+    688:694:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1715:1721 -> a
+    695:703:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):1842:1850 -> a
+    704:704:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1937:1937 -> a
+    705:705:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    705:705:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1938 -> a
+    706:706:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1938:1938 -> a
+    707:713:void lambda$shortenLiveRanges$6(java.util.Map,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2000:2006 -> a
+    714:717:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2034:2037 -> a
+    718:718:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    718:718:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2044 -> a
+    719:719:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    719:719:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2044 -> a
+    720:808:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2045:2133 -> a
+    809:811:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):46:48 -> a
+    809:811:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2133 -> a
+    812:813:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2134:2135 -> a
+    814:859:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2171:2216 -> a
+    860:860:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3079,"2":3080,"3":3081}}
     3079:3079:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2216:2216 -> a
-    3075:3076:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2217:2218 -> a
-    3080:3086:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2729:2735 -> a
-    3087:3088:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> a
-    3087:3088:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2735 -> a
-    3089:3093:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2739:2743 -> a
-    3094:3095:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> a
-    3094:3095:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2743 -> a
-    3096:3100:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2747:2751 -> a
-    3101:3102:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> a
-    3101:3102:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2752 -> a
-    3103:3151:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2756:2804 -> a
-    3152:3177:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2793:2818 -> a
-    3178:3178:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
-    3178:3178:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2818 -> a
-    3179:3180:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2819:2820 -> a
-    3181:3181:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
-    3181:3181:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2820 -> a
-    3182:3190:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2821:2829 -> a
-    3191:3191:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2828:2828 -> a
-    3192:3213:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2824:2845 -> a
-    3214:3214:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
-    3214:3214:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2845 -> a
-    3215:3215:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2846:2846 -> a
-    3216:3216:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():204:204 -> a
-    3216:3216:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2847 -> a
-    3217:3217:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2848:2848 -> a
-    3218:3218:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
-    3218:3218:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2848 -> a
-    3219:3219:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2850:2850 -> a
-    3220:3220:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():204:204 -> a
-    3220:3220:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2851 -> a
-    3221:3221:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2852:2852 -> a
-    3222:3222:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2871:2871 -> a
-    3223:3224:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> a
-    3223:3224:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2871 -> a
-    3225:3252:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):3043:3070 -> a
-    3253:3253:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> a
-    3253:3253:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):3074 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3254:3254:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> a
-    3254:3254:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):3074 -> a
-    3255:3269:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):3089:3103 -> a
-    3270:3279:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3323:3332 -> a
-    3280:3280:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> a
-    3280:3280:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3332 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3281:3282:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3338:3339 -> a
-    3283:3283:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
-    3283:3283:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3339 -> a
-    3284:3288:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3340:3344 -> a
-    3289:3289:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
-    3289:3289:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3344 -> a
-    3290:3290:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3348:3348 -> a
-    3291:3293:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3359:3361 -> a
-    3294:3296:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):114:116 -> a
-    3294:3296:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3361 -> a
-    3297:3297:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3362:3362 -> a
-    3298:3298:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6662,"2":6663,"3":6664}}
-    6662:6662:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3363:3363 -> a
-    6663:6663:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3363:3363 -> a
-    6664:6664:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3363:3363 -> a
-    6661:6661:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3363:3363 -> a
-    6665:6685:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3497:3517 -> a
-    6686:6686:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
-    6686:6686:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3517 -> a
-    6687:6703:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3517:3533 -> a
-    6704:6704:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3532:3532 -> a
-    6705:6716:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3531:3542 -> a
-    6717:6739:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3553:3575 -> a
-    6740:6741:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
-    6740:6741:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
-    6740:6741:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3575 -> a
-    6742:6742:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3576:3576 -> a
-    6743:6744:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3613:3614 -> a
-    6743:6744:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3580 -> a
-    6745:6745:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> a
-    6745:6745:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3614 -> a
-    6745:6745:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3580 -> a
-    6746:6746:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3615:3615 -> a
-    6746:6746:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3580 -> a
-    6747:6747:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> a
-    6747:6747:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3615 -> a
-    6747:6747:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3580 -> a
-    6748:6777:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3618:3647 -> a
-    6748:6777:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3580 -> a
-    6778:6781:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3581:3584 -> a
-    6782:6782:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
-    6782:6782:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3584 -> a
-    6783:6783:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3585:3585 -> a
-    6784:6784:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
-    6784:6784:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3585 -> a
-    6785:6795:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3586:3596 -> a
-    6796:6796:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
-    6796:6796:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3598 -> a
-    6797:6798:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3599:3600 -> a
-    6799:6803:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3658:3662 -> a
-    6799:6803:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3600 -> a
-    6804:6805:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
-    6804:6805:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
-    6804:6805:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3662 -> a
-    6804:6805:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3600 -> a
-    6806:6810:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3663:3667 -> a
-    6806:6810:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3600 -> a
-    6811:6811:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3601:3601 -> a
-    6812:6816:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3658:3662 -> a
-    6812:6816:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3601 -> a
-    6817:6818:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
-    6817:6818:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
-    6817:6818:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3662 -> a
-    6817:6818:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3601 -> a
-    6819:6823:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3663:3667 -> a
-    6819:6823:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3601 -> a
-    6824:6824:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3603:3603 -> a
-    6825:6825:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
-    6825:6825:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3603 -> a
-    6826:6828:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3672:3674 -> a
-    6829:6850:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3684:3705 -> a
-    6851:6860:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3704:3713 -> a
-    6861:6881:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3711:3731 -> a
-    6882:6882:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    6882:6882:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3735 -> a
-    6883:6897:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3735:3749 -> a
-    6898:6898:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    6898:6898:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3751 -> a
-    6899:6899:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3751:3751 -> a
-    6900:6903:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1463:1466 -> a
-    6900:6903:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3751 -> a
-    6904:6904:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3752:3752 -> a
-    6905:6905:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    6905:6905:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3755 -> a
-    6906:6907:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3755:3756 -> a
-    6908:6908:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    6908:6908:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3758 -> a
-    6909:6925:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3758:3774 -> a
-    6926:6926:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):426:426 -> a
-    6926:6926:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3774 -> a
-    6927:6930:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3774:3777 -> a
-    6931:6947:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3775:3791 -> a
-    6948:6955:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3795:3802 -> a
-    6956:6966:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3815:3825 -> a
-    6956:6966:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
-    6967:6972:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3803:3808 -> a
-    6973:6973:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3805:3805 -> a
-    6974:6974:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    6974:6974:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3805 -> a
-    6975:6975:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    6975:6975:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    6975:6975:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3805 -> a
-    6976:6976:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3805:3805 -> a
-    6977:6977:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3823:3823 -> a
-    6977:6977:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
-    6978:6978:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    6978:6978:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3823 -> a
-    6978:6978:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
-    6979:6979:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    6979:6979:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    6979:6979:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3823 -> a
-    6979:6979:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
-    6980:6980:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3823:3823 -> a
-    6980:6980:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
-    6981:6981:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3819:3819 -> a
-    6981:6981:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
-    6982:6982:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    6982:6982:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3819 -> a
+    3080:3080:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2216:2216 -> a
+    3081:3081:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2216:2216 -> a
+    3077:3078:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2217:2218 -> a
+    3082:3088:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2729:2735 -> a
+    3089:3090:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> a
+    3089:3090:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2735 -> a
+    3091:3095:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2739:2743 -> a
+    3096:3097:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> a
+    3096:3097:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2743 -> a
+    3098:3102:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2747:2751 -> a
+    3103:3104:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> a
+    3103:3104:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2752 -> a
+    3105:3153:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2756:2804 -> a
+    3154:3179:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2793:2818 -> a
+    3180:3180:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
+    3180:3180:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2818 -> a
+    3181:3182:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2819:2820 -> a
+    3183:3183:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
+    3183:3183:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2820 -> a
+    3184:3192:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2821:2829 -> a
+    3193:3193:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2828:2828 -> a
+    3194:3215:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2824:2845 -> a
+    3216:3216:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
+    3216:3216:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2845 -> a
+    3217:3217:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2846:2846 -> a
+    3218:3218:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():204:204 -> a
+    3218:3218:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2847 -> a
+    3219:3219:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2848:2848 -> a
+    3220:3220:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
+    3220:3220:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2848 -> a
+    3221:3221:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2850:2850 -> a
+    3222:3222:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():204:204 -> a
+    3222:3222:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2851 -> a
+    3223:3223:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2852:2852 -> a
+    3224:3224:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2871:2871 -> a
+    3225:3226:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> a
+    3225:3226:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2871 -> a
+    3227:3258:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):3043:3074 -> a
+    3259:3259:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> a
+    3259:3259:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):3074 -> a
+    3260:3274:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):3089:3103 -> a
+    3275:3284:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3323:3332 -> a
+    3285:3285:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> a
+    3285:3285:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3332 -> a
+    3286:3287:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3338:3339 -> a
+    3288:3288:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
+    3288:3288:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3339 -> a
+    3289:3293:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3340:3344 -> a
+    3294:3294:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
+    3294:3294:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3344 -> a
+    3295:3295:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3348:3348 -> a
+    3296:3298:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3359:3361 -> a
+    3299:3301:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):115:117 -> a
+    3299:3301:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3361 -> a
+    3302:3302:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3362:3362 -> a
+    3303:3303:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6667,"2":6668,"3":6669}}
+    6667:6667:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3363:3363 -> a
+    6668:6668:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3363:3363 -> a
+    6669:6669:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3363:3363 -> a
+    6666:6666:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3363:3363 -> a
+    6670:6690:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3497:3517 -> a
+    6691:6691:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    6691:6691:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3517 -> a
+    6692:6708:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3517:3533 -> a
+    6709:6709:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3532:3532 -> a
+    6710:6721:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3531:3542 -> a
+    6722:6744:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3553:3575 -> a
+    6745:6746:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
+    6745:6746:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
+    6745:6746:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3575 -> a
+    6747:6747:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3576:3576 -> a
+    6748:6749:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3613:3614 -> a
+    6748:6749:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3580 -> a
+    6750:6750:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> a
+    6750:6750:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3614 -> a
+    6750:6750:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3580 -> a
+    6751:6751:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3615:3615 -> a
+    6751:6751:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3580 -> a
+    6752:6752:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> a
+    6752:6752:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3615 -> a
+    6752:6752:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3580 -> a
+    6753:6782:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3618:3647 -> a
+    6753:6782:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3580 -> a
+    6783:6786:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3581:3584 -> a
+    6787:6787:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
+    6787:6787:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3584 -> a
+    6788:6788:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3585:3585 -> a
+    6789:6789:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
+    6789:6789:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3585 -> a
+    6790:6800:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3586:3596 -> a
+    6801:6801:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
+    6801:6801:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3598 -> a
+    6802:6803:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3599:3600 -> a
+    6804:6808:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3658:3662 -> a
+    6804:6808:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3600 -> a
+    6809:6810:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
+    6809:6810:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
+    6809:6810:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3662 -> a
+    6809:6810:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3600 -> a
+    6811:6815:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3663:3667 -> a
+    6811:6815:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3600 -> a
+    6816:6816:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3601:3601 -> a
+    6817:6821:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3658:3662 -> a
+    6817:6821:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3601 -> a
+    6822:6823:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
+    6822:6823:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
+    6822:6823:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3662 -> a
+    6822:6823:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3601 -> a
+    6824:6828:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3663:3667 -> a
+    6824:6828:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3601 -> a
+    6829:6829:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3603:3603 -> a
+    6830:6830:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
+    6830:6830:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3603 -> a
+    6831:6833:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3672:3674 -> a
+    6834:6855:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3684:3705 -> a
+    6856:6865:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3704:3713 -> a
+    6866:6886:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3711:3731 -> a
+    6887:6887:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    6887:6887:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3735 -> a
+    6888:6902:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3735:3749 -> a
+    6903:6903:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    6903:6903:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3751 -> a
+    6904:6904:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3751:3751 -> a
+    6905:6908:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1464:1467 -> a
+    6905:6908:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3751 -> a
+    6909:6909:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3752:3752 -> a
+    6910:6910:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    6910:6910:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3755 -> a
+    6911:6912:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3755:3756 -> a
+    6913:6913:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    6913:6913:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3758 -> a
+    6914:6930:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3758:3774 -> a
+    6931:6931:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):436:436 -> a
+    6931:6931:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3774 -> a
+    6932:6935:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3774:3777 -> a
+    6936:6952:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3775:3791 -> a
+    6953:6960:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3795:3802 -> a
+    6961:6971:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3815:3825 -> a
+    6961:6971:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
+    6972:6977:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3803:3808 -> a
+    6978:6978:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3805:3805 -> a
+    6979:6979:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    6979:6979:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3805 -> a
+    6980:6980:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    6980:6980:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    6980:6980:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3805 -> a
+    6981:6981:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3805:3805 -> a
+    6982:6982:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3823:3823 -> a
     6982:6982:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
-    6983:6983:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    6983:6983:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    6983:6983:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3819 -> a
+    6983:6983:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    6983:6983:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3823 -> a
     6983:6983:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
-    6984:6984:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3819:3819 -> a
+    6984:6984:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    6984:6984:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    6984:6984:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3823 -> a
     6984:6984:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
-    6985:6991:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3829:3835 -> a
+    6985:6985:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3823:3823 -> a
+    6985:6985:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
+    6986:6986:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3819:3819 -> a
+    6986:6986:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
+    6987:6987:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    6987:6987:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3819 -> a
+    6987:6987:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
+    6988:6988:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    6988:6988:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    6988:6988:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3819 -> a
+    6988:6988:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
+    6989:6989:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3819:3819 -> a
+    6989:6989:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3802 -> a
+    6990:6996:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3829:3835 -> a
     1:3:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):182:184 -> b
-    4:4:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> b
+    4:4:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> b
     4:4:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):184 -> b
     5:17:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):186:198 -> b
     18:18:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     18:18:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):198 -> b
     19:28:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199:208 -> b
-    29:29:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1226:1226 -> b
+    29:29:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1250:1250 -> b
     29:29:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):220 -> b
     30:31:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):223:224 -> b
     32:32:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
@@ -61859,18 +61469,16 @@
     1:24:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3113:3136 -> f
     25:25:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> f
     25:25:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3138 -> f
-    26:28:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3143:3145 -> f
-    29:29:java.lang.Object com.android.tools.r8.ir.code.CatchHandlers$CatchHandler.getTarget():30:30 -> f
-    29:29:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3146 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    30:68:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3146:3184 -> f
-    69:69:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo.hasNonNullParamOrThrow():43:43 -> f
-    69:69:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3188 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    70:96:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3189:3215 -> f
-    97:97:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> f
-    97:97:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3215 -> f
-    98:100:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3215:3217 -> f
+    26:29:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3143:3146 -> f
+    30:30:java.lang.Object com.android.tools.r8.ir.code.CatchHandlers$CatchHandler.getTarget() -> f
+    30:30:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3146 -> f
+    31:73:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3146:3188 -> f
+    74:74:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo.hasNonNullParamOrThrow():43:43 -> f
+    74:74:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3188 -> f
+    75:101:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3189:3215 -> f
+    102:102:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> f
+    102:102:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3215 -> f
+    103:105:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3215:3217 -> f
     1:51:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2892:2942 -> g
     52:52:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> g
     52:52:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2943 -> g
@@ -61911,7 +61519,7 @@
     510:510:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):246:246 -> h
     511:511:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):246:246 -> h
     508:508:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):246:246 -> h
-    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> i
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> i
     1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3450 -> i
     2:4:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3451:3453 -> i
     5:5:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> i
@@ -61921,9 +61529,8 @@
     25:25:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3475 -> i
     26:43:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3476:3493 -> i
     1:1:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1338:1338 -> j
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> j
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> j
     2:2:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1338 -> j
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:7:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1338:1342 -> j
     8:8:void com.android.tools.r8.ir.optimize.AssumeRemover.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:42 -> j
     8:8:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1342 -> j
@@ -61936,10 +61543,10 @@
     42:45:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1320:1323 -> j
     42:45:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1371 -> j
     46:66:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1372:1392 -> j
-    67:67:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1226:1226 -> j
+    67:67:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1250:1250 -> j
     67:67:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1393 -> j
     68:69:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1394:1395 -> j
-    70:70:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1226:1226 -> j
+    70:70:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1250:1250 -> j
     70:70:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1396 -> j
     71:72:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1398:1399 -> j
     73:73:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> j
@@ -61947,7 +61554,7 @@
     74:76:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1399:1401 -> j
     1:1:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):962:962 -> k
     1:1:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):958 -> k
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1900:1900 -> k
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1922:1922 -> 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 -> k
     2:2:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):958 -> 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):965:965 -> k
@@ -61977,38 +61584,36 @@
     1:12:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):255:266 -> m
     13:13:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1491:1491 -> m
     13:13:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):266 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:32:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):270:288 -> m
-    33:33:boolean com.android.tools.r8.ir.code.Value.isConstZero():808:808 -> m
-    33:33:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):290 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:42:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):292:300 -> m
-    43:43:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> m
-    43:43:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):300 -> m
-    44:90:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):304:350 -> m
-    91:114:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3374:3397 -> m
-    91:114:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):343 -> m
-    115:115:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):0:0 -> m
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":177,"2":178,"3":179}}
-    177:177:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3398:3398 -> m
-    177:177:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):343 -> m
-    178:178:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3398:3398 -> m
-    178:178:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):343 -> m
+    14:34:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):270:290 -> m
+    35:35:boolean com.android.tools.r8.ir.code.Value.isConstZero():808:808 -> m
+    35:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):290 -> m
+    36:44:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):292:300 -> m
+    45:45:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> m
+    45:45:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):300 -> m
+    46:92:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):304:350 -> m
+    93:116:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3374:3397 -> m
+    93:116:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):343 -> m
+    117:117:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):0:0 -> m
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":179,"2":180,"3":181}}
     179:179:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3398:3398 -> m
     179:179:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):343 -> m
-    116:116:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3398:3398 -> m
-    116:116:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):343 -> m
-    117:171:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):356:410 -> m
-    172:172:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> m
-    172:172:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):410 -> m
-    173:176:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):410:413 -> m
+    180:180:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3398:3398 -> m
+    180:180:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):343 -> m
+    181:181:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3398:3398 -> m
+    181:181:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):343 -> m
+    118:118:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3398:3398 -> m
+    118:118:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):343 -> m
+    119:173:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):356:410 -> m
+    174:174:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> m
+    174:174:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):410 -> m
+    175:178:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):410:413 -> m
     1:43:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1924:1966 -> n
     44:44:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> n
     44:44:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1967 -> n
     45:53:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1968:1976 -> n
-    54:54:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> n
+    54:54:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():39:39 -> n
     54:54:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1977 -> n
-    55:55:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> n
+    55:55:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):39:39 -> n
     55:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1978 -> n
     56:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1979:1994 -> n
     72:72:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> n
@@ -62018,9 +61623,8 @@
     74:75:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1997 -> n
     76:85:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2011:2020 -> n
     1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2248:2248 -> o
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> o
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> o
     2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2248 -> o
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2251:2259 -> o
     12:28:boolean com.android.tools.r8.ir.optimize.CodeRewriter.allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2224:2240 -> o
     12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2260 -> o
@@ -62047,29 +61651,29 @@
     1:9:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2599:2607 -> r
     10:15:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3429:3434 -> r
     10:15:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2608 -> r
-    16:26:boolean com.android.tools.r8.ir.code.BasicBlock.isSimpleAlwaysThrowingPath():1579:1589 -> r
+    16:26:boolean com.android.tools.r8.ir.code.BasicBlock.isSimpleAlwaysThrowingPath():1580:1590 -> r
     16:26:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3434 -> r
     16:26:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2608 -> r
     27:27:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3434:3434 -> r
     27:27:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2608 -> r
-    28:38:boolean com.android.tools.r8.ir.code.BasicBlock.isSimpleAlwaysThrowingPath():1579:1589 -> r
+    28:38:boolean com.android.tools.r8.ir.code.BasicBlock.isSimpleAlwaysThrowingPath():1580:1590 -> r
     28:38:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3434 -> r
     28:38:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2608 -> r
     39:40:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3442:3443 -> r
     39:40:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2608 -> r
-    41:43:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):114:116 -> r
+    41:43:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):115:117 -> r
     41:43:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3444 -> r
     41:43:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2608 -> r
     44:44:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3445:3445 -> r
     44:44:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2608 -> r
     45:55:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3402:3412 -> r
     45:55:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2609 -> r
-    56:58:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):114:116 -> r
+    56:58:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):115:117 -> r
     56:58:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3413 -> r
     56:58:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2609 -> r
     59:63:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3414:3418 -> r
     59:63:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2609 -> r
-    64:66:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):114:116 -> r
+    64:66:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):115:117 -> r
     64:66:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3419 -> r
     64:66:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2609 -> r
     67:67:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3420:3420 -> r
@@ -62079,74 +61683,70 @@
     71:71:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> r
     71:71:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3253 -> r
     71:71:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    72:90:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3254:3272 -> r
-    72:90:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    91:91:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
-    91:91:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3273 -> r
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    91:91:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    92:94:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3274:3276 -> r
-    92:94:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    95:95:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
-    95:95:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3277 -> r
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    95:95:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    96:98:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3278:3280 -> r
-    96:98:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    99:99:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
-    99:99:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3281 -> r
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    99:99:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    100:102:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3282:3284 -> r
-    100:102:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    103:103:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
-    103:103:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3285 -> r
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    103:103:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    104:106:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3286:3288 -> r
-    104:106:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    107:107:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> r
-    107:107:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3289 -> r
+    72:91:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3254:3273 -> r
+    72:91:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
+    92:92:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
+    92:92:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3273 -> r
+    92:92:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
+    93:96:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3274:3277 -> r
+    93:96:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
+    97:97:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
+    97:97:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3277 -> r
+    97:97:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
+    98:101:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3278:3281 -> r
+    98:101:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
+    102:102:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
+    102:102:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3281 -> r
+    102:102:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
+    103:106:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3282:3285 -> r
+    103:106:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
+    107:107:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
+    107:107:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3285 -> r
     107:107:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    108:129:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3291:3312 -> r
-    108:129:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
-    130:137:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2615:2622 -> r
-    138:142:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2651:2655 -> r
-    138:142:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    143:144:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> r
-    143:144:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2656 -> r
-    143:144:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    145:145:boolean com.android.tools.r8.ir.code.If.isNullTest():93:93 -> r
-    145:145:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2660 -> r
-    145:145:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    146:149:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2661:2664 -> r
-    146:149:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    150:151:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> r
-    150:151:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2664 -> r
-    150:151:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    152:153:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2668:2669 -> r
-    152:153:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    154:155:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> r
-    154:155:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2669 -> r
-    154:155:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    156:161:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2674:2679 -> r
-    156:161:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    162:163:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> r
-    162:163:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2679 -> r
-    162:163:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    164:201:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2684:2721 -> r
-    164:201:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    202:203:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2711:2712 -> r
-    202:203:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    204:205:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2700:2701 -> r
-    204:205:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
-    206:215:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2628:2637 -> r
-    216:217:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> r
-    216:217:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2637 -> r
-    218:220:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2642:2644 -> r
-    221:221:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> r
-    221:221:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2644 -> r
-    222:225:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2644:2647 -> r
+    108:111:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3286:3289 -> r
+    108:111:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
+    112:112:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> r
+    112:112:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3289 -> r
+    112:112:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
+    113:134:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3291:3312 -> r
+    113:134:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2613 -> r
+    135:142:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2615:2622 -> r
+    143:147:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2651:2655 -> r
+    143:147:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    148:149:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> r
+    148:149:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2656 -> r
+    148:149:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    150:150:boolean com.android.tools.r8.ir.code.If.isNullTest():93:93 -> r
+    150:150:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2660 -> r
+    150:150:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    151:154:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2661:2664 -> r
+    151:154:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    155:156:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> r
+    155:156:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2664 -> r
+    155:156:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    157:158:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2668:2669 -> r
+    157:158:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    159:160:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> r
+    159:160:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2669 -> r
+    159:160:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    161:166:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2674:2679 -> r
+    161:166:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    167:168:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> r
+    167:168:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2679 -> r
+    167:168:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    169:206:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2684:2721 -> r
+    169:206:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    207:208:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2711:2712 -> r
+    207:208:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    209:210:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2700:2701 -> r
+    209:210:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2623 -> r
+    211:220:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2628:2637 -> r
+    221:222:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2866:2867 -> r
+    221:222:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2637 -> r
+    223:225:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2642:2644 -> r
+    226:226:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> r
+    226:226:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2644 -> r
+    227:230:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2644:2647 -> r
     1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1729:1758 -> s
     1:14:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1769:1782 -> t
     15:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.CodeRewriter.binopWithLit8OrLit16NonConstant(com.android.tools.r8.ir.code.Binop):1869:1872 -> t
@@ -62186,10 +61786,10 @@
     8:8:boolean com.android.tools.r8.ir.code.Instruction.isNeg():0:0 -> u
     8:8:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3887 -> u
     9:41:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3888:3920 -> u
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.Hb:
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.nb:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():2694:2694 -> <clinit>
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.Ib:
+com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.ob:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():2415:2415 -> <clinit>
@@ -62224,7 +61824,7 @@
     52:56:int com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doHash(com.android.tools.r8.ir.code.Instruction):2472 -> a
     52:56:int doHash(java.lang.Object):2415 -> a
     57:62:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2479:2484 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.Jb:
+com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.pb:
     boolean anyAffectedValues -> a
     boolean anySimplifications -> b
     boolean $assertionsDisabled -> c
@@ -62233,7 +61833,7 @@
     2:5:void <init>(boolean,boolean):2577:2580 -> <init>
     1:1:boolean anyAffectedValues():2584:2584 -> a
     1:1:boolean anySimplifications():2588:2588 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.Kb:
+com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.qb:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
     com.android.tools.r8.ir.code.Value left -> d
@@ -62246,22 +61846,21 @@
     2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):650:650 -> a
     3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):660:660 -> a
     4:9:com.android.tools.r8.ir.code.BasicBlock build():665:670 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1150:1150 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1174:1174 -> a
     10:10:com.android.tools.r8.ir.code.BasicBlock build():670 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:13:com.android.tools.r8.ir.code.BasicBlock build():671:673 -> a
-    14:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1481:1487 -> a
+    14:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1482:1488 -> a
     14:20:com.android.tools.r8.ir.code.BasicBlock build():673 -> a
     21:22:com.android.tools.r8.ir.code.BasicBlock build():675:676 -> a
-    23:26:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1463:1466 -> a
+    23:26:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1464:1467 -> a
     23:26:com.android.tools.r8.ir.code.BasicBlock build():676 -> a
     27:29:com.android.tools.r8.ir.code.BasicBlock build():678:680 -> a
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):655:655 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.Lb:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.rb:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Position):555:556 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.Mb:
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.sb:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():761:761 -> <clinit>
@@ -62272,7 +61871,6 @@
     3:3:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
     3:3:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
     3:3:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):799 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     4:4:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):799:799 -> a
     1:1:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMax():778:778 -> b
     1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):787 -> b
@@ -62290,14 +61888,13 @@
     9:9:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):782:782 -> b
     10:10:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMax():778:778 -> b
     10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):782 -> b
-    11:11:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMin():774:774 -> b
-    11:11:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):782 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:13:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):782:783 -> b
-    14:14:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> b
-    14:14:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):783 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.Nb:
+    11:11:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):782:782 -> b
+    12:12:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMin():774:774 -> b
+    12:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):782 -> b
+    13:14:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):782:783 -> b
+    15:15:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> b
+    15:15:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):783 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.tb:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
@@ -62306,15 +61903,18 @@
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):582:582 -> a
     2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):592:592 -> a
-    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):598:619 -> a
-    26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1493:1496 -> a
-    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):619 -> a
-    30:30:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> a
-    30:30:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):620 -> a
-    31:32:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):620:621 -> a
-    33:33:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):610:610 -> a
+    4:4:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):598:598 -> a
+    5:5:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.<init>():176:176 -> a
+    5:5:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):598 -> a
+    6:26:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):599:619 -> a
+    27:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1494:1497 -> a
+    27:30:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):619 -> a
+    31:31:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> a
+    31:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):620 -> a
+    32:33:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):620:621 -> a
+    34:34:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):610:610 -> a
     1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):616:616 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.Gd:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.id:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> a
     int numberOfEffectivelyFinalFieldCanonicalization -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> g
@@ -62333,48 +61933,50 @@
     18:23:void logResults():77:82 -> a
     24:30:void logResults():79:85 -> a
     31:33:void lambda$logResults$0(java.lang.Long,java.lang.Integer):86:86 -> a
-    34:72:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92:130 -> a
-    73:73:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    73:73:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135 -> a
-    74:74:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135:135 -> a
-    75:75:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    75:75:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):141 -> a
-    76:76:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    76:76:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):141 -> a
-    77:77:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):142:142 -> a
-    78:78:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    78:78:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):147 -> a
-    79:92:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):148:161 -> a
-    93:93:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():204:204 -> a
-    93:93:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):163 -> a
-    94:100:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):164:170 -> a
-    101:102:boolean com.android.tools.r8.ir.optimize.ConstantCanonicalizer.constantUsedByInvokeRange(com.android.tools.r8.ir.code.Instruction):292:293 -> a
-    101:102:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> a
-    103:162:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):181:240 -> a
-    163:165:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):46:48 -> a
-    163:165:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):240 -> a
-    166:166:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):257:257 -> a
-    167:190:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):231:254 -> a
-    191:196:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):243:248 -> a
-    197:197:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247:247 -> a
-    198:200:com.android.tools.r8.ir.code.DexItemBasedConstString com.android.tools.r8.ir.code.DexItemBasedConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DexItemBasedConstString):48:50 -> a
-    198:200:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247 -> a
-    201:204:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):225:228 -> a
-    205:207:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.ConstClass.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):60:62 -> a
-    205:207:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):228 -> a
-    208:208:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):259:259 -> a
-    209:220:void com.android.tools.r8.ir.optimize.ConstantCanonicalizer.insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):277:288 -> a
-    209:220:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):260 -> a
-    221:224:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):261:264 -> a
-    225:226:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):426:427 -> a
-    225:226:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):264 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    227:235:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):265:273 -> a
-    236:236:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.Instruction):182:182 -> a
-    237:237:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):199:199 -> a
-    238:238:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):209:209 -> a
+    34:35:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92:93 -> a
+    36:36:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):184:184 -> a
+    36:36:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):93 -> a
+    37:40:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):127:130 -> a
+    41:41:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    41:41:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135 -> a
+    42:42:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135:135 -> a
+    43:43:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    43:43:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):141 -> a
+    44:44:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    44:44:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):141 -> a
+    45:45:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):142:142 -> a
+    46:46:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    46:46:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):147 -> a
+    47:60:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):148:161 -> a
+    61:61:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():204:204 -> a
+    61:61:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):163 -> a
+    62:68:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):164:170 -> a
+    69:70:boolean com.android.tools.r8.ir.optimize.ConstantCanonicalizer.constantUsedByInvokeRange(com.android.tools.r8.ir.code.Instruction):292:293 -> a
+    69:70:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> a
+    71:130:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):181:240 -> a
+    131:133:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):46:48 -> a
+    131:133:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):240 -> a
+    134:134:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):257:257 -> a
+    135:158:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):231:254 -> a
+    159:164:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):243:248 -> a
+    165:165:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247:247 -> a
+    166:168:com.android.tools.r8.ir.code.DexItemBasedConstString com.android.tools.r8.ir.code.DexItemBasedConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DexItemBasedConstString):48:50 -> a
+    166:168:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247 -> a
+    169:172:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):225:228 -> a
+    173:175:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.ConstClass.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):60:62 -> a
+    173:175:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):228 -> a
+    176:176:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):259:259 -> a
+    177:188:void com.android.tools.r8.ir.optimize.ConstantCanonicalizer.insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):277:288 -> a
+    177:188:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):260 -> a
+    189:192:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):261:264 -> a
+    193:194:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):426:427 -> a
+    193:194:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):264 -> a
+    195:203:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):265:273 -> a
+    204:204:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.Instruction):182:182 -> a
+    205:205:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):199:199 -> a
+    206:206:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):209:209 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):208:208 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.Fd:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.hd:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():95:95 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):95:95 -> <init>
@@ -62390,69 +61992,76 @@
     29:29:int hashCode(java.lang.Object):95 -> a
     30:30:int com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1.hashCode(com.android.tools.r8.ir.code.Instruction):102:102 -> a
     30:30:int hashCode(java.lang.Object):95 -> a
-com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.Ie:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.ne:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter):36:38 -> <init>
-    1:13:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):42:54 -> a
-    14:20:void com.android.tools.r8.ir.optimize.DeadCodeRemover.removeDeadPhis(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):106:112 -> a
-    14:20:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):55 -> a
-    21:27:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Value):85:91 -> a
-    21:27:void com.android.tools.r8.ir.optimize.DeadCodeRemover.removeDeadPhis(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):113 -> a
-    21:27:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):55 -> a
-    28:32:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):57:61 -> a
-    33:52:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):120:139 -> a
-    53:53:boolean com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult.isNotDead():0:0 -> a
-    53:53:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):139 -> a
-    54:54:boolean com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult.isMaybeDead():0:0 -> a
-    54:54:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):142 -> a
-    55:66:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):144:155 -> a
-    67:67:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Instruction):97:97 -> a
-    67:67:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):158 -> a
-    68:74:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Value):85:91 -> a
-    68:74:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Instruction):98 -> a
-    68:74:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):158 -> a
-    75:75:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Instruction):100:100 -> a
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter):38:40 -> <init>
+    1:13:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):44:56 -> a
+    14:20:void com.android.tools.r8.ir.optimize.DeadCodeRemover.removeDeadPhis(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):108:114 -> a
+    14:20:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):57 -> a
+    21:27:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Value):87:93 -> a
+    21:27:void com.android.tools.r8.ir.optimize.DeadCodeRemover.removeDeadPhis(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):115 -> a
+    21:27:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):57 -> a
+    28:32:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):59:63 -> a
+    33:48:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):122:137 -> a
+    49:49:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    49:49:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):139 -> a
+    50:50:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):139:139 -> a
+    51:51:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
+    51:51:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):139 -> a
+    52:56:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):140:144 -> a
+    57:74:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):141:158 -> a
+    75:75:boolean com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult.isNotDead():0:0 -> a
     75:75:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):158 -> a
-    76:82:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Value):85:91 -> a
-    76:82:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Instruction):101 -> a
-    76:82:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):158 -> a
-    83:85:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):162:164 -> a
-    86:89:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):170:173 -> a
-    90:122:java.util.Collection com.android.tools.r8.ir.optimize.DeadCodeRemover.getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):202:234 -> a
-    90:122:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):174 -> a
-    123:142:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):175:194 -> a
-    143:143:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph():616:616 -> a
-    143:143:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):194 -> a
-    1:9:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):65:73 -> b
-    10:14:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):71:75 -> b
+    76:76:boolean com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult.isMaybeDead():0:0 -> a
+    76:76:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):161 -> a
+    77:88:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):163:174 -> a
+    89:89:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Instruction):99:99 -> a
+    89:89:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):177 -> a
+    90:96:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Value):87:93 -> a
+    90:96:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Instruction):100 -> a
+    90:96:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):177 -> a
+    97:97:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Instruction):102:102 -> a
+    97:97:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):177 -> a
+    98:104:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Value):87:93 -> a
+    98:104:void com.android.tools.r8.ir.optimize.DeadCodeRemover.updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Instruction):103 -> a
+    98:104:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):177 -> a
+    105:107:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):181:183 -> a
+    108:111:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):189:192 -> a
+    112:144:java.util.Collection com.android.tools.r8.ir.optimize.DeadCodeRemover.getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):221:253 -> a
+    112:144:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):193 -> a
+    145:164:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):194:213 -> a
+    165:165:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph():619:619 -> a
+    165:165:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):213 -> a
+    1:9:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):67:75 -> b
+    10:14:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):73:77 -> b
     15:15:boolean com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult.isDeadIfOutValueIsDead():0:0 -> b
-    15:15:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):75 -> b
-    16:16:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):76:76 -> b
-    17:17:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):75:75 -> b
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.He:
+    15:15:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):77 -> b
+    16:16:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):78:78 -> b
+    17:17:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):77:77 -> b
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.me:
     com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult DEFINITELY_DEAD_INSTANCE -> a
     com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult DEFINITELY_NOT_DEAD_INSTANCE -> b
-    1:9:void <clinit>():239:247 -> <clinit>
-    1:1:void <init>():237:237 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult deadIfOutValueIsDead():256:256 -> a
-    2:2:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult deadIfInValueIsDead(com.android.tools.r8.ir.code.Value):264:264 -> a
-    1:1:java.lang.Iterable getValuesRequiredToBeDead():299:299 -> b
+    1:9:void <clinit>():258:266 -> <clinit>
+    1:1:void <init>():256:256 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult deadIfOutValueIsDead():275:275 -> a
+    2:2:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult deadIfInValueIsDead(com.android.tools.r8.ir.code.Value):283:283 -> a
+    1:1:java.lang.Iterable getValuesRequiredToBeDead():318:318 -> b
     boolean isMaybeDead() -> c
     boolean isNotDead() -> d
-    1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult notDead():260:260 -> e
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.Ee:
-    1:1:void <init>():240:240 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.Fe:
-    1:1:void <init>():248:248 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.Ge:
+    1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult notDead():279:279 -> e
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.je:
+    1:1:void <init>():259:259 -> <init>
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.ke:
+    1:1:void <init>():267:267 -> <init>
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.le:
     com.android.tools.r8.ir.code.Value val$inValueRequiredToBeDead -> c
-    1:1:void <init>(com.android.tools.r8.ir.code.Value):264:264 -> <init>
-    1:1:java.lang.Iterable getValuesRequiredToBeDead():277:277 -> b
-    2:2:java.util.Iterator lambda$getValuesRequiredToBeDead$0(com.android.tools.r8.ir.code.Value):277:277 -> b
-com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.internal.Xe:
+    1:1:void <init>(com.android.tools.r8.ir.code.Value):283:283 -> <init>
+    1:1:java.lang.Iterable getValuesRequiredToBeDead():296:296 -> b
+    2:2:java.util.Iterator lambda$getValuesRequiredToBeDead$0(com.android.tools.r8.ir.code.Value):296:296 -> b
+com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.internal.Be:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> e
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> c
@@ -62490,7 +62099,7 @@
     477:477:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):271:271 -> a
     478:478:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):271:271 -> a
     314:363:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):273:322 -> a
-    364:472:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):489:597 -> a
+    364:472:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):481:589 -> a
     364:472:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):320 -> a
     473:473:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):101:101 -> a
     473:473:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):265 -> a
@@ -62505,13 +62114,11 @@
     475:475:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):103:103 -> a
     475:475:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):265 -> a
     482:490:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):133:141 -> a
-    491:491:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    491:491:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     491:491:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):141 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     492:496:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):143:147 -> a
     497:497:boolean com.android.tools.r8.graph.DexClassAndMethod.isStructurallyEqualTo(com.android.tools.r8.graph.DexClassAndMethod):41:41 -> a
     497:497:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):147 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     498:515:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):150:167 -> a
     516:516:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInSameBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):199:199 -> a
     516:516:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):167 -> a
@@ -62528,7 +62135,6 @@
     521:526:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):171:176 -> a
     527:527:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     527:527:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):176 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     528:549:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):176:197 -> a
     550:557:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):196:203 -> a
     558:558:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):202:202 -> a
@@ -62536,44 +62142,40 @@
     560:560:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):252:252 -> a
     561:561:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:119 -> a
     561:561:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):252 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     562:563:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):363:364 -> a
-    564:564:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> a
+    564:564:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> a
     564:564:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     565:571:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):366:372 -> a
-    572:572:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> a
+    572:572:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> a
     572:572:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):372 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    573:586:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):372:385 -> a
-    587:596:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):397:406 -> a
-    597:614:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):422:439 -> a
-    615:630:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):438:453 -> a
-    631:631:java.lang.Boolean lambda$isTargetClassInitialized$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):432:432 -> a
-    632:634:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):465:467 -> a
-    635:635:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():496:496 -> a
-    635:635:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):467 -> a
-    636:641:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):471:476 -> a
-    642:642:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):604:604 -> a
-    643:643:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():496:496 -> a
-    643:643:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):604 -> a
-    644:646:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):607:609 -> a
-    647:647:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):621:621 -> a
-    648:648:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():496:496 -> a
-    648:648:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):621 -> a
-    649:651:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):632:634 -> a
-    649:651:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):624 -> a
-    652:652:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):625:625 -> a
-    653:657:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):719:723 -> a
-    653:657:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):626 -> a
-    658:659:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1632:1633 -> a
-    658:659:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):724 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    658:659:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):626 -> a
-    660:665:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):730:735 -> a
-    660:665:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):626 -> a
-    666:698:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):654:686 -> a
-    699:699:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):745:745 -> a
+    573:579:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):372:378 -> a
+    580:589:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):391:400 -> a
+    590:607:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):416:433 -> a
+    608:623:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):432:447 -> a
+    624:624:java.lang.Boolean lambda$isTargetClassInitialized$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):426:426 -> a
+    625:627:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):459:461 -> a
+    628:628:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():498:498 -> a
+    628:628:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):461 -> a
+    629:634:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):465:470 -> a
+    635:635:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):596:596 -> a
+    636:636:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():498:498 -> a
+    636:636:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):596 -> a
+    637:639:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):599:601 -> a
+    640:640:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):613:613 -> a
+    641:641:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():498:498 -> a
+    641:641:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):613 -> a
+    642:644:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):624:626 -> a
+    642:644:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):616 -> a
+    645:645:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):617:617 -> a
+    646:651:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):711:716 -> a
+    646:651:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):618 -> a
+    652:653:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1633:1634 -> a
+    652:653:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):716 -> a
+    652:653:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):618 -> a
+    654:659:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):722:727 -> a
+    654:659:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):618 -> a
+    660:692:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):646:678 -> a
+    693:693:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):737:737 -> a
     1:1:com.android.tools.r8.graph.AppView appView():83:83 -> b
     2:4:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):209:211 -> b
     5:7:int com.android.tools.r8.ir.optimize.DefaultInliningOracle.getInliningInstructionLimitIncrement(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):225:227 -> b
@@ -62584,7 +62186,7 @@
     9:22:int com.android.tools.r8.ir.optimize.DefaultInliningOracle.getInliningInstructionLimitIncrement(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):229:242 -> b
     9:22:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):212 -> b
     23:30:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):213:220 -> b
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.ag:
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.If:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
@@ -62652,7 +62254,7 @@
     223:226:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):202 -> a
     227:247:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):206:226 -> a
     248:269:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):225:246 -> a
-    270:270:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():216:216 -> a
+    270:270:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():217:217 -> a
     270:270:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):247 -> a
     271:312:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):248:289 -> a
     313:313:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
@@ -62665,21 +62267,19 @@
     339:339:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
     339:339:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):318 -> a
     340:342:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):318:320 -> a
-com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.Gh:
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.nh:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):22:23 -> <init>
     1:2:com.android.tools.r8.ir.analysis.type.DynamicType computeDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):32:33 -> a
-    3:3:java.util.LinkedList com.android.tools.r8.ir.code.IRCode.getBlocks():1314:1314 -> a
+    3:3:java.util.LinkedList com.android.tools.r8.ir.code.IRCode.getBlocks():1350:1350 -> a
     3:3:com.android.tools.r8.ir.analysis.type.DynamicType computeDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):34 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:8:com.android.tools.r8.ir.analysis.type.DynamicType computeDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):34:38 -> a
     9:9:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
     9:9:com.android.tools.r8.ir.analysis.type.DynamicType computeDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):38 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:13:com.android.tools.r8.ir.analysis.type.DynamicType computeDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):38:41 -> a
-com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.internal.Uk:
+com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.internal.yk:
     java.util.Map invokesToInline -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ProgramMethod method -> b
@@ -62695,7 +62295,6 @@
     1:5:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):62:66 -> a
     6:6:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:119 -> a
     6:6:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:14:com.android.tools.r8.ir.optimize.Inliner$InlineAction com.android.tools.r8.ir.optimize.ForcedInliningOracle.computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):93:100 -> a
     7:14:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):79 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):83:83 -> a
@@ -62707,7 +62306,7 @@
     22:22:com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement):148 -> a
     23:23:com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement):148:148 -> a
     1:1:com.android.tools.r8.graph.AppView appView():42:42 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.Hn:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.mn:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
@@ -62722,33 +62321,36 @@
     8:12:void logResults():80:84 -> a
     13:16:void lambda$logResults$0(java.lang.Long,java.lang.Integer):87:90 -> a
     17:17:void lambda$logResults$0(java.lang.Long,java.lang.Integer):86:86 -> a
-    18:49:void canonicalize(com.android.tools.r8.ir.code.IRCode):95:126 -> a
-    50:53:boolean com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer.isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):278:281 -> a
-    50:53:void canonicalize(com.android.tools.r8.ir.code.IRCode):130 -> a
-    54:54:boolean com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection.isCallToSideEffectFreeFinalMethod(com.android.tools.r8.ir.code.InvokeMethod):119:119 -> a
-    54:54:boolean com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer.isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):281 -> a
-    54:54:void canonicalize(com.android.tools.r8.ir.code.IRCode):130 -> a
-    55:56:boolean com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer.isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):281:282 -> a
-    55:56:void canonicalize(com.android.tools.r8.ir.code.IRCode):130 -> a
-    57:126:void canonicalize(com.android.tools.r8.ir.code.IRCode):131:200 -> a
-    127:127:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():226:226 -> a
-    127:127:void canonicalize(com.android.tools.r8.ir.code.IRCode):203 -> a
-    128:197:void canonicalize(com.android.tools.r8.ir.code.IRCode):205:274 -> a
-    198:198:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.InvokeMethod):190:190 -> a
-    199:199:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):207:207 -> a
-    200:200:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):215:215 -> a
-    201:204:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):219:222 -> a
-    205:220:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):221:236 -> a
-    221:221:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):230:230 -> a
-    221:221:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):231 -> a
-    222:225:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):242:245 -> a
-    226:236:void com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer.insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):314:324 -> a
-    226:236:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):247 -> a
-    237:238:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):249:250 -> a
-    239:261:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):287:309 -> a
-    262:262:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):304:304 -> a
+    18:18:void canonicalize(com.android.tools.r8.ir.code.IRCode):95:95 -> a
+    19:19:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):184:184 -> a
+    19:19:void canonicalize(com.android.tools.r8.ir.code.IRCode):95 -> a
+    20:33:void canonicalize(com.android.tools.r8.ir.code.IRCode):113:126 -> a
+    34:37:boolean com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer.isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):278:281 -> a
+    34:37:void canonicalize(com.android.tools.r8.ir.code.IRCode):130 -> a
+    38:38:boolean com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection.isCallToSideEffectFreeFinalMethod(com.android.tools.r8.ir.code.InvokeMethod):119:119 -> a
+    38:38:boolean com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer.isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):281 -> a
+    38:38:void canonicalize(com.android.tools.r8.ir.code.IRCode):130 -> a
+    39:40:boolean com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer.isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):281:282 -> a
+    39:40:void canonicalize(com.android.tools.r8.ir.code.IRCode):130 -> a
+    41:110:void canonicalize(com.android.tools.r8.ir.code.IRCode):131:200 -> a
+    111:111:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():226:226 -> a
+    111:111:void canonicalize(com.android.tools.r8.ir.code.IRCode):203 -> a
+    112:181:void canonicalize(com.android.tools.r8.ir.code.IRCode):205:274 -> a
+    182:182:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.InvokeMethod):190:190 -> a
+    183:183:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):207:207 -> a
+    184:184:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):215:215 -> a
+    185:188:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):219:222 -> a
+    189:204:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):221:236 -> a
+    205:205:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):230:230 -> a
+    205:205:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):231 -> a
+    206:209:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):242:245 -> a
+    210:220:void com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer.insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):314:324 -> a
+    210:220:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):247 -> a
+    221:222:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):249:250 -> a
+    223:245:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):287:309 -> a
+    246:246:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):304:304 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):214:214 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.Gn:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.ln:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -62758,7 +62360,7 @@
     7:7:int hashCode(java.lang.Object):97:97 -> a
     8:8:int com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1.hashCode(com.android.tools.r8.ir.code.InvokeMethod):100:100 -> a
     8:8:int hashCode(java.lang.Object):97 -> a
-com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.internal.Ap:
+com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.internal.cp:
     java.util.Set singleCallerInlinedPrunedMethodsForTesting -> g
     com.android.tools.r8.ir.optimize.MultiCallerInliner multiCallerInliner -> e
     com.android.tools.r8.graph.AppView appView -> a
@@ -62768,92 +62370,91 @@
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder singleInlineCallers -> d
     java.util.Map singleCallerInlinedMethodsInWave -> f
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-    1:1:void <clinit>():86:86 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):111:111 -> <init>
-    2:23:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):101:122 -> <init>
+    1:1:void <clinit>():88:88 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):113:113 -> <init>
+    2:23:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):103:124 -> <init>
     boolean lambda$performInliningImpl$1(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
-    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):162:168 -> a
+    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):164:170 -> a
     8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> a
-    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):168 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:void recordCallEdgesForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):179:179 -> a
-    10:16:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):831:837 -> a
-    17:17:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):832:832 -> a
-    18:23:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):865:870 -> a
-    24:32:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):867:875 -> a
-    33:35:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):881:883 -> a
-    36:36:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):884:884 -> a
-    37:37:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):904:904 -> a
-    38:38:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):921:921 -> a
+    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):170 -> a
+    9:9:void recordCallEdgesForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):181:181 -> a
+    10:16:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):846:852 -> a
+    17:17:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):847:847 -> a
+    18:23:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):880:885 -> a
+    24:32:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):882:890 -> a
+    33:35:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):896:898 -> a
+    36:36:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):899:899 -> a
+    37:37:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):919:919 -> a
+    38:38:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):936:936 -> a
     39:39:void com.android.tools.r8.ir.optimize.AssumeRemover.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:42 -> a
-    39:39:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):921 -> a
-    40:72:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):922:954 -> a
-    73:79:boolean com.android.tools.r8.ir.optimize.Inliner.tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AssumeRemover):1097:1103 -> a
-    73:79:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):953 -> a
-    80:89:boolean com.android.tools.r8.ir.optimize.Inliner.tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AssumeRemover):1102:1111 -> a
-    80:89:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):953 -> a
-    90:112:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):959:981 -> a
+    39:39:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):936 -> a
+    40:72:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):937:969 -> a
+    73:79:boolean com.android.tools.r8.ir.optimize.Inliner.tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AssumeRemover):1112:1118 -> a
+    73:79:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):968 -> a
+    80:89:boolean com.android.tools.r8.ir.optimize.Inliner.tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AssumeRemover):1117:1126 -> a
+    80:89:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):968 -> a
+    90:112:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):974:996 -> a
     113:113:boolean com.android.tools.r8.ir.optimize.Inliner$InlineResult.isRetryAction():0:0 -> a
-    113:113:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):985 -> a
-    114:114:void com.android.tools.r8.ir.optimize.Inliner.enqueueMethodForReprocessing(com.android.tools.r8.graph.ProgramMethod):1226:1226 -> a
-    114:114:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):986 -> a
-    115:123:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):990:998 -> a
-    124:165:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):997:1038 -> a
-    166:182:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1032:1048 -> a
-    183:212:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1047:1076 -> a
+    113:113:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1000 -> a
+    114:114:void com.android.tools.r8.ir.optimize.Inliner.enqueueMethodForReprocessing(com.android.tools.r8.graph.ProgramMethod):1241:1241 -> a
+    114:114:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1001 -> a
+    115:123:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1005:1013 -> a
+    124:165:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1012:1053 -> a
+    166:182:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1047:1063 -> a
+    183:212:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1062:1091 -> a
     213:213:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    213:213:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1078 -> a
-    214:223:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1079:1088 -> a
-    224:230:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1116:1122 -> a
-    224:230:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):135 -> a
+    213:213:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1093 -> a
+    214:223:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1094:1103 -> a
+    224:230:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1131:1137 -> a
+    224:230:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):137 -> a
     231:231:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    231:231:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1123 -> a
-    231:231:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):135 -> a
-    232:233:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1123:1124 -> a
-    232:233:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):135 -> a
-    234:246:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):136:148 -> a
-    247:249:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.Inliner.instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):127:129 -> a
-    247:249:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):150 -> a
-    250:250:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):156:156 -> a
-    251:264:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1160:1173 -> a
-    265:265:void com.android.tools.r8.ir.optimize.Inliner.rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1207:1207 -> a
-    265:265:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1176 -> a
-    266:266:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1177:1177 -> a
-    267:267:void com.android.tools.r8.ir.optimize.Inliner.rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1207:1207 -> a
-    267:267:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1180 -> a
-    268:269:void lambda$postProcessInlineeBlocks$2(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.BasicBlock):1169:1170 -> a
-    270:272:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,com.android.tools.r8.utils.Timing):1188:1190 -> a
-    273:277:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1197:1201 -> a
+    231:231:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1138 -> a
+    231:231:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):137 -> a
+    232:233:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1138:1139 -> a
+    232:233:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):137 -> a
+    234:246:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):138:150 -> a
+    247:249:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.Inliner.instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):129:131 -> a
+    247:249:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):152 -> a
+    250:250:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):158:158 -> a
+    251:264:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1175:1188 -> a
+    265:265:void com.android.tools.r8.ir.optimize.Inliner.rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1222:1222 -> a
+    265:265:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1191 -> a
+    266:266:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1192:1192 -> a
+    267:267:void com.android.tools.r8.ir.optimize.Inliner.rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1222:1222 -> a
+    267:267:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1195 -> a
+    268:269:void lambda$postProcessInlineeBlocks$2(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.BasicBlock):1184:1185 -> a
+    270:272:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,com.android.tools.r8.utils.Timing):1203:1205 -> a
+    273:277:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1212:1216 -> a
     278:278:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    278:278:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1201 -> a
-    279:281:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1201:1203 -> a
-    282:289:void rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer):1215:1222 -> a
-    290:319:void onWaveDone():1239:1268 -> a
-    320:338:void lambda$onWaveDone$4(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):1242:1260 -> a
-    339:344:void lambda$onWaveDone$4(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):1259:1264 -> a
-    345:346:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1277:1278 -> a
+    278:278:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1216 -> a
+    279:281:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1216:1218 -> a
+    282:289:void rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer):1230:1237 -> a
+    290:319:void onWaveDone():1254:1283 -> a
+    320:338:void lambda$onWaveDone$4(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):1257:1275 -> a
+    339:344:void lambda$onWaveDone$4(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):1274:1279 -> a
+    345:346:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1292:1293 -> a
     347:347:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):138:138 -> a
-    347:347:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1278 -> a
-    348:351:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1278:1281 -> a
+    347:347:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1293 -> a
+    348:351:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1293:1296 -> a
     352:352:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):138:138 -> a
-    352:352:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1281 -> a
-    353:354:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1281:1282 -> a
-    355:362:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1279:1286 -> a
-    363:363:boolean lambda$onLastWaveDone$5(com.android.tools.r8.graph.ProgramMethod):1284:1284 -> a
-    364:364:boolean lambda$verifyAllSingleCallerMethodsHaveBeenPruned$6(com.android.tools.r8.graph.DexEncodedMethod):1293:1293 -> a
-    365:367:void lambda$verifyAllSingleCallerMethodsHaveBeenPruned$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):1295:1295 -> a
-    368:368:boolean verifyIsPrunedDueToSingleCallerInlining(com.android.tools.r8.graph.DexMethod):1303:1303 -> a
-    369:371:boolean verifyAllMultiCallerInlinedMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1308:1310 -> a
-    1:6:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):780:785 -> b
+    352:352:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1296 -> a
+    353:354:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1296:1297 -> a
+    355:362:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1294:1301 -> a
+    363:363:boolean lambda$onLastWaveDone$5(com.android.tools.r8.graph.ProgramMethod):1299:1299 -> a
+    364:364:boolean lambda$verifyAllSingleCallerMethodsHaveBeenPruned$6(com.android.tools.r8.graph.DexEncodedMethod):1308:1308 -> a
+    365:367:void lambda$verifyAllSingleCallerMethodsHaveBeenPruned$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):1310:1310 -> a
+    368:368:boolean verifyIsPrunedDueToSingleCallerInlining(com.android.tools.r8.graph.DexMethod):1318:1318 -> a
+    369:371:boolean verifyAllMultiCallerInlinedMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1323:1325 -> a
+    1:6:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):795:800 -> b
     7:7:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
-    7:7:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):791 -> b
-    8:15:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):797:804 -> b
-    16:19:boolean lambda$onWaveDone$3(com.android.tools.r8.graph.ProgramMethod):1246:1249 -> b
-    20:21:boolean verifyAllSingleCallerMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1291:1292 -> b
-    1:1:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1235:1235 -> c
-    1:1:void com.android.tools.r8.ir.optimize.Inliner.onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1235:1235 -> d
-    1:1:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1230 -> d
-    2:2:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1231:1231 -> d
+    7:7:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):806 -> b
+    8:15:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):812:819 -> b
+    16:19:boolean lambda$onWaveDone$3(com.android.tools.r8.graph.ProgramMethod):1261:1264 -> b
+    20:21:boolean verifyAllSingleCallerMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1306:1307 -> b
+    1:1:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1250:1250 -> c
+    1:1:void com.android.tools.r8.ir.optimize.Inliner.onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1250:1250 -> d
+    1:1:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1245 -> d
+    2:2:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1246:1246 -> d
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.a:
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint[] $VALUES -> i
@@ -62863,106 +62464,105 @@
     com.android.tools.r8.ir.optimize.Inliner$Constraint ALWAYS -> h
     com.android.tools.r8.ir.optimize.Inliner$Constraint SUBCLASS -> g
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> f
-    1:18:void <clinit>():189:189 -> <clinit>
-    43:47:void <clinit>():214:218 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):209:210 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():189:189 -> a
-    1:1:boolean isSet(int):229:229 -> c
+    1:18:void <clinit>():191:191 -> <clinit>
+    43:47:void <clinit>():216:220 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):211:212 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():191:191 -> a
+    1:1:boolean isSet(int):231:231 -> c
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.b:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType targetHolder -> b
-    1:9:void <clinit>():247:255 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):257:260 -> <init>
-    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):263:267 -> <init>
-    1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):290:313 -> a
-    25:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):319:330 -> a
-    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):335:385 -> a
-    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):462:472 -> a
-    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):385 -> a
-    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):386:393 -> a
-    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):439:454 -> a
-    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):393 -> a
-    123:156:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):397:430 -> a
-    1:5:boolean equals(java.lang.Object):280:284 -> equals
-    1:4:int hashCode():272:275 -> hashCode
+    1:9:void <clinit>():249:257 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):259:262 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):265:269 -> <init>
+    1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):292:315 -> a
+    25:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):321:332 -> a
+    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):337:387 -> a
+    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):464:474 -> a
+    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):387 -> a
+    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):388:395 -> a
+    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):441:456 -> a
+    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):395 -> a
+    123:156:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):399:432 -> a
+    1:5:boolean equals(java.lang.Object):282:286 -> equals
+    1:4:int hashCode():274:277 -> hashCode
     5:5:int com.android.tools.r8.graph.DexType.computeHashCode():124:124 -> hashCode
-    5:5:int hashCode():275 -> hashCode
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.internal.up:
+    5:5:int hashCode():277 -> hashCode
+com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.internal.Wo:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> c
-    boolean shouldSynthesizeNullCheckForReceiver -> e
-    com.android.tools.r8.graph.DexProgramClass downcastClass -> f
-    boolean $assertionsDisabled -> g
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.DexProgramClass downcastClass -> e
     com.android.tools.r8.graph.ProgramMethod target -> a
     com.android.tools.r8.ir.code.Invoke invoke -> b
     boolean shouldSynthesizeInitClass -> d
-    1:1:void <clinit>():511:511 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):522:525 -> <init>
+    1:1:void <clinit>():513:513 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):523:526 -> <init>
     com.android.tools.r8.ir.optimize.Inliner$InlineAction asInlineAction() -> a
-    1:1:void setDowncastClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> a
-    2:8:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):557:563 -> a
-    9:9:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():481:481 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):563 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):563:570 -> a
-    18:29:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):715:726 -> a
-    18:29:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):571 -> a
-    30:31:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):581:582 -> a
-    32:32:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
-    32:32:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):582 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    33:33:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):582 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:36:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):583:585 -> a
-    37:60:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod):731:754 -> a
-    37:60:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):587 -> a
-    61:63:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):592:594 -> a
-    64:70:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):593:599 -> a
-    71:71:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    71:71:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):600 -> a
-    72:82:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):600:610 -> a
-    83:83:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
-    83:83:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):615 -> a
-    84:84:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):615:615 -> a
-    85:92:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):614:621 -> a
-    93:106:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):619:632 -> a
-    107:107:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement):1172:1172 -> a
-    107:107:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):634 -> a
-    108:147:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):635:674 -> a
-    148:150:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):673:675 -> a
-    151:151:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> a
-    151:151:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):675 -> a
-    152:188:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):675:711 -> a
-    189:189:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):637:637 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass getDowncastClass():534:534 -> b
-    1:2:void setShouldSynthesizeInitClass():542:543 -> c
-    1:2:void setShouldSynthesizeNullCheckForReceiver():547:548 -> d
-com.android.tools.r8.ir.optimize.Inliner$InlineResult -> com.android.tools.r8.internal.vp:
-    1:1:void <init>():500:500 -> <init>
+    1:1:void setDowncastClass(com.android.tools.r8.graph.DexProgramClass):539:539 -> a
+    2:10:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):552:560 -> a
+    11:22:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):718:729 -> a
+    11:22:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):561 -> a
+    23:24:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):571:572 -> a
+    25:25:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
+    25:25:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):572 -> a
+    26:26:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):572:572 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    27:27:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):572 -> a
+    28:31:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):573:576 -> a
+    32:32:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():481:481 -> a
+    32:32:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):576 -> a
+    33:43:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):579:589 -> a
+    44:57:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):584:597 -> a
+    58:64:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):596:602 -> a
+    65:65:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    65:65:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):603 -> a
+    66:76:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):603:613 -> a
+    77:77:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    77:77:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):618 -> a
+    78:78:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):618:618 -> a
+    79:86:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):617:624 -> a
+    87:100:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):622:635 -> a
+    101:101:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement):1196:1196 -> a
+    101:101:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):637 -> a
+    102:141:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):638:677 -> a
+    142:144:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):676:678 -> a
+    145:145:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> a
+    145:145:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):678 -> a
+    146:182:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):678:714 -> a
+    183:183:void lambda$buildInliningIR$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):590:590 -> a
+    184:184:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$1(com.android.tools.r8.ir.code.BasicBlock):640:640 -> a
+    185:196:void setRemoveInnerFramePositionForReceiverUse(com.android.tools.r8.ir.code.Instruction):759:770 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass getDowncastClass():535:535 -> b
+    2:9:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):734:741 -> b
+    10:10:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():610:610 -> b
+    10:10:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):741 -> b
+    11:24:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):741:754 -> b
+    1:1:void setShouldSynthesizeInitClass():543:543 -> c
+com.android.tools.r8.ir.optimize.Inliner$InlineResult -> com.android.tools.r8.internal.Xo:
+    1:1:void <init>():502:502 -> <init>
     com.android.tools.r8.ir.optimize.Inliner$InlineAction asInlineAction() -> a
-com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.internal.wp:
+com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.internal.Yo:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     com.android.tools.r8.ir.code.IRCode code -> b
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):772:774 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.xp:
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):787:789 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.Zo:
     com.android.tools.r8.graph.DexProgramClass receiverClass -> b
     com.android.tools.r8.graph.ProgramMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):818:820 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.internal.yp:
+    1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):833:835 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.internal.ap:
     com.android.tools.r8.ir.optimize.Inliner$Reason NEVER -> g
     com.android.tools.r8.ir.optimize.Inliner$Reason MULTI_CALLER_CANDIDATE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> f
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> b
-    1:8:void <clinit>():485:492 -> <clinit>
-    1:1:void <init>(java.lang.String,int):484:484 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$RetryAction -> com.android.tools.r8.internal.zp:
-    1:1:void <init>():759:759 -> <init>
+    1:8:void <clinit>():487:494 -> <clinit>
+    1:1:void <init>(java.lang.String,int):486:486 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$RetryAction -> com.android.tools.r8.internal.bp:
+    1:1:void <init>():774:774 -> <init>
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.c:
     com.android.tools.r8.graph.AppView appView -> a
     boolean allowStaticInterfaceMethodCalls -> b
@@ -62974,9 +62574,8 @@
     1:1:void disallowStaticInterfaceMethodCalls():62:62 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):98:98 -> a
     3:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):172:173 -> a
-    5:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
+    5:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):173 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):173:182 -> a
     16:20:com.android.tools.r8.graph.DexEncodedMethod singleTargetWhileVerticalClassMerging(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.TriFunction):231:235 -> a
     21:21:boolean isVerticalClassMerging():66:66 -> a
@@ -62988,9 +62587,9 @@
     26:26:com.android.tools.r8.graph.DexEncodedMethod singleTargetWhileVerticalClassMerging(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.TriFunction):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":274,"2":275,"3":276}}
     274:274:com.android.tools.r8.graph.DexEncodedMethod singleTargetWhileVerticalClassMerging(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.TriFunction):240:240 -> a
-    275:275:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    275:275:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     275:275:com.android.tools.r8.graph.DexEncodedMethod singleTargetWhileVerticalClassMerging(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.TriFunction):240 -> a
-    276:276:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    276:276:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     276:276:com.android.tools.r8.graph.DexEncodedMethod singleTargetWhileVerticalClassMerging(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.TriFunction):240 -> a
     266:268:com.android.tools.r8.graph.DexEncodedMethod singleTargetWhileVerticalClassMerging(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.TriFunction):240:242 -> a
     269:269:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52:52 -> a
@@ -62999,7 +62598,7 @@
     277:277:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):257:257 -> a
     278:278:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):351:351 -> a
     278:278:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):134 -> a
-    279:279:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
+    279:279:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
     279:279:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):351 -> a
     279:279:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):134 -> a
     280:284:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):352:356 -> a
@@ -63007,29 +62606,27 @@
     285:285:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):353:353 -> a
     285:285:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):134 -> a
     286:294:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):382:390 -> a
-    295:296:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):189:190 -> a
-    295:296:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):387 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    297:297:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
-    297:297:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):190 -> a
-    297:297:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):387 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    298:300:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):393:395 -> a
-    301:301:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":708,"2":709,"3":710}}
-    708:708:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):395:395 -> a
-    709:709:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    709:709:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):395 -> a
-    710:710:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    295:295:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):387:387 -> a
+    296:297:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):189:190 -> a
+    296:297:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):387 -> a
+    298:298:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    298:298:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):190 -> a
+    298:298:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):387 -> a
+    299:301:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):393:395 -> a
+    302:302:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":709,"2":710,"3":711}}
+    709:709:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):395:395 -> a
+    710:710:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     710:710:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):395 -> a
-    697:700:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):396:399 -> a
-    701:707:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):398:404 -> a
+    711:711:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    711:711:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):395 -> a
+    698:701:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):396:399 -> a
+    702:708:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forResolvedMember(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMember):398:404 -> a
     1:1:com.android.tools.r8.graph.AppView getAppView():54:54 -> b
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):102:102 -> b
     3:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):186:187 -> b
-    5:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> b
+    5:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> b
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):187 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):187:187 -> b
     7:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):361:373 -> b
     7:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):188 -> b
@@ -63037,7 +62634,7 @@
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):188 -> b
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):351:351 -> b
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):142 -> b
-    22:22:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> b
+    22:22:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> b
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):351 -> b
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):142 -> b
     23:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):352:356 -> b
@@ -63047,16 +62644,15 @@
     1:1:com.android.tools.r8.graph.GraphLens getGraphLens():58:58 -> c
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):130:130 -> c
     3:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):204:205 -> c
-    5:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> c
+    5:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> c
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):205 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):205:216 -> c
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> c
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> c
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):216 -> c
     19:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):216:221 -> c
     25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):351:351 -> c
     25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):319 -> c
-    26:26:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> c
+    26:26:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> c
     26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):351 -> c
     26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):319 -> c
     27:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):352:356 -> c
@@ -63065,9 +62661,8 @@
     32:32:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):319 -> c
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):138:138 -> d
     2:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):261:262 -> d
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> d
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> d
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):262 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):262:262 -> d
     6:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):361:373 -> d
     6:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):263 -> d
@@ -63075,7 +62670,7 @@
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):263 -> d
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):351:351 -> d
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):323 -> d
-    21:21:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> d
+    21:21:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> d
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):351 -> d
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):323 -> d
     22:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):352:356 -> d
@@ -63086,12 +62681,12 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):196:196 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):287:287 -> g
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):299:299 -> h
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.Ep:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.gp:
     com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod) -> a
     boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.internal.Gp:
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.internal.ip:
     boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement) -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
@@ -63114,7 +62709,7 @@
     19:19:boolean setDowncastTypeIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):66 -> a
     20:23:boolean setDowncastTypeIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):66:69 -> a
     com.android.tools.r8.graph.AppView appView() -> b
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.rq:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.Tp:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     1:2:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):14:15 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
@@ -63122,7 +62717,7 @@
     3:12:int com.android.tools.r8.ir.optimize.InstructionEquivalence.doHash(com.android.tools.r8.ir.code.Instruction):27:36 -> a
     3:12:int doHash(java.lang.Object):11 -> a
     13:14:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):20:21 -> a
-com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.internal.gE:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.internal.nD:
     com.android.tools.r8.graph.DexClass clazz -> a
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set interfaces -> d
@@ -63133,33 +62728,32 @@
     1:1:void <clinit>():161:161 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.graph.DexClass):170:170 -> <init>
     2:8:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.graph.DexClass):166:172 -> <init>
-    1:2:void linkInterface(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):186:187 -> a
-    3:3:void seen(java.lang.Object):191:191 -> a
-    4:4:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200:200 -> a
-    5:7:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.above(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean,java.lang.Object,java.lang.Object,java.util.function.BiFunction):221:223 -> a
-    5:7:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.fold(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):263 -> a
-    5:7:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200 -> a
-    8:9:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.here(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.util.function.BiFunction):240:241 -> a
-    8:9:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.above(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean,java.lang.Object,java.lang.Object,java.util.function.BiFunction):225 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:9:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.fold(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):263 -> a
-    8:9:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200 -> a
-    10:13:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.above(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean,java.lang.Object,java.lang.Object,java.util.function.BiFunction):231:234 -> a
-    10:13:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.fold(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):263 -> a
-    10:13:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200 -> a
-    14:14:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.fold(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):267:267 -> a
-    14:14:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200 -> a
-    15:15:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200:200 -> a
-    16:16:java.lang.Boolean lambda$hasSeen$0(com.android.tools.r8.graph.DexClass,java.lang.Boolean):200:200 -> a
-    17:19:java.lang.Object below(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):248:250 -> a
-    20:21:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.here(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.util.function.BiFunction):240:241 -> a
-    20:21:java.lang.Object below(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):251 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    22:23:java.lang.Object below(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):255:256 -> a
+    1:2:java.lang.Object below(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):0:0 -> a
+    250:253:java.lang.Object below(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):248:251 -> a
+    254:255:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.here(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.util.function.BiFunction):240:241 -> a
+    254:255:java.lang.Object below(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):251 -> a
+    256:257:java.lang.Object below(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):255:256 -> a
+    258:259:void linkInterface(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):186:187 -> a
+    260:260:void seen(java.lang.Object):191:191 -> a
+    261:261:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200:200 -> a
+    262:266:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.above(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean,java.lang.Object,java.lang.Object,java.util.function.BiFunction):221:225 -> a
+    262:266:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.fold(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):263 -> a
+    262:266:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200 -> a
+    267:268:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.here(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.util.function.BiFunction):240:241 -> a
+    267:268:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.above(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean,java.lang.Object,java.lang.Object,java.util.function.BiFunction):225 -> a
+    267:268:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.fold(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):263 -> a
+    267:268:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200 -> a
+    269:272:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.above(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean,java.lang.Object,java.lang.Object,java.util.function.BiFunction):231:234 -> a
+    269:272:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.fold(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):263 -> a
+    269:272:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200 -> a
+    273:273:java.lang.Object com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool.fold(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object,java.lang.Object,java.util.function.BiFunction):267:267 -> a
+    273:273:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200 -> a
+    274:274:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):200:200 -> a
+    275:275:java.lang.Boolean lambda$hasSeen$0(com.android.tools.r8.graph.DexClass,java.lang.Boolean):200:200 -> a
     1:2:void linkSubtype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):181:182 -> b
     3:4:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):195:196 -> b
     1:2:void linkSupertype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):176:177 -> c
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.tE:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.yD:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
@@ -63181,13 +62775,13 @@
     20:27:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):165:172 -> a
     20:27:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
     28:28:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":107,"2":108,"3":109}}
-    107:107:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):172:172 -> a
-    107:107:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":108,"2":109,"3":110}}
     108:108:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):172:172 -> a
     108:108:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
     109:109:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):172:172 -> a
     109:109:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
+    110:110:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):172:172 -> a
+    110:110:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
     29:29:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):175:175 -> a
     29:29:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
     30:41:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):172:183 -> a
@@ -63197,99 +62791,101 @@
     46:46:com.android.tools.r8.ir.code.StaticGet$Builder com.android.tools.r8.ir.code.StaticGet.builder():42:42 -> a
     46:46:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):185 -> a
     46:46:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
-    47:47:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):186:186 -> a
-    47:47:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
-    48:48:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):74:74 -> a
-    48:48:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):187 -> a
-    48:48:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
-    49:58:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):187:196 -> a
-    49:58:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
-    59:59:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":133,"2":134,"3":135}}
-    133:133:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):196:196 -> a
-    133:133:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
+    47:48:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):186:187 -> a
+    47:48:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
+    49:49:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):74:74 -> a
+    49:49:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):187 -> a
+    49:49:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
+    50:59:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):187:196 -> a
+    50:59:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
+    60:60:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":134,"2":135,"3":136}}
     134:134:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):196:196 -> a
     134:134:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
     135:135:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):196:196 -> a
     135:135:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
-    60:62:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):199:201 -> a
-    60:62:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
-    63:63:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):196:196 -> a
-    63:63:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
-    64:65:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):229:230 -> a
-    66:68:void com.android.tools.r8.ir.optimize.MemberValuePropagation.setValueRangeFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.Value):213:215 -> a
-    66:68:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):230 -> a
-    69:78:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):234:243 -> a
-    79:79:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    79:79:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):245 -> a
-    80:80:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):246:246 -> a
-    81:81:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    81:81:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):247 -> a
-    82:84:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):248:250 -> a
-    85:106:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):249:270 -> a
-    136:144:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):364:372 -> a
-    145:155:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):371:381 -> a
-    156:156:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    156:156:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):381 -> a
-    157:157:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    157:157:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):126 -> a
-    157:157:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):385 -> a
-    158:161:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):127:130 -> a
-    158:161:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):385 -> a
-    162:186:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):390:414 -> a
-    187:207:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):412:432 -> a
-    208:208:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    208:208:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):433 -> a
-    209:210:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):434:435 -> a
-    211:211:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    211:211:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):439 -> a
-    212:216:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):440:444 -> a
-    217:232:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):443:458 -> a
-    233:233:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):372:372 -> a
-    234:241:void run(com.android.tools.r8.ir.code.IRCode):503:510 -> a
-    242:242:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    242:242:void run(com.android.tools.r8.ir.code.IRCode):510 -> a
-    243:246:void run(com.android.tools.r8.ir.code.IRCode):510:513 -> a
-    247:258:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):521:532 -> a
-    259:293:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteArrayGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet):75:109 -> a
-    259:293:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):531 -> a
-    294:294:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    294:294:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteArrayGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet):109 -> a
-    294:294:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):531 -> a
-    295:306:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteArrayGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet):110:121 -> a
-    295:306:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):531 -> a
-    307:309:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):533:535 -> a
-    310:327:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):282:299 -> a
-    310:327:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):534 -> a
-    328:335:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):22:29 -> a
-    328:335:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):299 -> a
-    328:335:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):534 -> a
-    336:336:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):301:301 -> a
-    336:336:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):534 -> a
-    337:337:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    337:337:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):134 -> a
-    337:337:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306 -> a
-    337:337:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):534 -> a
-    338:341:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):135:138 -> a
-    338:341:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306 -> a
-    338:341:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):534 -> a
-    342:357:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):311:326 -> a
-    342:357:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):534 -> a
-    358:358:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    358:358:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):327 -> a
-    358:358:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):534 -> a
-    359:368:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:337 -> a
-    359:368:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):534 -> a
-    369:385:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):336:352 -> a
-    369:385:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):534 -> a
-    386:388:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):536:538 -> a
-    389:392:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):537:540 -> a
-    393:405:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):465:477 -> a
-    393:405:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):540 -> a
-    406:407:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):541:542 -> a
-    408:420:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):482:494 -> a
-    408:420:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):542 -> a
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.iF:
+    136:136:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):196:196 -> a
+    136:136:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
+    61:63:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):199:201 -> a
+    61:63:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
+    64:64:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):196:196 -> a
+    64:64:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):226 -> a
+    65:66:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):229:230 -> a
+    67:69:void com.android.tools.r8.ir.optimize.MemberValuePropagation.setValueRangeFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.Value):213:215 -> a
+    67:69:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):230 -> a
+    70:79:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):234:243 -> a
+    80:80:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    80:80:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):245 -> a
+    81:81:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):246:246 -> a
+    82:82:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    82:82:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):247 -> a
+    83:85:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):248:250 -> a
+    86:107:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):249:270 -> a
+    137:145:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):364:372 -> a
+    146:156:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):371:381 -> a
+    157:157:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    157:157:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):381 -> a
+    158:158:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    158:158:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):126 -> a
+    158:158:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):385 -> a
+    159:162:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):127:130 -> a
+    159:162:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):385 -> a
+    163:187:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):390:414 -> a
+    188:208:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):412:432 -> a
+    209:209:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    209:209:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):433 -> a
+    210:211:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):434:435 -> a
+    212:212:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    212:212:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):439 -> a
+    213:217:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):440:444 -> a
+    218:233:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):443:458 -> a
+    234:234:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):372:372 -> a
+    235:242:void run(com.android.tools.r8.ir.code.IRCode):504:511 -> a
+    243:243:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    243:243:void run(com.android.tools.r8.ir.code.IRCode):511 -> a
+    244:247:void run(com.android.tools.r8.ir.code.IRCode):511:514 -> a
+    248:259:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):522:533 -> a
+    260:294:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteArrayGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet):75:109 -> a
+    260:294:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):532 -> a
+    295:295:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    295:295:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteArrayGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet):109 -> a
+    295:295:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):532 -> a
+    296:307:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteArrayGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet):110:121 -> a
+    296:307:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):532 -> a
+    308:310:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):534:536 -> a
+    311:328:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):282:299 -> a
+    311:328:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):535 -> a
+    329:336:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):22:29 -> a
+    329:336:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):299 -> a
+    329:336:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):535 -> a
+    337:337:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):301:301 -> a
+    337:337:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):535 -> a
+    338:338:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    338:338:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):134 -> a
+    338:338:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306 -> a
+    338:338:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):535 -> a
+    339:342:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):135:138 -> a
+    339:342:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306 -> a
+    339:342:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):535 -> a
+    343:358:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):311:326 -> a
+    343:358:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):535 -> a
+    359:359:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    359:359:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):327 -> a
+    359:359:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):535 -> a
+    360:369:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:337 -> a
+    360:369:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):535 -> a
+    370:386:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):336:352 -> a
+    370:386:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):535 -> a
+    387:389:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):537:539 -> a
+    390:393:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):538:541 -> a
+    394:406:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):465:477 -> a
+    394:406:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):541 -> a
+    407:408:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):542:543 -> a
+    409:422:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):482:495 -> a
+    409:422:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):543 -> a
+    423:423:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):494:494 -> a
+    423:423:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):543 -> a
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.kE:
     java.util.Map com.android.tools.r8.ir.optimize.MemberPoolCollection.memberPools -> d
     com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> b
     com.android.tools.r8.com.google.common.base.Equivalence com.android.tools.r8.ir.optimize.MemberPoolCollection.equivalence -> a
@@ -63328,21 +62924,17 @@
     16:16:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):111:111 -> a
     16:16:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$buildAll$0(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):60 -> a
     17:19:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):140:142 -> a
-    20:20:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):189:189 -> a
+    20:20:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):193:193 -> a
     20:20:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):142 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     21:21:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):144:144 -> a
-    22:22:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):213:213 -> a
+    22:22:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):217:217 -> a
     22:22:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):144 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     23:29:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):146:152 -> a
-    30:30:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):189:189 -> a
+    30:30:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):193:193 -> a
     30:30:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):152 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     31:31:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):154:154 -> a
-    32:32:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):213:213 -> a
+    32:32:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):217:217 -> a
     32:32:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):154 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:33:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):143:143 -> a
     34:34:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):273:273 -> a
     34:34:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):143 -> a
@@ -63379,7 +62971,7 @@
     1:1:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):155:155 -> d
     2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):273:273 -> d
     2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):155 -> d
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.YF:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.VE:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> b
     java.util.Set activeMoves -> a
     1:1:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):17:17 -> <init>
@@ -63387,7 +62979,7 @@
     1:12:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):22:33 -> a
     13:51:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):32:70 -> a
     52:56:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):55:59 -> a
-com.android.tools.r8.ir.optimize.MultiCallerInliner -> com.android.tools.r8.internal.jG:
+com.android.tools.r8.ir.optimize.MultiCallerInliner -> com.android.tools.r8.internal.gF:
     com.android.tools.r8.graph.AppView appView -> a
     int[] multiCallerInliningInstructionLimits -> c
     com.android.tools.r8.utils.collections.ProgramMethodMap multiInlineCallEdges -> b
@@ -63398,7 +62990,6 @@
     1:5:void recordCallEdgesForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):61:65 -> a
     6:10:void com.android.tools.r8.utils.Timing.time(java.lang.String,com.android.tools.r8.utils.ThrowingAction):379:383 -> a
     6:10:void recordCallEdgesForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):65 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:void lambda$recordCallEdgesForMultiCallerInlining$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):67:67 -> a
     12:12:com.android.tools.r8.ir.optimize.DefaultInliningOracle lambda$recordCallEdgesForMultiCallerInlining$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):76:76 -> a
     13:15:void recordCallEdgeForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):132:134 -> a
@@ -63430,14 +63021,13 @@
     54:54:boolean lambda$stopTrackingCallSitesForMethodIfDefinitelyIneligibleForMultiCallerInlining$3(com.android.tools.r8.graph.ProgramMethod):160:160 -> b
     55:55:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$onLastWaveDone$6(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph):200:200 -> b
     1:1:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):186:186 -> c
-com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.WG:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.TF:
     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():1835:1835 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():518 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1857:1857 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():519 -> a
     3:3:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):41 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     4:9:void com.android.tools.r8.ir.optimize.NestReducer.removeNests():50:55 -> a
     4:9:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):42 -> a
     10:12:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):44:46 -> a
@@ -63460,21 +63050,21 @@
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> c
     3:3:void processNestMember(com.android.tools.r8.graph.DexProgramClass):100 -> c
     4:6:void processNestMember(com.android.tools.r8.graph.DexProgramClass):100:102 -> c
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.XG:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.UF:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:14:boolean sameNest(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):28:41 -> a
     15:15:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):47:47 -> a
-    16:16:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    16:16:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     16:16:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):47 -> a
     17:23:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):48:54 -> a
     24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
     24:24:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):54 -> a
     25:32:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):55:62 -> a
-    33:33:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    33:33:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     33:33:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):61 -> a
     34:35:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):64:65 -> a
-    36:36:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    36:36:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     36:36:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):64 -> a
     37:37:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
     37:37:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):68 -> a
@@ -63482,9 +63072,9 @@
     43:43:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
     43:43:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):72 -> a
     44:54:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):73:83 -> a
-    55:55:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    55:55:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     55:55:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):78 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl -> com.android.tools.r8.internal.LL:
+com.android.tools.r8.ir.optimize.OutlinerImpl -> com.android.tools.r8.internal.HK:
     java.util.Map outlineSites -> b
     java.util.Map generatedOutlines -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
@@ -63537,9 +63127,8 @@
     135:135:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$buildOutlineMethods$6(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):1523:1523 -> a
     136:136:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1534:1534 -> a
     137:146:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1533:1542 -> a
-    147:147:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    147:147:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     147:147:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1542 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     148:148:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1544:1544 -> a
     149:149:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1543:1543 -> a
     150:150:com.android.tools.r8.graph.Code lambda$buildOutlineMethods$7(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.DexMethod):1541:1541 -> a
@@ -63586,7 +63175,7 @@
     29:50:java.util.List buildOutlineMethods():1527:1548 -> c
     1:1:java.util.Map access$300(com.android.tools.r8.ir.optimize.OutlinerImpl):120:120 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.OutlinerImpl):120:120 -> e
-com.android.tools.r8.ir.optimize.OutlinerImpl$BinOpOutlineInstruction -> com.android.tools.r8.internal.zL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$BinOpOutlineInstruction -> com.android.tools.r8.internal.vK:
     com.android.tools.r8.ir.code.NumericType numericType -> c
     1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType,com.android.tools.r8.ir.code.NumericType):229:230 -> <init>
     boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens) -> a
@@ -63619,21 +63208,20 @@
     27:27:int com.android.tools.r8.ir.optimize.OutlinerImpl$Outline.argumentCount():603:603 -> a
     27:27:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):294 -> a
     28:30:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):296:296 -> a
-    33:33:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):299:299 -> a
-    34:34:int com.android.tools.r8.ir.optimize.OutlinerImpl$Outline.argumentCount():603:603 -> a
-    34:34:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):301 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:54:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):301:320 -> a
-    55:55:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":400,"2":401,"3":402}}
-    400:400:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):320:320 -> a
-    401:401:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):320:320 -> a
+    33:35:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):299:301 -> a
+    36:36:int com.android.tools.r8.ir.optimize.OutlinerImpl$Outline.argumentCount():603:603 -> a
+    36:36:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):301 -> a
+    37:56:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):301:320 -> a
+    57:57:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":402,"2":403,"3":404}}
     402:402:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):320:320 -> a
-    375:375:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):320:320 -> a
-    376:376:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):317:317 -> a
-    377:377:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):314:314 -> a
-    378:381:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):308:311 -> a
-    382:399:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):305:322 -> a
+    403:403:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):320:320 -> a
+    404:404:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):320:320 -> a
+    377:377:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):320:320 -> a
+    378:378:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):317:317 -> a
+    379:379:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):314:314 -> a
+    380:383:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):308:311 -> a
+    384:401:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):305:322 -> a
     1:1:java.lang.String getInstructionName():273:273 -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
@@ -63641,7 +63229,7 @@
     1:1:int com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction.hashCode():199:199 -> hashCode
     1:1:int hashCode():241 -> hashCode
     2:2:int hashCode():241:241 -> hashCode
-com.android.tools.r8.ir.optimize.OutlinerImpl$InvokeOutlineInstruction -> com.android.tools.r8.internal.AL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$InvokeOutlineInstruction -> com.android.tools.r8.internal.wK:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -63669,19 +63257,17 @@
     529:529:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):521 -> a
     530:535:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.optimize.OutlinerImpl$InvokeOutlineInstruction.getArgumentConstraint(int):507:512 -> a
     530:535:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):523 -> a
-    536:541:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):523:528 -> a
-    542:542:int com.android.tools.r8.ir.optimize.OutlinerImpl$Outline.argumentCount():603:603 -> a
-    542:542:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):530 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    543:546:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):530:533 -> a
-    547:547:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):230:230 -> a
-    547:547:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):533 -> a
-    548:548:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):534:534 -> a
-    549:549:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):540:540 -> a
-    550:550:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    550:550:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):540 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    536:543:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):523:530 -> a
+    544:544:int com.android.tools.r8.ir.optimize.OutlinerImpl$Outline.argumentCount():603:603 -> a
+    544:544:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):530 -> a
+    545:548:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):530:533 -> a
+    549:549:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):230:230 -> a
+    549:549:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):533 -> a
+    550:550:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):534:534 -> a
     551:551:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):540:540 -> a
+    552:552:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
+    552:552:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):540 -> a
+    553:553:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):540:540 -> a
     1:1:java.lang.String getInstructionName():493:493 -> b
     1:1:boolean hasOutValue():498:498 -> c
     1:1:int numberOfInputs():503:503 -> d
@@ -63689,7 +63275,7 @@
     1:1:int com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction.hashCode():199:199 -> hashCode
     1:1:int hashCode():439 -> hashCode
     2:6:int hashCode():439:443 -> hashCode
-com.android.tools.r8.ir.optimize.OutlinerImpl$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.BL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.xK:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):336:337 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction):357:357 -> a
@@ -63697,20 +63283,19 @@
     2:2:int compareTo(com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction):358 -> a
     3:4:int compareTo(com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction):360:361 -> a
     5:5:java.lang.String getDetailsString():366:366 -> a
-    6:7:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):386:387 -> a
-    8:8:int com.android.tools.r8.ir.optimize.OutlinerImpl$Outline.argumentCount():603:603 -> a
-    8:8:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):389 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:11:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):389:391 -> a
-    12:12:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):397:397 -> a
-    13:13:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":411,"2":412,"3":413}}
-    411:411:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):397:397 -> a
-    412:412:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    412:412:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):397 -> a
-    413:413:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    413:413:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):397 -> a
-    410:410:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):397:397 -> a
+    6:9:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):386:389 -> a
+    10:10:int com.android.tools.r8.ir.optimize.OutlinerImpl$Outline.argumentCount():603:603 -> a
+    10:10:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):389 -> a
+    11:13:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,int):389:391 -> a
+    14:14:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):397:397 -> a
+    15:15:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":413,"2":414,"3":415}}
+    413:413:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):397:397 -> a
+    414:414:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    414:414:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):397 -> a
+    415:415:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    415:415:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):397 -> a
+    412:412:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):397:397 -> a
     1:1:java.lang.String getInstructionName():371:371 -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
@@ -63718,7 +63303,7 @@
     1:1:int com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction.hashCode():199:199 -> hashCode
     1:1:int hashCode():352 -> hashCode
     2:2:int hashCode():352:352 -> hashCode
-com.android.tools.r8.ir.optimize.OutlinerImpl$Outline -> com.android.tools.r8.internal.CL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$Outline -> com.android.tools.r8.internal.yK:
     java.util.List argumentTypes -> b
     java.util.List templateInstructions -> d
     java.util.List argumentMap -> c
@@ -63735,17 +63320,17 @@
     7:7:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1269,"2":1270,"3":1271}}
     1269:1269:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):624:624 -> a
-    1270:1270:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    1270:1270:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     1270:1270:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):624 -> a
-    1271:1271:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    1271:1271:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     1271:1271:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):624 -> a
     635:635:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):628:628 -> a
     636:636:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1272,"2":1273,"3":1274}}
     1272:1272:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):628:628 -> a
-    1273:1273:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    1273:1273:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     1273:1273:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):628 -> a
-    1274:1274:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    1274:1274:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     1274:1274:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):628 -> a
     1264:1267:boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens):628:631 -> a
     1268:1268:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
@@ -63763,20 +63348,20 @@
     1:18:boolean equals(java.lang.Object):638:655 -> equals
     1:6:int hashCode():663:668 -> hashCode
     1:37:java.lang.String toString():724:760 -> toString
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineCode -> com.android.tools.r8.internal.DL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineCode -> com.android.tools.r8.internal.zK:
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> e
     com.android.tools.r8.ir.optimize.OutlinerImpl$Outline outline -> d
-    1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1773:1774 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1772:1773 -> <init>
     java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper) -> a
-    1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):1800:1801 -> a
-    3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):1811:1811 -> a
-    4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1816:1816 -> a
-    1:1:boolean computeEquals(java.lang.Object):1826:1826 -> g
-    1:1:int computeHashCode():1821:1821 -> g0
+    1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):1799:1800 -> a
+    3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):1810:1810 -> a
+    4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1815:1815 -> a
+    1:1:int computeHashCode():1820:1820 -> g0
+    1:1:boolean computeEquals(java.lang.Object):1825:1825 -> h
     int estimatedDexCodeSizeUpperBoundInBytes() -> k0
     int estimatedSizeForInlining() -> l0
-    1:1:java.lang.String toString():1806:1806 -> toString
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction -> com.android.tools.r8.internal.FL:
+    1:1:java.lang.String toString():1805:1805 -> toString
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction -> com.android.tools.r8.internal.BK:
     com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():140:140 -> <clinit>
@@ -63789,18 +63374,18 @@
     java.lang.String getInstructionName() -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.EL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.AK:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String name(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineMethodIdentifier -> com.android.tools.r8.internal.GL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineMethodIdentifier -> com.android.tools.r8.internal.CK:
     java.util.List outlinesForMethod -> p
     1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):1189:1190 -> <init>
     1:1:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1195:1195 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineRewriter -> com.android.tools.r8.internal.HL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineRewriter -> com.android.tools.r8.internal.DK:
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> t
     boolean $assertionsDisabled -> u
     com.android.tools.r8.ir.code.IRCode code -> p
@@ -63812,13 +63397,12 @@
     1:9:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1235:1243 -> a
     10:10:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
     10:10:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1243 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:27:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1243:1259 -> a
     28:33:java.util.List com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSpotter.orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):806:811 -> a
     28:33:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1263 -> a
     34:63:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1264:1293 -> a
     64:69:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1290:1295 -> a
-    70:70:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
+    70:70:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():39:39 -> a
     70:70:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1296 -> a
     71:73:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1297:1299 -> a
     74:76:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1305:1307 -> a
@@ -63827,12 +63411,12 @@
     82:82:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1309:1309 -> a
     83:87:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1306:1310 -> a
     88:88:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1308:1308 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSiteIdentifier -> com.android.tools.r8.internal.IL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSiteIdentifier -> com.android.tools.r8.internal.EK:
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> p
     1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List):1202:1203 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1208:1210 -> a
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1209:1209 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSourceCode -> com.android.tools.r8.internal.JL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSourceCode -> com.android.tools.r8.internal.FK:
     com.android.tools.r8.ir.optimize.OutlinerImpl$Outline outline -> a
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> e
     boolean $assertionsDisabled -> f
@@ -63847,27 +63431,26 @@
     com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
     1:1:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1659:1659 -> a
-    2:2:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1690:1690 -> a
-    3:7:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1701:1705 -> a
+    2:2:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1689:1689 -> a
+    3:7:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1700:1704 -> a
     8:8:int com.android.tools.r8.ir.optimize.OutlinerImpl$Outline.argumentCount():603:603 -> a
-    8:8:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1705 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:19:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1705:1715 -> a
-    20:20:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1721:1721 -> a
-    21:21:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1727:1727 -> a
+    8:8:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1704 -> a
+    9:19:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1704:1714 -> a
+    20:20:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1720:1720 -> a
+    21:21:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1726:1726 -> a
     com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> b
     void setUp() -> b
-    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1742:1742 -> b
+    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1741:1741 -> b
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> c
     boolean verifyCurrentInstructionCanThrow() -> c
-    1:12:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1673:1684 -> c
+    1:9:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1673:1681 -> c
     1:1:int instructionCount():1628:1628 -> d
-    2:2:int getMoveExceptionRegister(int):1737:1737 -> d
+    2:2:int getMoveExceptionRegister(int):1736:1736 -> d
     int instructionOffset(int) -> e
-    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1749:1749 -> e
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1748:1748 -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSpotter -> com.android.tools.r8.internal.KL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSpotter -> com.android.tools.r8.internal.GK:
     com.android.tools.r8.graph.DexType returnType -> j
     int returnValueUniqueUsersLeft -> l
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> n
@@ -63963,7 +63546,6 @@
     134:203:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):874:943 -> a
     204:204:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> a
     204:204:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):943 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     205:211:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):946:952 -> a
     212:212:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):947:947 -> a
     213:213:boolean lambda$canIncludeInstruction$0(com.android.tools.r8.ir.code.Value):868:868 -> a
@@ -64006,11 +63588,10 @@
     263:292:void candidate(int,int):1130:1159 -> a
     293:303:void reset(int):1164:1174 -> a
     1:7:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):975:981 -> b
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> b
     8:8:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):981 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:15:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):984:990 -> b
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.gM:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.cL:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):40:40 -> a
@@ -64039,7 +63620,7 @@
     47:53:void com.android.tools.r8.ir.optimize.PeepholeOptimizer.shareIdenticalBlockPrefix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):49:55 -> a
     47:53:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):42 -> a
     54:55:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):43:44 -> a
-    56:56:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph():616:616 -> a
+    56:56:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph():619:619 -> a
     56:56:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):44 -> a
     57:187:void shareIdenticalBlockPrefixFromNormalSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Set,com.android.tools.r8.ir.optimize.InstructionEquivalence):63:193 -> a
     188:188:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
@@ -64090,7 +63671,7 @@
     291:300:int com.android.tools.r8.ir.optimize.PeepholeOptimizer.sharedSuffixSize(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):409:418 -> a
     291:300:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):287 -> a
     301:304:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):287:290 -> a
-    305:305:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1176:1176 -> a
+    305:305:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
     305:305:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):298 -> a
     306:308:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):324:326 -> a
     306:308:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
@@ -64104,28 +63685,28 @@
     323:323:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
     323:323:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):337 -> a
     323:323:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
-    324:341:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):338:355 -> a
-    324:341:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
-    342:342:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
-    342:342:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):356 -> a
-    342:342:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
-    343:372:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):357:386 -> a
-    343:372:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
-    373:385:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):303:315 -> a
-    386:386:java.util.List lambda$shareIdenticalBlockSuffix$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):263:263 -> a
-    387:407:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):431:451 -> a
-    408:408:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
-    408:408:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):452 -> a
-    409:409:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
+    324:342:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):338:356 -> a
+    324:342:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
+    343:343:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    343:343:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):356 -> a
+    343:343:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
+    344:373:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):357:386 -> a
+    344:373:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
+    374:386:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):303:315 -> a
+    387:387:java.util.List lambda$shareIdenticalBlockSuffix$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):263:263 -> a
+    388:408:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):431:451 -> a
+    409:409:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
     409:409:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):452 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     410:410:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):452:452 -> a
-    411:425:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):451:465 -> a
-    426:426:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
-    426:426:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):466 -> a
-    427:430:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):466:469 -> a
+    411:411:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    411:411:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):452 -> a
+    412:412:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):452:452 -> a
+    413:427:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):451:465 -> a
+    428:428:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    428:428:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):466 -> a
+    429:432:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):466:469 -> a
     1:1:java.util.List lambda$shareIdenticalBlockSuffix$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):271:271 -> b
-com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.jM:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.fL:
     1:1:boolean optimize(com.android.tools.r8.ir.code.IRCode):24:24 -> a
     1:6:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):112:117 -> b
     7:8:boolean com.android.tools.r8.ir.optimize.PhiOptimizations.predecessorsHaveNormalFlow(com.android.tools.r8.ir.code.BasicBlock):28:29 -> b
@@ -64173,7 +63754,7 @@
     39:50:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     51:64:boolean com.android.tools.r8.ir.optimize.PhiOptimizations.tryMovePhiToStack(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi,java.util.Set):160:173 -> b
     51:64:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination -> com.android.tools.r8.internal.cR:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination -> com.android.tools.r8.internal.JP:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState activeState -> h
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
@@ -64192,7 +63773,6 @@
     2:2:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):180:180 -> a
     3:3:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
     3:3:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):180 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:6:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):181:183 -> a
     7:7:java.util.Set access$000(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):58:58 -> a
     8:10:void lambda$processInstructionsToRemove$1(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):315:315 -> a
@@ -64213,11 +63793,9 @@
     87:91:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):509:513 -> a
     92:92:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> a
     92:92:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):513 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     93:101:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):514:522 -> a
     102:102:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
     102:102:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):522 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     103:104:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):522:523 -> a
     105:108:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.verifyWasInstanceInitializer():333:336 -> a
     105:108:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):524 -> a
@@ -64260,182 +63838,177 @@
     3:3:java.lang.Boolean lambda$handleStaticPut$4(com.android.tools.r8.graph.DexClassAndField):613:613 -> b
     4:4:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> b
     4:4:java.lang.Boolean lambda$handleStaticPut$4(com.android.tools.r8.graph.DexClassAndField):613 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:java.lang.Boolean lambda$handleStaticPut$4(com.android.tools.r8.graph.DexClassAndField):613:613 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod access$200(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):58:58 -> c
-    2:3:void run():199:200 -> c
-    4:4:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():216:216 -> c
-    4:4:void run():201 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:11:void run():202:208 -> c
-    12:12:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():216:216 -> c
-    12:12:void run():208 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:22:void run():212:221 -> c
-    23:29:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.resolveField(com.android.tools.r8.graph.DexField):187:193 -> c
-    23:29:void run():222 -> c
-    30:30:void run():223:223 -> c
-    31:31:boolean com.android.tools.r8.graph.DexEncodedField.isVolatile():238:238 -> c
-    31:31:void run():223 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> c
-    32:32:void run():228 -> c
-    33:33:void run():229:229 -> c
-    34:34:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):454:454 -> c
-    34:34:void run():229 -> c
-    35:35:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):484:484 -> c
-    35:35:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):455 -> c
+    2:4:void run():199:201 -> c
+    5:5:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():217:217 -> c
+    5:5:void run():201 -> c
+    6:12:void run():202:208 -> c
+    13:13:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():217:217 -> c
+    13:13:void run():208 -> c
+    14:23:void run():212:221 -> c
+    24:30:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.resolveField(com.android.tools.r8.graph.DexField):187:193 -> c
+    24:30:void run():222 -> c
+    31:31:void run():223:223 -> c
+    32:32:boolean com.android.tools.r8.graph.DexEncodedField.isVolatile():238:238 -> c
+    32:32:void run():223 -> c
+    33:33:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> c
+    33:33:void run():228 -> c
+    34:34:void run():229:229 -> c
+    35:35:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):454:454 -> c
     35:35:void run():229 -> c
-    36:36:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> c
-    36:36:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):484 -> c
+    36:36:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):484:484 -> c
     36:36:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):455 -> c
     36:36:void run():229 -> c
-    37:39:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):485:487 -> c
-    37:39:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):455 -> c
-    37:39:void run():229 -> c
-    40:50:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):459:469 -> c
-    40:50:void run():229 -> c
-    51:51:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):484:484 -> c
-    51:51:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):470 -> c
-    51:51:void run():229 -> c
-    52:52:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> c
-    52:52:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):484 -> c
+    37:37:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> c
+    37:37:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):484 -> c
+    37:37:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):455 -> c
+    37:37:void run():229 -> c
+    38:40:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):485:487 -> c
+    38:40:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):455 -> c
+    38:40:void run():229 -> c
+    41:51:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):459:469 -> c
+    41:51:void run():229 -> c
+    52:52:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):484:484 -> c
     52:52:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):470 -> c
     52:52:void run():229 -> c
-    53:55:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):485:487 -> c
-    53:55:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):470 -> c
-    53:55:void run():229 -> c
-    56:57:void run():230:231 -> c
-    58:58:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> c
-    58:58:void run():232 -> c
-    59:59:void run():233:233 -> c
-    60:60:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):550:550 -> c
-    60:60:void run():233 -> c
-    61:61:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):437:437 -> c
-    61:61:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):550 -> c
+    53:53:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> c
+    53:53:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):484 -> c
+    53:53:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):470 -> c
+    53:53:void run():229 -> c
+    54:56:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):485:487 -> c
+    54:56:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):470 -> c
+    54:56:void run():229 -> c
+    57:58:void run():230:231 -> c
+    59:59:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> c
+    59:59:void run():232 -> c
+    60:60:void run():233:233 -> c
+    61:61:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):550:550 -> c
     61:61:void run():233 -> c
-    62:63:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):552:553 -> c
-    62:63:void run():233 -> c
-    64:64:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):591:591 -> c
-    64:64:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):554 -> c
-    64:64:void run():233 -> c
-    65:65:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> c
-    65:65:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):591 -> c
+    62:62:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):437:437 -> c
+    62:62:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):550 -> c
+    62:62:void run():233 -> c
+    63:64:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):552:553 -> c
+    63:64:void run():233 -> c
+    65:65:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):591:591 -> c
     65:65:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):554 -> c
     65:65:void run():233 -> c
-    66:68:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):592:594 -> c
-    66:68:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):554 -> c
-    66:68:void run():233 -> c
-    69:77:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):558:566 -> c
-    69:77:void run():233 -> c
-    78:78:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):591:591 -> c
-    78:78:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):567 -> c
-    78:78:void run():233 -> c
-    79:79:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> c
-    79:79:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):591 -> c
+    66:66:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> c
+    66:66:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):591 -> c
+    66:66:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):554 -> c
+    66:66:void run():233 -> c
+    67:69:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):592:594 -> c
+    67:69:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):554 -> c
+    67:69:void run():233 -> c
+    70:78:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):558:566 -> c
+    70:78:void run():233 -> c
+    79:79:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):591:591 -> c
     79:79:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):567 -> c
     79:79:void run():233 -> c
-    80:82:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):592:594 -> c
-    80:82:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):567 -> c
-    80:82:void run():233 -> c
-    83:90:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):569:576 -> c
-    83:90:void run():233 -> c
-    91:91:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> c
-    91:91:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):576 -> c
-    91:91:void run():233 -> c
-    92:99:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):578:585 -> c
-    92:99:void run():233 -> c
-    100:101:void run():234:235 -> c
-    102:102:void run():224:224 -> c
-    103:103:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> c
-    103:103:void run():237 -> c
-    104:104:void run():238:238 -> c
-    105:105:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> c
-    105:105:void run():239 -> c
-    106:106:void run():240:240 -> c
-    107:117:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):416:426 -> c
-    107:117:void run():240 -> c
-    118:118:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):437:437 -> c
-    118:118:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):427 -> c
-    118:118:void run():240 -> c
-    119:123:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):428:432 -> c
-    119:123:void run():240 -> c
-    124:124:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> c
-    124:124:void run():241 -> c
-    125:131:void run():242:248 -> c
-    132:132:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):399:399 -> c
-    132:132:void run():248 -> c
-    133:133:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():642:642 -> c
-    133:133:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):399 -> c
+    80:80:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> c
+    80:80:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):591 -> c
+    80:80:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):567 -> c
+    80:80:void run():233 -> c
+    81:83:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):592:594 -> c
+    81:83:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):567 -> c
+    81:83:void run():233 -> c
+    84:91:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):569:576 -> c
+    84:91:void run():233 -> c
+    92:92:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> c
+    92:92:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):576 -> c
+    92:92:void run():233 -> c
+    93:100:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):578:585 -> c
+    93:100:void run():233 -> c
+    101:102:void run():234:235 -> c
+    103:103:void run():224:224 -> c
+    104:104:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> c
+    104:104:void run():237 -> c
+    105:105:void run():238:238 -> c
+    106:106:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> c
+    106:106:void run():239 -> c
+    107:107:void run():240:240 -> c
+    108:118:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):416:426 -> c
+    108:118:void run():240 -> c
+    119:119:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):437:437 -> c
+    119:119:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):427 -> c
+    119:119:void run():240 -> c
+    120:124:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):428:432 -> c
+    120:124:void run():240 -> c
+    125:125:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> c
+    125:125:void run():241 -> c
+    126:132:void run():242:248 -> c
+    133:133:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):399:399 -> c
     133:133:void run():248 -> c
-    134:141:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):400:407 -> c
-    134:141:void run():248 -> c
-    142:142:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):437:437 -> c
-    142:142:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):407 -> c
-    142:142:void run():248 -> c
-    143:147:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):408:412 -> c
-    143:147:void run():248 -> c
-    148:148:void run():249:249 -> c
-    149:149:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> c
-    149:149:void run():249 -> c
-    150:151:void run():251:252 -> c
-    152:152:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):474:474 -> c
-    152:152:void run():252 -> c
-    153:153:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):437:437 -> c
-    153:153:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):474 -> c
+    134:134:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():642:642 -> c
+    134:134:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):399 -> c
+    134:134:void run():248 -> c
+    135:142:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):400:407 -> c
+    135:142:void run():248 -> c
+    143:143:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):437:437 -> c
+    143:143:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):407 -> c
+    143:143:void run():248 -> c
+    144:148:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):408:412 -> c
+    144:148:void run():248 -> c
+    149:149:void run():249:249 -> c
+    150:150:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> c
+    150:150:void run():249 -> c
+    151:152:void run():251:252 -> c
+    153:153:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):474:474 -> c
     153:153:void run():252 -> c
-    154:156:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):475:477 -> c
-    154:156:void run():252 -> c
-    157:169:void run():256:268 -> c
-    170:170:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> c
-    170:170:void run():269 -> c
-    171:174:void run():270:273 -> c
-    175:175:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> c
-    175:175:void run():274 -> c
-    176:176:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodHandle():0:0 -> c
-    176:176:void run():275 -> c
-    177:177:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodType():0:0 -> c
-    177:177:void run():276 -> c
-    178:178:void run():277:277 -> c
-    179:179:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> c
-    179:179:void run():278 -> c
-    180:180:void run():279:279 -> c
-    181:181:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> c
-    181:181:void run():280 -> c
-    182:183:void run():281:282 -> c
-    184:184:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> c
-    184:184:void run():283 -> c
-    185:185:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> c
-    185:185:void run():284 -> c
-    186:186:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> c
-    186:186:void run():285 -> c
-    187:187:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> c
-    187:187:void run():286 -> c
-    188:188:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> c
-    188:188:void run():287 -> c
-    189:193:void run():288:292 -> c
-    194:194:boolean com.android.tools.r8.ir.code.Instruction.isRecordFieldValues():0:0 -> c
-    194:194:void run():293 -> c
-    195:195:void run():267:267 -> c
-    196:196:void run():0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":507,"2":508,"3":509}}
-    507:507:void run():267:267 -> c
+    154:154:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):437:437 -> c
+    154:154:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):474 -> c
+    154:154:void run():252 -> c
+    155:157:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):475:477 -> c
+    155:157:void run():252 -> c
+    158:170:void run():256:268 -> c
+    171:171:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> c
+    171:171:void run():269 -> c
+    172:175:void run():270:273 -> c
+    176:176:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> c
+    176:176:void run():274 -> c
+    177:177:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodHandle():0:0 -> c
+    177:177:void run():275 -> c
+    178:178:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodType():0:0 -> c
+    178:178:void run():276 -> c
+    179:179:void run():277:277 -> c
+    180:180:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> c
+    180:180:void run():278 -> c
+    181:181:void run():279:279 -> c
+    182:182:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> c
+    182:182:void run():280 -> c
+    183:184:void run():281:282 -> c
+    185:185:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> c
+    185:185:void run():283 -> c
+    186:186:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> c
+    186:186:void run():284 -> c
+    187:187:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> c
+    187:187:void run():285 -> c
+    188:188:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> c
+    188:188:void run():286 -> c
+    189:189:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> c
+    189:189:void run():287 -> c
+    190:194:void run():288:292 -> c
+    195:195:boolean com.android.tools.r8.ir.code.Instruction.isRecordFieldValues():0:0 -> c
+    195:195:void run():293 -> c
+    196:196:void run():267:267 -> c
+    197:197:void run():0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":508,"2":509,"3":510}}
     508:508:void run():267:267 -> c
     509:509:void run():267:267 -> c
-    490:490:void run():294:294 -> c
-    491:491:void run():250:250 -> c
-    492:492:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():216:216 -> c
-    492:492:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():220 -> c
-    492:492:void run():297 -> c
-    493:493:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():220:220 -> c
+    510:510:void run():267:267 -> c
+    491:491:void run():294:294 -> c
+    492:492:void run():250:250 -> c
+    493:493:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():217:217 -> c
+    493:493:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():221 -> c
     493:493:void run():297 -> c
-    494:503:void run():298:307 -> c
-    504:504:com.android.tools.r8.ir.optimize.AssumeRemover com.android.tools.r8.ir.optimize.AssumeRemover.removeMarkedInstructions():104:104 -> c
-    504:504:void run():308 -> c
-    505:506:void run():308:309 -> c
+    494:494:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():221:221 -> c
+    494:494:void run():297 -> c
+    495:504:void run():298:307 -> c
+    505:505:com.android.tools.r8.ir.optimize.AssumeRemover com.android.tools.r8.ir.optimize.AssumeRemover.removeMarkedInstructions():104:104 -> c
+    505:505:void run():308 -> c
+    506:507:void run():308:309 -> c
     1:1:com.android.tools.r8.ir.code.IRCode access$300(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):58:58 -> d
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1 -> com.android.tools.r8.internal.VQ:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState -> com.android.tools.r8.internal.WQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState -> com.android.tools.r8.internal.DP:
     java.util.LinkedHashMap finalInstanceFieldValues -> a
     java.util.LinkedHashMap nonFinalInstanceFieldValues -> d
     java.util.LinkedHashMap nonFinalStaticFieldValues -> e
@@ -64485,7 +64058,6 @@
     29:30:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):990 -> a
     31:32:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState.killActiveInitializedClassesForExceptionalExit(com.android.tools.r8.ir.code.InitClass):995:996 -> a
     31:32:void access$600(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState,com.android.tools.r8.ir.code.InitClass):802 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:37:boolean markClassAsInitialized(com.android.tools.r8.graph.DexType):1001:1005 -> a
     38:40:void reduceSize(int):1009:1011 -> a
     41:44:int com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState.reduceSize(int,java.util.Set):1025:1028 -> a
@@ -64532,15 +64104,14 @@
     3:3:int com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState.size(java.util.Set):1168:1168 -> h
     3:3:int size():1160 -> h
     4:8:int size():1160:1164 -> h
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates -> com.android.tools.r8.internal.XQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates -> com.android.tools.r8.internal.EP:
     java.util.LinkedHashMap activeStateAtExit -> a
     int capacity -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():678:678 -> <clinit>
     1:6:void <init>():678:683 -> <init>
-    1:1:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():609:609 -> a
+    1:1:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():610:610 -> a
     1:1:com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):686 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:24:com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):687:709 -> a
     25:25:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
     25:25:com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):710 -> a
@@ -64552,20 +64123,19 @@
     38:42:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates.removeState(com.android.tools.r8.ir.code.BasicBlock):783:787 -> a
     38:42:void removeDeadBlockExitStates(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):758 -> a
     43:43:void removeDeadBlockExitStates(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):760:760 -> a
-    44:45:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):768:769 -> a
-    46:46:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueSuccessorWithUniquePredecessor():212:212 -> a
-    46:46:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):772 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    47:48:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):773:774 -> a
-    49:74:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):720:745 -> a
-    49:74:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):776 -> a
-    75:77:int com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates.size():793:795 -> a
-    75:77:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):745 -> a
-    75:77:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):776 -> a
-    78:78:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):745:745 -> a
-    78:78:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):776 -> a
-    79:81:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):777:779 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ExistingValue -> com.android.tools.r8.internal.YQ:
+    44:48:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):768:772 -> a
+    49:49:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueSuccessorWithUniquePredecessor():213:213 -> a
+    49:49:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):772 -> a
+    50:51:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):773:774 -> a
+    52:77:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):720:745 -> a
+    52:77:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):776 -> a
+    78:80:int com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates.size():793:795 -> a
+    78:80:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):745 -> a
+    78:80:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):776 -> a
+    81:81:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):745:745 -> a
+    81:81:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):776 -> a
+    82:84:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):777:779 -> a
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ExistingValue -> com.android.tools.r8.internal.FP:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination this$0 -> b
     com.android.tools.r8.ir.code.Value value -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1):103:103 -> <init>
@@ -64579,7 +64149,7 @@
     133:133:java.lang.String toString():130:130 -> toString
     134:134:java.lang.String toString():130:130 -> toString
     131:131:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject -> com.android.tools.r8.internal.ZQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject -> com.android.tools.r8.internal.GP:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -64589,10 +64159,10 @@
     1:1:com.android.tools.r8.graph.DexField access$800(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject):151:151 -> a
     1:5:boolean equals(java.lang.Object):168:172 -> equals
     1:1:int hashCode():163:163 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue -> com.android.tools.r8.internal.aR:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue -> com.android.tools.r8.internal.HP:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ExistingValue asExistingValue() -> a
     void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction) -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$MaterializableValue -> com.android.tools.r8.internal.bR:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$MaterializableValue -> com.android.tools.r8.internal.IP:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination this$0 -> b
     com.android.tools.r8.ir.analysis.value.SingleValue value -> a
     boolean $assertionsDisabled -> c
@@ -64603,7 +64173,7 @@
     4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
     4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):147 -> a
     5:5:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):146:146 -> a
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.IS:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.lR:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     1:21:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:61 -> a
@@ -64633,43 +64203,29 @@
     83:93:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
     94:94:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):276:276 -> a
     94:94:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    95:95:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184 -> a
-    95:95:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):276 -> a
-    95:95:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
-    96:97:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):189:190 -> a
-    96:97:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184 -> a
-    96:97:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):276 -> a
-    96:97:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
-    98:98:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
-    98:98:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):190 -> a
-    98:98:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184 -> a
-    98:98:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):276 -> a
-    98:98:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
-    99:103:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):275:279 -> a
-    99:103:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
-    104:105:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67:68 -> a
-    106:150:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForGetClassTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual,java.util.function.BiConsumer):158:202 -> a
-    106:150:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):64 -> a
-    151:152:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74:75 -> a
-    153:153:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    153:153:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75 -> a
-    154:156:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:77 -> a
-    157:157:boolean lambda$rewriteGetClassOrForNameToConstClass$0(com.android.tools.r8.ir.code.Instruction):51:51 -> a
-    158:158:java.util.function.BiConsumer rewriteSingleGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):87:87 -> a
-    159:166:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):89:96 -> a
-    167:183:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):95:111 -> a
-    184:184:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1646:1646 -> a
-    184:184:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):111 -> a
-    185:206:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):111:132 -> a
-    207:221:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):131:145 -> a
-    222:222:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    222:222:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):145 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    223:225:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):146:148 -> a
-    226:226:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):147:147 -> a
-    227:229:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):121:123 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.eV:
+    95:99:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):275:279 -> a
+    95:99:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    100:101:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67:68 -> a
+    102:146:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForGetClassTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual,java.util.function.BiConsumer):158:202 -> a
+    102:146:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):64 -> a
+    147:148:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74:75 -> a
+    149:149:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    149:149:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75 -> a
+    150:152:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:77 -> a
+    153:153:boolean lambda$rewriteGetClassOrForNameToConstClass$0(com.android.tools.r8.ir.code.Instruction):51:51 -> a
+    154:154:java.util.function.BiConsumer rewriteSingleGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):87:87 -> a
+    155:162:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):89:96 -> a
+    163:179:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):95:111 -> a
+    180:180:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
+    180:180:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):111 -> a
+    181:202:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):111:132 -> a
+    203:217:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):131:145 -> a
+    218:218:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    218:218:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):145 -> a
+    219:221:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):146:148 -> a
+    222:222:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):147:147 -> a
+    223:225:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):121:123 -> a
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.wT:
     java.util.List serviceLoadMethods -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> c
@@ -64677,7 +64233,7 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):66:72 -> <init>
     1:1:java.util.List getServiceLoadMethods():76:76 -> a
     2:2:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):80:80 -> a
-    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     3:3:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):81 -> a
     4:30:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):84:110 -> a
     31:31:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
@@ -64685,9 +64241,8 @@
     32:94:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):114:176 -> a
     95:108:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):175:188 -> a
     109:110:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):179:180 -> a
-    111:111:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    111:111:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     111:111:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):180 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     112:112:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):182:182 -> a
     113:113:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):181:181 -> a
     114:120:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):196:202 -> a
@@ -64717,7 +64272,7 @@
     269:269:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> a
     269:269:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):118 -> a
     269:269:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$2(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):215 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.dV:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.vT:
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> b
@@ -64734,7 +64289,90 @@
     31:31:void lambda$perform$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Instruction):269 -> a
     32:33:void lambda$perform$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Instruction):269:270 -> a
     34:34:boolean lambda$perform$1(com.android.tools.r8.ir.code.Instruction):274:274 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.GY:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis -> com.android.tools.r8.internal.YT:
+    com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult NO_RESULT -> a
+    boolean $assertionsDisabled -> b
+    1:203:void <clinit>():28:230 -> <clinit>
+    1:1:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult access$100():28:28 -> a
+    2:8:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult canInlineWithoutSynthesizingNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):302:308 -> a
+    9:9:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult.builder():196:196 -> a
+    9:9:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis.run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis):238 -> a
+    9:9:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult canInlineWithoutSynthesizingNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):308 -> a
+    10:66:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis.run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis):239:295 -> a
+    10:66:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult canInlineWithoutSynthesizingNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):308 -> a
+    67:67:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.DepthFirstSearchWorkListBase.run(java.lang.Object[]):125:125 -> a
+    67:67:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis.run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis):295 -> a
+    67:67:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult canInlineWithoutSynthesizingNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):308 -> a
+    68:68:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis.run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis):297:297 -> a
+    68:68:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult canInlineWithoutSynthesizingNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):308 -> a
+    69:77:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect lambda$canInlineWithoutSynthesizingNullCheckForReceiver$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):311:319 -> a
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$1 -> com.android.tools.r8.internal.QT:
+    1:1:void <init>(java.util.List,java.util.List):230:230 -> <init>
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$2 -> com.android.tools.r8.internal.RT:
+    com.android.tools.r8.utils.IntBox val$visitedInstructions -> e
+    com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder val$builder -> g
+    com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis val$analysis -> f
+    boolean $assertionsDisabled -> h
+    1:1:void <clinit>():240:240 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder):240:240 -> <init>
+    1:9:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):248:256 -> a
+    10:10:void com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder.addSatisfyingInstruction(com.android.tools.r8.ir.code.Instruction):215:215 -> a
+    10:10:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):256 -> a
+    11:23:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):262:274 -> a
+    24:30:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect.toResultState():52:58 -> a
+    24:30:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):274 -> a
+    31:32:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):274:275 -> a
+    33:41:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):282:290 -> a
+    42:42:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():610:610 -> a
+    42:42:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):290 -> a
+    43:43:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):291:291 -> a
+    44:44:void com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder.setFailingBlocksForPartialResults(java.util.List):219:219 -> a
+    44:44:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):291 -> a
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis -> com.android.tools.r8.internal.ST:
+    com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect analyze(com.android.tools.r8.ir.code.Instruction) -> a
+    int maxNumberOfInstructions() -> a
+    1:1:java.util.List getSuccessors(com.android.tools.r8.ir.code.BasicBlock):158:158 -> a
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.TT:
+# {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
+# {"id":"com.android.tools.r8.synthesized"}
+    boolean com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect.$assertionsDisabled -> a
+    1:1:void com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect.<clinit>():30:30 -> <clinit>
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.UT:
+# {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
+# {"id":"com.android.tools.r8.synthesized"}
+    boolean com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState.isNotComputed() -> a
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks -> com.android.tools.r8.internal.VT:
+    java.util.List failingBlocks -> b
+    com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState state -> a
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():107:107 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState,java.util.List,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$1):107:107 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState,java.util.List):112:114 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState access$400(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks):107:107 -> a
+    2:8:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks joinChildren(java.util.List):119:125 -> a
+    9:12:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState.join(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState):94:97 -> a
+    9:12:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks joinChildren(java.util.List):125 -> a
+    13:25:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks joinChildren(java.util.List):127:139 -> a
+    1:1:java.util.List access$500(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks):107:107 -> b
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult -> com.android.tools.r8.internal.WT:
+    java.util.List topmostNotSatisfiedBlocks -> b
+    java.util.List satisfyingInstructions -> a
+    1:1:void <init>(java.util.List,java.util.List,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$1):167:167 -> <init>
+    2:5:void <init>(java.util.List,java.util.List):173:176 -> <init>
+    boolean hasResult() -> a
+    1:1:void forEachSatisfyingInstruction(java.util.function.Consumer):184:184 -> a
+    1:1:void forEachTopMostNotSatisfiedBlock(java.util.function.Consumer):188:188 -> b
+    2:2:boolean isPartial():200:200 -> b
+    1:1:int topMostNotSatisfiedBlockSize():192:192 -> c
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder -> com.android.tools.r8.internal.XT:
+    java.util.List failingBlocksForPartialResults -> b
+    java.util.List satisfyingInstructions -> a
+    boolean isFailed -> c
+    1:4:void <init>():204:207 -> <init>
+    5:5:void <init>(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$1):204:204 -> <init>
+    1:3:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult build():223:225 -> a
+    1:1:void fail():211:211 -> b
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.YW:
     com.android.tools.r8.ir.code.BasicBlock alwaysHitTarget -> f
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
@@ -64820,7 +64458,7 @@
     99:100:boolean optimize():105 -> f
     101:101:void com.android.tools.r8.ir.optimize.SwitchCaseEliminator.replaceSwitchByGoto():153:153 -> f
     101:101:boolean optimize():105 -> f
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.HY:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.ZW:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -64849,7 +64487,7 @@
     83:83:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
     83:83:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167 -> a
     84:84:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167:167 -> a
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.l20:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.A00:
     1:20:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowClassCastExceptionIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):61:80 -> a
     21:27:void lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):73:79 -> a
     28:28:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowClassCastExceptionIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):86:86 -> a
@@ -64907,10 +64545,9 @@
     22:27:void lambda$synthesizeToStringIfNotNullMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):44:49 -> e
     28:28:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):56:56 -> e
     28:28:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):48 -> e
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1 -> com.android.tools.r8.internal.i20:
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.j20:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.y00:
     com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.k20:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.z00:
     com.android.tools.r8.graph.ProgramMethod method -> a
     boolean optimized -> b
     boolean $assertionsDisabled -> c
@@ -64920,7 +64557,7 @@
     1:2:com.android.tools.r8.graph.ProgramMethod getMethod():186:187 -> a
     3:4:void optimize(com.android.tools.r8.ir.conversion.MethodProcessor):195:196 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod uncheckedGetMethod():191:191 -> b
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.ma:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.aa:
     java.util.concurrent.ConcurrentHashMap knownClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():40:40 -> <clinit>
@@ -64935,7 +64572,7 @@
     73:86:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):211:224 -> a
     87:87:com.android.tools.r8.ir.optimize.AssumeRemover com.android.tools.r8.ir.optimize.AssumeRemover.removeMarkedInstructions():104:104 -> a
     87:87:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):229 -> a
-    88:88:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1226:1226 -> a
+    88:88:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1250:1250 -> a
     88:88:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):230 -> a
     89:91:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):231:233 -> a
     92:129:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):224:261 -> a
@@ -64972,12 +64609,12 @@
     161:161:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
     162:163:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):271:272 -> a
     162:163:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.la:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.Z9:
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NOT_ELIGIBLE -> c
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus ELIGIBLE -> b
     1:2:void <clinit>():43:44 -> <clinit>
     1:1:void <init>(java.lang.String,int):42:42 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.na:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.ba:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.inliner.InliningIRProvider inliningIRProvider -> b
     boolean $assertionsDisabled -> e
@@ -64992,7 +64629,7 @@
     15:24:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):71:80 -> a
     25:54:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):111:140 -> a
     25:54:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     55:55:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):140 -> a
     55:55:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     56:56:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
@@ -65005,14 +64642,14 @@
     60:67:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     68:69:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):129:130 -> a
     68:69:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     70:70:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):130 -> a
     70:70:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     71:71:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):82:82 -> a
     72:74:boolean com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.exceedsInstructionBudgetAfterIncrement(int):98:100 -> a
     72:74:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):83 -> a
     75:75:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):92:92 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.qa:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.ea:
     java.util.Map deferredAliasValidityChecks -> c
     java.util.Set receiverAliases -> a
     java.util.Set illegalReceiverAliases -> b
@@ -65036,7 +64673,7 @@
     1:1:boolean com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet.isDefiniteReceiverAlias(com.android.tools.r8.ir.code.Value):78:78 -> d
     1:1:boolean isReceiverAlias(com.android.tools.r8.ir.code.Value):74 -> d
     1:1:java.util.List lambda$addDeferredAliasValidityCheck$0(com.android.tools.r8.ir.code.Value):68:68 -> e
-com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.kk:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.Qj:
     com.android.tools.r8.ir.code.Instruction root -> c
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.ir.code.Value defaultValue -> e
@@ -65057,11 +64694,11 @@
     44:56:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):108 -> a
     57:71:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):108:122 -> a
     72:103:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):128:159 -> a
-    104:104:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
+    104:104:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):39:39 -> a
     104:104:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):160 -> a
     105:108:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):162:165 -> a
     1:3:com.android.tools.r8.ir.code.Value getValueForFieldRead(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):63:65 -> b
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.sp:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.Uo:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.ProgramMethod method -> f
     com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet receivers -> o
@@ -65103,286 +64740,283 @@
     65:71:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):311 -> a
     72:79:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):315:322 -> a
     80:87:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):321:328 -> a
-    88:114:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):858:884 -> a
-    88:114:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    115:115:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.receiverMayEscapeOutsideConstructorChain():72:72 -> a
-    115:115:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):885 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    115:115:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    116:126:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):889:899 -> a
-    116:126:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    127:127:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-    127:127:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):899 -> a
-    127:127:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    128:144:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):899:915 -> a
-    128:144:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    145:163:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):911:929 -> a
-    145:163:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    164:164:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):333:333 -> a
-    165:165:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1077:1077 -> a
-    165:165:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    166:166:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    166:166:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1078 -> a
+    88:115:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):858:885 -> a
+    88:115:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    116:116:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.receiverMayEscapeOutsideConstructorChain():72:72 -> a
+    116:116:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):885 -> a
+    116:116:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    117:127:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):889:899 -> a
+    117:127:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    128:128:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
+    128:128:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):899 -> a
+    128:128:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    129:145:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):899:915 -> a
+    129:145:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    146:164:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):911:929 -> a
+    146:164:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    165:165:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):333:333 -> a
+    166:166:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1077:1077 -> a
     166:166:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    167:176:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1079:1088 -> a
-    167:176:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    177:177:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> a
-    177:177:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1088 -> a
-    177:177:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    178:184:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1094:1100 -> a
-    178:184:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    185:199:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1095:1109 -> a
-    185:199:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    200:200:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfDirectTargetForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1210:1210 -> a
-    200:200:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1112 -> a
-    200:200:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    201:202:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1196:1197 -> a
-    201:202:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfDirectTargetForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1211 -> a
-    201:202:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1112 -> a
-    201:202:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    203:203:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfDirectTargetForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1212:1212 -> a
-    203:203:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1112 -> a
-    203:203:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    204:207:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):350:353 -> a
-    208:228:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):232:252 -> a
-    229:229:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):384:384 -> a
-    230:235:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):399:404 -> a
-    230:235:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    236:263:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):403:430 -> a
-    236:263:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    264:264:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-    264:264:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):430 -> a
-    264:264:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    265:278:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):430:443 -> a
-    265:278:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    279:287:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):439:447 -> a
-    279:287:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    288:288:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):444:444 -> a
-    288:288:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    289:289:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):432:432 -> a
+    167:167:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
+    167:167:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1078 -> a
+    167:167:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
+    168:177:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1079:1088 -> a
+    168:177:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
+    178:178:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> a
+    178:178:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1088 -> a
+    178:178:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
+    179:185:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1094:1100 -> a
+    179:185:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
+    186:200:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1095:1109 -> a
+    186:200:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
+    201:201:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfDirectTargetForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1210:1210 -> a
+    201:201:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1112 -> a
+    201:201:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
+    202:203:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1196:1197 -> a
+    202:203:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfDirectTargetForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1211 -> a
+    202:203:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1112 -> a
+    202:203:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
+    204:204:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfDirectTargetForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1212:1212 -> a
+    204:204:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,java.util.Set):1112 -> a
+    204:204:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
+    205:208:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):350:353 -> a
+    209:229:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):232:252 -> a
+    230:230:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):384:384 -> a
+    231:236:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):399:404 -> a
+    231:236:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
+    237:264:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):403:430 -> a
+    237:264:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
+    265:265:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
+    265:265:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):430 -> a
+    265:265:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
+    266:279:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):430:443 -> a
+    266:279:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
+    280:288:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):439:447 -> a
+    280:288:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
+    289:289:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):444:444 -> a
     289:289:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    290:317:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):426:453 -> a
-    290:317:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    318:321:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):452:455 -> a
-    318:321:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    322:324:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):387:389 -> a
-    325:344:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):590:609 -> a
-    325:344:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    345:345:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
-    345:345:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):610 -> a
-    345:345:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    346:375:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):611:640 -> a
-    346:375:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    376:376:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":507,"2":508,"3":509}}
-    507:507:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):641:641 -> a
-    507:507:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    290:290:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):432:432 -> a
+    290:290:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
+    291:318:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):426:453 -> a
+    291:318:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
+    319:322:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):452:455 -> a
+    319:322:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
+    323:325:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):387:389 -> a
+    326:345:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):590:609 -> a
+    326:345:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    346:346:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
+    346:346:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):610 -> a
+    346:346:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    347:376:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):611:640 -> a
+    347:376:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    377:377:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":508,"2":509,"3":510}}
     508:508:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):641:641 -> a
     508:508:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
     509:509:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):641:641 -> a
     509:509:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    377:377:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):641:641 -> a
-    377:377:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    378:378:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    378:378:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):646 -> a
+    510:510:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):641:641 -> a
+    510:510:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    378:378:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):641:641 -> a
     378:378:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    379:379:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):646:646 -> a
+    379:379:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    379:379:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):646 -> a
     379:379:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    380:380:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> a
-    380:380:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):651 -> a
+    380:380:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):646:646 -> a
     380:380:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    381:385:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):654:658 -> a
-    381:385:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    386:386:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":526,"2":527,"3":528}}
-    526:526:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):658:658 -> a
-    526:526:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    381:381:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> a
+    381:381:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):651 -> a
+    381:381:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    382:386:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):654:658 -> a
+    382:386:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    387:387:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":527,"2":528,"3":529}}
     527:527:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):658:658 -> a
     527:527:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
     528:528:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):658:658 -> a
     528:528:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    387:395:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):658:666 -> a
-    387:395:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    396:400:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):672:676 -> a
-    396:400:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    401:401:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    401:401:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):676 -> a
-    401:401:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    402:402:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):676:676 -> a
+    529:529:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):658:658 -> a
+    529:529:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    388:396:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):658:666 -> a
+    388:396:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    397:401:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):672:676 -> a
+    397:401:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    402:402:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    402:402:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):676 -> a
     402:402:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    403:422:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):747:766 -> a
-    403:422:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
-    403:422:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    423:423:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    423:423:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):766 -> a
-    423:423:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
-    423:423:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    424:427:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):767:770 -> a
-    424:427:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
-    424:427:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    428: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):796:797 -> a
-    428:429:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
-    428:429:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
-    428:429:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    430:430: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
-    430: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):797 -> a
-    430:430:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
-    430:430:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
-    430:430:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    431:446: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):798:813 -> a
-    431:446:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
-    431:446:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
-    431:446:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    447:447:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    447:447: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):814 -> a
-    447:447:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
-    447:447:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
-    447:447:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    448:448:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):815:815 -> a
+    403:403:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):676:676 -> a
+    403:403:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    404:423:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):747:766 -> a
+    404:423:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
+    404:423:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    424:424:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    424:424:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):766 -> a
+    424:424:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
+    424:424:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    425:428:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):767:770 -> a
+    425:428:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
+    425:428:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    429: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):796:797 -> a
+    429:430:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
+    429:430:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
+    429:430:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    431:431: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
+    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):797 -> a
+    431:431:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
+    431:431:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
+    431:431:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    432:447: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):798:813 -> a
+    432:447:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
+    432:447:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
+    432:447:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    448:448:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    448:448: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):814 -> a
     448:448:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
     448:448:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
     448:448:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    449:449: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):810:810 -> a
+    449:449:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):815:815 -> a
     449:449:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
     449:449:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
     449:449:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    450:450: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):805:805 -> a
+    450:450: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):810:810 -> a
     450:450:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
     450:450:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
     450:450:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    451:451: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):800:800 -> a
+    451:451: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):805:805 -> a
     451:451:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
     451:451:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
     451:451:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    452:462:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):772:782 -> a
-    452:462:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
-    452:462:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    463:463:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":529,"2":530,"3":531}}
-    529:529:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):782:782 -> a
-    529:529:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
-    529:529:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    452:452: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):800:800 -> a
+    452:452:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):769 -> a
+    452:452:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
+    452:452:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    453:463:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):772:782 -> a
+    453:463:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
+    453:463:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    464:464:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":530,"2":531,"3":532}}
     530:530:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):782:782 -> a
     530:530:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
     530:530:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
     531:531:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):782:782 -> a
     531:531:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
     531:531:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    464:466:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):782:784 -> a
-    464:466:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
-    464:466:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    467:468:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):679:680 -> a
-    467:468:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    469:469:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    469:469:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):680 -> a
-    469:469:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    470:470:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):680:680 -> a
+    532:532:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):782:782 -> a
+    532:532:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
+    532:532:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    465:467:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):782:784 -> a
+    465:467:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):677 -> a
+    465:467:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    468:469:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):679:680 -> a
+    468:469:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    470:470:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    470:470:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):680 -> a
     470:470:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    471:495:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():829:853 -> a
-    471:495:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
-    496:496:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():847:847 -> a
-    496:496:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
-    497:497:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":532,"2":533,"3":534}}
-    532:532:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():847:847 -> a
-    532:532:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
+    471:471:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):680:680 -> a
+    471:471:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
+    472:496:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():829:853 -> a
+    472:496:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
+    497:497:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():847:847 -> a
+    497:497:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
+    498:498:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":533,"2":534,"3":535}}
     533:533:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():847:847 -> a
     533:533:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
     534:534:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():847:847 -> a
     534:534:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
-    498:500:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():847:849 -> a
-    498:500:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
-    501:501:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():831:831 -> a
-    501:501:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
-    502:502:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":535,"2":536,"3":537}}
-    535:535:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():831:831 -> a
+    535:535:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():847:847 -> a
     535:535:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
+    499:501:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():847:849 -> a
+    499:501:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
+    502:502:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():831:831 -> a
+    502:502:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
+    503:503:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":536,"2":537,"3":538}}
     536:536:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():831:831 -> a
     536:536:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
     537:537:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():831:831 -> a
     537:537:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
-    503:505:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():831:833 -> a
-    503:505:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
-    506:506:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):393:393 -> a
-    538:548:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):463:473 -> a
-    549:549:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    549:549:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):473 -> a
-    550:562:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):473:485 -> a
-    563:563:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
-    563:563:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):485 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    564:570:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):486:492 -> a
-    571:571: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
-    571:571:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):493 -> a
-    572:572: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
+    538:538:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():831:831 -> a
+    538:538:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
+    504:506:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():831:833 -> a
+    504:506:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):392 -> a
+    507:507:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):393:393 -> a
+    539:549:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):463:473 -> a
+    550:550:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    550:550:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):473 -> a
+    551:563:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):473:485 -> a
+    564:564:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    564:564:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):485 -> a
+    565:571:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):486:492 -> a
+    572:572: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
     572:572:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):493 -> a
-    573:577:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):495:499 -> a
-    578:578:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):496:496 -> a
-    579:612:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):474:507 -> a
-    613:618:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):506:511 -> a
-    619:619:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):509:509 -> a
-    620:623:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):686:689 -> a
-    624:624:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    624:624:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):689 -> a
-    625:641:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):690:706 -> a
-    642:642:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1359,"2":1360,"3":1361}}
-    1359:1359:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):706:706 -> a
+    573:573: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
+    573:573:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):493 -> a
+    574:578:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):495:499 -> a
+    579:579:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):496:496 -> a
+    580:613:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):474:507 -> a
+    614:619:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):506:511 -> a
+    620:620:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):509:509 -> a
+    621:624:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):686:689 -> a
+    625:625:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    625:625:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):689 -> a
+    626:642:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):690:706 -> a
+    643:643:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1360,"2":1361,"3":1362}}
     1360:1360:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):706:706 -> a
     1361:1361:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):706:706 -> a
-    1348:1358:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):706:716 -> a
-    1362:1362:int lambda$removeFieldReadsFromNewInstance$2(com.android.tools.r8.ir.code.InstanceGet):687:687 -> a
-    1363:1367:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):725:729 -> a
-    1368:1382:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):728:742 -> a
-    1383:1383:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$removeFieldReadFromNewInstance$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):729:729 -> a
-    1384:1394:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Set):1131:1141 -> a
-    1395:1402:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1155:1162 -> a
-    1403:1403:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    1403:1403:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1162 -> a
-    1404:1411:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1162:1169 -> a
-    1412:1458: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):945:991 -> a
-    1412:1458:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1170 -> a
-    1459:1469:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1174:1184 -> a
-    1470:1473:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):998:1001 -> a
-    1470:1473:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1185 -> a
-    1474:1502:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1024:1052 -> a
-    1474:1502:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1004 -> a
-    1474:1502:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1185 -> a
-    1503:1503:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    1503:1503:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1052 -> a
-    1503:1503:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1004 -> a
-    1503:1503:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1185 -> a
-    1504:1505:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1052:1053 -> a
-    1504:1505:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1004 -> a
-    1504:1505:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1185 -> a
-    1506:1516:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1010:1020 -> a
-    1506:1516:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1185 -> a
-    1517:1517:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfIndirectTargetForInlining(com.android.tools.r8.graph.ProgramMethod):1201:1201 -> a
-    1517:1517:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1188 -> a
-    1518:1519:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1196:1197 -> a
-    1518:1519:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfIndirectTargetForInlining(com.android.tools.r8.graph.ProgramMethod):1202 -> a
-    1518:1519:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1188 -> a
-    1520:1522:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfIndirectTargetForInlining(com.android.tools.r8.graph.ProgramMethod):1203:1205 -> a
-    1520:1522:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1188 -> a
-    1523:1539:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1220:1236 -> a
-    1540:1540:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1232:1232 -> a
-    1541:1541:void lambda$removeInstruction$5(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1250:1250 -> a
-    1542:1543:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1250:1251 -> a
+    1362:1362:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):706:706 -> a
+    1349:1359:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):706:716 -> a
+    1363:1363:int lambda$removeFieldReadsFromNewInstance$2(com.android.tools.r8.ir.code.InstanceGet):687:687 -> a
+    1364:1368:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):725:729 -> a
+    1369:1383:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):728:742 -> a
+    1384:1384:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$removeFieldReadFromNewInstance$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):729:729 -> a
+    1385:1395:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Set):1131:1141 -> a
+    1396:1403:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1155:1162 -> a
+    1404:1404:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    1404:1404:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1162 -> a
+    1405:1412:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1162:1169 -> a
+    1413:1459: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):945:991 -> a
+    1413:1459:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1170 -> a
+    1460:1470:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1174:1184 -> a
+    1471:1474:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):998:1001 -> a
+    1471:1474:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1185 -> a
+    1475:1503:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1024:1052 -> a
+    1475:1503:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1004 -> a
+    1475:1503:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1185 -> a
+    1504:1504:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    1504:1504:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1052 -> a
+    1504:1504:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1004 -> a
+    1504:1504:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1185 -> a
+    1505:1506:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1052:1053 -> a
+    1505:1506:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1004 -> a
+    1505:1506:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1185 -> a
+    1507:1517:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1010:1020 -> a
+    1507:1517:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1185 -> a
+    1518:1518:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfIndirectTargetForInlining(com.android.tools.r8.graph.ProgramMethod):1201:1201 -> a
+    1518:1518:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1188 -> a
+    1519:1520:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1196:1197 -> a
+    1519:1520:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfIndirectTargetForInlining(com.android.tools.r8.graph.ProgramMethod):1202 -> a
+    1519:1520:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1188 -> a
+    1521:1523:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfIndirectTargetForInlining(com.android.tools.r8.graph.ProgramMethod):1203:1205 -> a
+    1521:1523:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1188 -> a
+    1524:1540:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1220:1236 -> a
+    1541:1541:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1232:1232 -> a
+    1542:1542:void lambda$removeInstruction$5(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1250:1250 -> a
+    1543:1544:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1250:1251 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():130:130 -> b
     2:2:boolean lambda$forceInlineIndirectMethodInvocations$0(com.android.tools.r8.graph.ProgramMethod):510:510 -> b
-    3:3:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):819:819 -> b
-    4:4:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> b
-    4:4:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):820 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":832,"2":833,"3":834}}
-    832:832:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):820:820 -> b
+    3:4:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):819:820 -> b
+    5:5:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> b
+    5:5:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):820 -> b
+    6:6:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":833,"2":834,"3":835}}
     833:833:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):820:820 -> b
     834:834:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):820:820 -> b
-    825:830:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):820:825 -> b
-    831:831:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):821:821 -> b
-    835:835:boolean lambda$isEligibleParameterUsages$4(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1143:1143 -> b
+    835:835:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):820:820 -> b
+    826:831:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):820:825 -> b
+    832:832:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):821:821 -> b
+    836:836:boolean lambda$isEligibleParameterUsages$4(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1143:1143 -> b
     1:1:java.util.List getIndirectInlinees():138:138 -> c
     2:7:boolean lambda$forceInlineIndirectMethodInvocations$1(com.android.tools.r8.graph.ProgramMethod):513:518 -> c
     1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet getReceivers():142:142 -> d
@@ -65400,33 +65034,31 @@
     53:53:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.empty():28:28 -> f
     53:53:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():196 -> f
     54:55:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():196:197 -> f
+    56:56:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():185:185 -> f
     1:1:void rebindIndirectEligibleInstanceUsersFromPhis():534:534 -> g
     2:3:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):45:46 -> g
     2:3:void rebindIndirectEligibleInstanceUsersFromPhis():534 -> g
     4:27:void rebindIndirectEligibleInstanceUsersFromPhis():535:558 -> g
     28:28:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> g
     28:28:void rebindIndirectEligibleInstanceUsersFromPhis():558 -> g
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:47:void rebindIndirectEligibleInstanceUsersFromPhis():560:578 -> g
     48:48:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> g
     48:48:void rebindIndirectEligibleInstanceUsersFromPhis():578 -> g
     49:54:void rebindIndirectEligibleInstanceUsersFromPhis():578:583 -> g
     55:55:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> g
     55:55:void rebindIndirectEligibleInstanceUsersFromPhis():583 -> g
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     56:57:void rebindIndirectEligibleInstanceUsersFromPhis():583:584 -> g
     58:58:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> g
     58:58:void rebindIndirectEligibleInstanceUsersFromPhis():584 -> g
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     59:59:void rebindIndirectEligibleInstanceUsersFromPhis():584:584 -> g
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.rp:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.To:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():1254:1254 -> <clinit>
     1:2:void <init>():1256:1257 -> <init>
 com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext -> com.android.tools.r8.internal.K1:
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext getDefaultContext():17:17 -> a
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage -> com.android.tools.r8.internal.H5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage -> com.android.tools.r8.internal.E5:
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage BOTTOM -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -65448,7 +65080,7 @@
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():69 -> j
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():69:69 -> j
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage getInstance():17:17 -> l
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext -> com.android.tools.r8.internal.I5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext -> com.android.tools.r8.internal.F5:
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -65457,7 +65089,7 @@
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext):27 -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize() -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext getInstance():17:17 -> c
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages -> com.android.tools.r8.internal.J5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages -> com.android.tools.r8.internal.G5:
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -65471,7 +65103,7 @@
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages getInstance():17:17 -> g
     1:1:int hashCode():55:55 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.pa:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.da:
     1:7:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):21:27 -> a
     8:8:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.bottom():64:64 -> a
     8:8:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):29 -> a
@@ -65485,12 +65117,12 @@
     25:25:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):23:23 -> a
     26:26:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult lambda$analyze$0(com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):33:33 -> a
     27:27:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages lambda$analyze$1(com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult):37:37 -> a
-com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.Se:
+com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.xe:
     com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext INSTANCE -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext getInstance():14:14 -> b
-com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage -> com.android.tools.r8.internal.ju:
+com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage -> com.android.tools.r8.internal.Dt:
     boolean isParameterUsedAsLock -> e
     boolean $assertionsDisabled -> f
     java.util.Set fieldsReadFromParameter -> a
@@ -65524,7 +65156,7 @@
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned():24 -> i
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.setParameterUsedAsLock():159:162 -> j
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():24 -> j
-com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder -> com.android.tools.r8.internal.iu:
+com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder -> com.android.tools.r8.internal.Ct:
     boolean isParameterUsedAsLock -> e
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder methodCallsWithParameterAsReceiverBuilder -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder fieldsReadFromParameterBuilder -> a
@@ -65553,7 +65185,7 @@
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder joinIsReceiverUsedAsLock(boolean):254:254 -> c
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder setParameterReturned():264:264 -> c
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder setParameterUsedAsLock():269:269 -> d
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.SH:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.PG:
     boolean isParameterUsedAsLock -> e
     boolean $assertionsDisabled -> f
     java.util.Set fieldsReadFromParameter -> a
@@ -65577,7 +65209,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.Multiset getMethodCallsWithParameterAsReceiver():72:72 -> m
     1:1:boolean isParameterMutated():77:77 -> n
     1:1:boolean isParameterUsedAsLock():87:87 -> o
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.TH:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.QG:
     java.util.Map backing -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -65658,7 +65290,7 @@
     1:1:int getNumberOfContexts():99:99 -> d
     1:6:boolean equals(java.lang.Object):133:138 -> equals
     1:1:int hashCode():143:143 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.UH:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.RG:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap backing -> a
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration aliasedValueConfiguration -> b
     boolean $assertionsDisabled -> c
@@ -65722,12 +65354,10 @@
     53:55:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.lang.Iterable,java.util.function.Predicate):157:159 -> a
     56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
     56:56:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.lang.Iterable,java.util.function.Predicate):159 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     57:61:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.lang.Iterable,java.util.function.Predicate):160:164 -> a
     62:62:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameter(com.android.tools.r8.ir.code.Value,java.util.function.BiFunction):169:169 -> a
     63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
     63:63:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameter(com.android.tools.r8.ir.code.Value,java.util.function.BiFunction):169 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     64:66:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameter(com.android.tools.r8.ir.code.Value,java.util.function.BiFunction):170:172 -> a
     67:67:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$rebuildParameter$4(int,java.util.function.BiFunction,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):175:175 -> a
     68:75:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameters(com.android.tools.r8.utils.IntObjToObjFunction):183:190 -> a
@@ -65749,7 +65379,7 @@
     10:10:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize():113 -> e
     1:5:boolean equals(java.lang.Object):228:232 -> equals
     1:1:int hashCode():237:237 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.YL:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.UK:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver) -> a
@@ -65764,13 +65394,13 @@
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned() -> i
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock() -> j
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage top():88:88 -> k
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.ZL:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.VK:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext asKnown() -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext rebuild(java.util.function.BiFunction) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize() -> b
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.android.tools.r8.internal.aM:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.android.tools.r8.internal.WK:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext get(int) -> a
@@ -65795,7 +65425,7 @@
     com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages asNonEmpty() -> d
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize() -> e
     boolean isTop() -> f
-com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.VZ:
+com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.lY:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Set instructionsOfInterest -> g
     com.android.tools.r8.graph.AppView appView -> a
@@ -65883,77 +65513,69 @@
     108:108:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):209:209 -> a
     109:109:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
     109:109:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):209 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     110:114:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):210:214 -> a
     115:115:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
     115:115:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):214 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     116:124:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):215:223 -> a
     125:125:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInstancePut$2(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):221:221 -> a
     126:126:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):232:232 -> a
     127:130:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):231:234 -> a
     131:131:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
     131:131:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):234 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     132:137:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):235:240 -> a
     138:138:boolean com.android.tools.r8.ir.code.InvokeDirect.isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):121:121 -> a
     138:138:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):241 -> a
-    139:149:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):245:255 -> a
-    150:150:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.receiverMayEscapeOutsideConstructorChain():72:72 -> a
-    150:150:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):256 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    151:159:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):257:265 -> a
-    160:160:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):242:242 -> a
-    161:161:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):274:274 -> a
-    162:165:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):273:276 -> a
-    166:166:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
-    166:166:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):276 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    167:177:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):277:287 -> a
-    178:178:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInvokeInterface$3(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):288:288 -> a
-    179:179:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):313:313 -> a
-    180:183:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):312:315 -> a
-    184:184:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
-    184:184:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):315 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    185:195:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):316:326 -> a
-    196:196:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInvokeVirtual$4(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):327:327 -> a
-    197:197:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeMonitor(com.android.tools.r8.ir.code.Monitor,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):334:334 -> a
-    198:198:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeMonitor(com.android.tools.r8.ir.code.Monitor,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):333:333 -> a
-    199:199:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):339:339 -> a
-    200:200:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):338:338 -> a
-    201:201:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages fail(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):348:348 -> a
-    202:202:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages fail(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):347:347 -> a
-    203:203:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):352:352 -> a
-    204:204:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
-    204:204:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):352 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    205:206:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):352:353 -> a
-    207:217:boolean isMaybeEligibleForClassInlining(com.android.tools.r8.ir.analysis.type.TypeElement):357:367 -> a
-    218:227:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.isMaybeEligibleForClassInlining(com.android.tools.r8.graph.DexProgramClass):374:383 -> a
-    218:227:boolean isMaybeEligibleForClassInlining(com.android.tools.r8.ir.analysis.type.TypeElement):367 -> a
-    228:228:boolean isMaybeEligibleForClassInlining(com.android.tools.r8.ir.analysis.type.TypeElement):368:368 -> a
-    229:229:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.isMaybeEligibleForClassInlining(com.android.tools.r8.graph.ClasspathOrLibraryClass):389:389 -> a
-    229:229:boolean isMaybeEligibleForClassInlining(com.android.tools.r8.ir.analysis.type.TypeElement):368 -> a
-    230:230:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):395:395 -> a
-    231:231:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages.rebuildParameters(com.android.tools.r8.utils.IntObjToObjFunction):65:65 -> a
-    231:231:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):396 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    232:232:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.isBottom():0:0 -> a
-    232:232:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):409 -> a
-    233:233:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.isTop():0:0 -> a
-    233:233:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):410 -> a
-    234:234:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):411:411 -> a
-    235:235:com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.fail():343:343 -> a
-    235:235:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):412 -> a
-    236:236:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$8(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):398:398 -> a
-    237:237:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.isBottom():0:0 -> a
-    237:237:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$8(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):398 -> a
-    238:238:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.isTop():0:0 -> a
-    238:238:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$8(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):398 -> a
-    239:241:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$8(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):401:403 -> a
-    242:242:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.top():53:53 -> a
-    242:242:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$8(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):405 -> a
+    139:150:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):245:256 -> a
+    151:151:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.receiverMayEscapeOutsideConstructorChain():72:72 -> a
+    151:151:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):256 -> a
+    152:160:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):257:265 -> a
+    161:161:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):242:242 -> a
+    162:162:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):274:274 -> a
+    163:166:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):273:276 -> a
+    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    167:167:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):276 -> a
+    168:178:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):277:287 -> a
+    179:179:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInvokeInterface$3(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):288:288 -> a
+    180:180:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):313:313 -> a
+    181:184:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):312:315 -> a
+    185:185:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    185:185:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):315 -> a
+    186:196:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):316:326 -> a
+    197:197:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInvokeVirtual$4(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):327:327 -> a
+    198:198:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeMonitor(com.android.tools.r8.ir.code.Monitor,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):334:334 -> a
+    199:199:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeMonitor(com.android.tools.r8.ir.code.Monitor,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):333:333 -> a
+    200:200:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):339:339 -> a
+    201:201:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):338:338 -> a
+    202:202:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages fail(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):348:348 -> a
+    203:203:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages fail(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):347:347 -> a
+    204:204:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):352:352 -> a
+    205:205:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    205:205:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):352 -> a
+    206:207:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):352:353 -> a
+    208:218:boolean isMaybeEligibleForClassInlining(com.android.tools.r8.ir.analysis.type.TypeElement):357:367 -> a
+    219:228:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.isMaybeEligibleForClassInlining(com.android.tools.r8.graph.DexProgramClass):374:383 -> a
+    219:228:boolean isMaybeEligibleForClassInlining(com.android.tools.r8.ir.analysis.type.TypeElement):367 -> a
+    229:229:boolean isMaybeEligibleForClassInlining(com.android.tools.r8.ir.analysis.type.TypeElement):368:368 -> a
+    230:230:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.isMaybeEligibleForClassInlining(com.android.tools.r8.graph.ClasspathOrLibraryClass):389:389 -> a
+    230:230:boolean isMaybeEligibleForClassInlining(com.android.tools.r8.ir.analysis.type.TypeElement):368 -> a
+    231:232:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):395:396 -> a
+    233:233:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages.rebuildParameters(com.android.tools.r8.utils.IntObjToObjFunction):65:65 -> a
+    233:233:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):396 -> a
+    234:234:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.isBottom():0:0 -> a
+    234:234:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):409 -> a
+    235:235:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.isTop():0:0 -> a
+    235:235:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):410 -> a
+    236:236:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):411:411 -> a
+    237:237:com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.fail():343:343 -> a
+    237:237:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):412 -> a
+    238:238:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$8(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):398:398 -> a
+    239:239:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.isBottom():0:0 -> a
+    239:239:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$8(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):398 -> a
+    240:240:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.isTop():0:0 -> a
+    240:240:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$8(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):398 -> a
+    241:243:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$8(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):401:403 -> a
+    244:244:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.top():53:53 -> a
+    244:244:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$8(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):405 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeMonitor$5(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):334:334 -> b
     2:2:boolean lambda$widen$9(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):411:411 -> b
     3:3:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.isTop():0:0 -> b
@@ -65962,7 +65584,7 @@
     1:1:boolean lambda$widen$7(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):404:404 -> d
     2:2:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.isTop():0:0 -> d
     2:2:boolean lambda$widen$7(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):404 -> d
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.K10:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.a00:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage TOP -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -65974,7 +65596,7 @@
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned() -> i
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock() -> j
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage getInstance():17:17 -> l
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.L10:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.b00:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -65983,7 +65605,7 @@
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext):27 -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize() -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext getInstance():17:17 -> c
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages -> com.android.tools.r8.internal.M10:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages -> com.android.tools.r8.internal.c00:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -66012,14 +65634,14 @@
     boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int):33:33 -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint getInstance():22:22 -> c
-com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.oa:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.ca:
     com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
     boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.ProgramMethod,int) -> a
     boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysFalseClassInlinerMethodConstraint alwaysFalse():30:30 -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int) -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint alwaysTrue():34:34 -> b
-com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.ud:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.Wc:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages usages -> a
     1:1:void <clinit>():27:27 -> <clinit>
@@ -66040,7 +65662,7 @@
     34:36:boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.ProgramMethod,int):72:74 -> a
     37:68:boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod):83:114 -> a
     1:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int):66:67 -> b
-com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.FY:
+com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.XW:
     com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():15:17 -> <clinit>
@@ -66048,24 +65670,23 @@
     1:14:boolean switchCaseIsAlwaysHit(com.android.tools.r8.ir.code.Switch,int):26:39 -> a
     15:31:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue,int):44:60 -> a
     32:43:boolean switchFallthroughIsNeverHit(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue):64:75 -> a
-com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer -> com.android.tools.r8.internal.Nh:
+com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer -> com.android.tools.r8.internal.xh:
     com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer INSTANCE -> a
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>():30:30 -> <init>
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:1:void <init>():29:29 -> <init>
     void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions) -> a
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
     void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens) -> a
     void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues) -> a
-    void rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod) -> a
     1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():20:20 -> a
-    1:1:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):78 -> a
-    2:2:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):78:78 -> a
-    3:3:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):63:63 -> a
+    1:1:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):75 -> a
+    2:2:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):75:75 -> a
+    3:3:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):65:65 -> a
     void onMethodPruned(com.android.tools.r8.graph.ProgramMethod) -> b
     void unsetRewriter() -> b
     void updateEnumUnboxingCandidatesInfo() -> c
-    1:1:com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer get():33:33 -> d
-com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.ni:
+    1:1:com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer get():32:32 -> d
+com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.Yh:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -66075,37 +65696,30 @@
     5:6:int getUnboxedValue(com.android.tools.r8.graph.DexField):61:62 -> a
     7:8:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getUnboxedValue(com.android.tools.r8.graph.DexField):114:115 -> a
     7:8:int getUnboxedValue(com.android.tools.r8.graph.DexField):62 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:10:int getValuesSize(com.android.tools.r8.graph.DexType):66:67 -> a
     11:11:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():139:139 -> a
     11:11:int getValuesSize(com.android.tools.r8.graph.DexType):67 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:12:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasValues():135:135 -> a
     12:12:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():139 -> a
     12:12:int getValuesSize(com.android.tools.r8.graph.DexType):67 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     13:14:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():139:140 -> a
     13:14:int getValuesSize(com.android.tools.r8.graph.DexType):67 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:15:int getMaxValuesSize():72:72 -> a
-    16:16:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasValues():135:135 -> a
-    16:16:int getMaxValuesSize():73 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():139:139 -> a
-    17:17:int getMaxValuesSize():74 -> a
-    18:18:int getMaxValuesSize():74:74 -> a
+    15:16:int getMaxValuesSize():72:73 -> a
+    17:17:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasValues():135:135 -> a
+    17:17:int getMaxValuesSize():73 -> a
+    18:18:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():139:139 -> a
+    18:18:int getMaxValuesSize():74 -> a
+    19:19:int getMaxValuesSize():74:74 -> a
     1:1:boolean isUnboxedEnum(com.android.tools.r8.graph.DexType):32:32 -> b
     2:2:java.util.Set getUnboxedEnums():46:46 -> b
     3:4:boolean hasUnboxedValueFor(com.android.tools.r8.graph.DexField):56:57 -> b
     5:5:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):123:123 -> b
     5:5:boolean hasUnboxedValueFor(com.android.tools.r8.graph.DexField):57 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean isEmpty():36:36 -> c
     2:3:boolean matchesValuesField(com.android.tools.r8.graph.DexField):81:82 -> c
     4:4:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> c
     4:4:boolean matchesValuesField(com.android.tools.r8.graph.DexField):82 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.mi:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.Xh:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.com.google.common.collect.ImmutableMap unboxedValues -> b
     int valuesSize -> d
@@ -66114,51 +65728,50 @@
     1:1:void <clinit>():85:85 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableSet,int):101:105 -> <init>
     1:2:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData getInstanceFieldData(com.android.tools.r8.graph.DexField):109:110 -> a
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.si:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.di:
     1:1:void <init>():24:24 -> <init>
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData asEnumFieldKnownData() -> a
     boolean isUnknown() -> b
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.oi:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.Zh:
     1:1:void <init>():52:52 -> <init>
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData asEnumFieldKnownData() -> a
     boolean isUnknown() -> b
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData asEnumFieldMappingData() -> c
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.pi:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.ai:
     com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap mapping -> a
     1:2:void <init>(com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap):88:89 -> <init>
     1:1:void forEach(java.util.function.BiConsumer):112:112 -> a
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData asEnumFieldMappingData() -> c
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.qi:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.bi:
     1:1:void <init>():73:73 -> <init>
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.ri:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.ci:
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData INSTANCE -> a
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>():44:44 -> <init>
     boolean isUnknown() -> b
     1:1:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData getInstance():41:41 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.vi:
-    1:1:void <init>():26:26 -> <init>
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.gi:
+    1:1:void <init>():25:25 -> <init>
     void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions) -> a
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
     void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens) -> a
     void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues) -> a
-    java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor) -> a
-    void rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod) -> a
+    java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription) -> a
     void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed) -> a
-    1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxer create(com.android.tools.r8.graph.AppView):29:29 -> a
-    2:2:com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer com.android.tools.r8.ir.optimize.enums.EnumUnboxer.empty():33:33 -> a
-    2:2:com.android.tools.r8.ir.optimize.enums.EnumUnboxer create(com.android.tools.r8.graph.AppView):29 -> a
-    3:3:com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer empty():33:33 -> a
+    1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxer create(com.android.tools.r8.graph.AppView):28:28 -> a
+    2:2:com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer com.android.tools.r8.ir.optimize.enums.EnumUnboxer.empty():32:32 -> a
+    2:2:com.android.tools.r8.ir.optimize.enums.EnumUnboxer create(com.android.tools.r8.graph.AppView):28 -> a
+    3:3:com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer empty():32:32 -> a
     void onMethodPruned(com.android.tools.r8.graph.ProgramMethod) -> b
     void unsetRewriter() -> b
     void updateEnumUnboxingCandidatesInfo() -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl -> com.android.tools.r8.internal.xi:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl -> com.android.tools.r8.internal.ii:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumUnboxingCandidatesInfo -> c
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter enumUnboxerRewriter -> i
@@ -66169,446 +65782,445 @@
     com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder checkNotNullMethodsBuilder -> g
     java.util.Map staticFieldValuesMap -> e
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsDependingOnLibraryModelisation -> f
-    1:1:void <clinit>():133:133 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):159:159 -> <init>
-    2:33:void <init>(com.android.tools.r8.graph.AppView):140:171 -> <init>
+    1:1:void <clinit>():134:134 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):160:160 -> <init>
+    2:33:void <init>(com.android.tools.r8.graph.AppView):141:172 -> <init>
     com.android.tools.r8.utils.collections.LongLivedClassSetBuilder lambda$unboxEnums$4(com.android.tools.r8.utils.collections.LongLivedClassSetBuilder,com.android.tools.r8.graph.GraphLens) -> a
     1:1:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues.isEnumStaticFieldValues():0:0 -> a
-    1:1:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):939 -> a
-    2:5:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):942:945 -> a
-    6:6:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl):133:133 -> a
-    7:14:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):211:218 -> a
-    15:22:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):225:232 -> a
-    23:59:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):237:273 -> a
-    60:67:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):388:395 -> a
-    60:67:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):273 -> a
-    68:78:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):270:280 -> a
-    79:82:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):374:377 -> a
-    79:82:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):279 -> a
+    1:1:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):951 -> a
+    2:5:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):954:957 -> a
+    6:6:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl):134:134 -> a
+    7:14:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):212:219 -> a
+    15:22:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):226:233 -> a
+    23:59:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):238:274 -> a
+    60:67:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):389:396 -> a
+    60:67:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):274 -> a
+    68:78:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):271:281 -> a
+    79:82:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):375:378 -> a
+    79:82:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):280 -> a
     83:83:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfo.resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):232:232 -> a
-    83:83:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):377 -> a
-    83:83:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):279 -> a
-    84:87:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):378:381 -> a
-    84:87:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):279 -> a
-    88:88:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264:264 -> a
-    89:102:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):447:460 -> a
-    89:102:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
+    83:83:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):378 -> a
+    83:83:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):280 -> a
+    84:87:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):379:382 -> a
+    84:87:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):280 -> a
+    88:88:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265:265 -> a
+    89:102:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):448:461 -> a
+    89:102:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
     103:103:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    103:103:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):460 -> a
-    103:103:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
-    104:104:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):460:460 -> a
-    104:104:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
-    105:105:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):471:471 -> a
-    105:105:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):461 -> a
-    105:105:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
+    103:103:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):461 -> a
+    103:103:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
+    104:104:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):461:461 -> a
+    104:104:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
+    105:105:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):472:472 -> a
+    105:105:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):462 -> a
+    105:105:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
     106:106:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    106:106:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):471 -> a
-    106:106:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):461 -> a
-    106:106:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
-    107:118:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):472:483 -> a
-    107:118:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):461 -> a
-    107:118:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
-    119:119:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):514:514 -> a
-    119:119:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):486 -> a
-    119:119:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):461 -> a
-    119:119:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
-    120:120:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):207:207 -> a
-    120:120:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):487 -> a
-    120:120:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):461 -> a
-    120:120:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
-    121:121:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):490:490 -> a
-    121:121:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):461 -> a
-    121:121:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
-    122:122:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):207:207 -> a
-    122:122:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):492 -> a
-    122:122:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):461 -> a
-    122:122:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
-    123:129:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):497:503 -> a
-    123:129:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):461 -> a
-    123:129:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
-    130:130:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isUnboxableNameMethod(com.android.tools.r8.graph.DexMethod):519:519 -> a
-    130:130:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):505 -> a
-    130:130:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):461 -> a
-    130:130:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
-    131:135:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):462:466 -> a
-    131:135:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264 -> a
-    136:136:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):267:267 -> a
-    137:146:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):410:419 -> a
-    137:146:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):267 -> a
-    147:149:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):431:433 -> a
-    147:149:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):423 -> a
-    147:149:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):267 -> a
-    150:150:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):432:432 -> a
-    150:150:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):423 -> a
-    150:150:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):267 -> a
-    151:154:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):424:427 -> a
-    151:154:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):267 -> a
-    155:174:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):285:304 -> a
-    175:177:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.markEnumEligible(com.android.tools.r8.graph.DexType,java.util.Set):309:311 -> a
-    175:177:void lambda$analyzeInvokeCustom$0(java.util.Set,com.android.tools.r8.graph.DexType):324 -> a
-    178:180:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.invalidateEnum(com.android.tools.r8.graph.DexType):316:318 -> a
-    178:180:void lambda$analyzeInvokeCustom$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):340 -> a
-    181:183:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.invalidateEnum(com.android.tools.r8.graph.DexType):316:318 -> a
-    181:183:void lambda$analyzeInvokeCustom$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):341 -> a
-    184:184:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set,com.android.tools.r8.graph.ProgramMethod):324:324 -> a
+    106:106:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):472 -> a
+    106:106:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):462 -> a
+    106:106:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
+    107:118:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):473:484 -> a
+    107:118:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):462 -> a
+    107:118:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
+    119:119:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):515:515 -> a
+    119:119:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):487 -> a
+    119:119:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):462 -> a
+    119:119:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
+    120:120:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):208:208 -> a
+    120:120:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):488 -> a
+    120:120:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):462 -> a
+    120:120:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
+    121:121:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):491:491 -> a
+    121:121:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):462 -> a
+    121:121:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
+    122:122:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):208:208 -> a
+    122:122:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):493 -> a
+    122:122:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):462 -> a
+    122:122:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
+    123:129:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):498:504 -> a
+    123:129:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):462 -> a
+    123:129:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
+    130:130:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isUnboxableNameMethod(com.android.tools.r8.graph.DexMethod):520:520 -> a
+    130:130:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):506 -> a
+    130:130:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):462 -> a
+    130:130:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
+    131:135:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):463:467 -> a
+    131:135:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
+    136:136:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):268:268 -> a
+    137:146:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):411:420 -> a
+    137:146:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):268 -> a
+    147:149:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):432:434 -> a
+    147:149:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):424 -> a
+    147:149:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):268 -> a
+    150:150:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):433:433 -> a
+    150:150:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):424 -> a
+    150:150:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):268 -> a
+    151:154:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):425:428 -> a
+    151:154:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):268 -> a
+    155:174:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):286:305 -> a
+    175:177:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.markEnumEligible(com.android.tools.r8.graph.DexType,java.util.Set):310:312 -> a
+    175:177:void lambda$analyzeInvokeCustom$0(java.util.Set,com.android.tools.r8.graph.DexType):325 -> a
+    178:180:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.invalidateEnum(com.android.tools.r8.graph.DexType):317:319 -> a
+    178:180:void lambda$analyzeInvokeCustom$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):341 -> a
+    181:183:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.invalidateEnum(com.android.tools.r8.graph.DexType):317:319 -> a
+    181:183:void lambda$analyzeInvokeCustom$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):342 -> a
+    184:184:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set,com.android.tools.r8.graph.ProgramMethod):325:325 -> a
     185:185:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexCallSite.getMethodProto():110:110 -> a
-    185:185:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set,com.android.tools.r8.graph.ProgramMethod):324 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    186:199:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set,com.android.tools.r8.graph.ProgramMethod):324:337 -> a
-    200:200:void analyzeInvokeCustomParameters(com.android.tools.r8.ir.code.InvokeCustom,java.util.function.Consumer):348:348 -> a
-    201:201:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> a
-    201:201:void analyzeInvokeCustomParameters(com.android.tools.r8.ir.code.InvokeCustom,java.util.function.Consumer):349 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    202:203:void analyzeInvokeCustomParameters(com.android.tools.r8.ir.code.InvokeCustom,java.util.function.Consumer):349:350 -> a
-    204:204:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):352:352 -> a
-    205:205:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    205:205:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):352 -> a
-    206:206:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):354:354 -> a
-    207:207:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
-    207:207:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):355 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    208:210:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):356:358 -> a
-    211:212:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):78:79 -> a
-    211:212:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):358 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    213:213:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):360:360 -> a
-    214:214:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():290:290 -> a
-    214:214:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):360 -> a
-    215:218:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):360:363 -> a
-    219:219:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> a
-    219:219:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):365 -> a
-    220:220:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):366:366 -> a
-    221:222:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):78:79 -> a
-    221:222:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):367 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    223:247:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.Set):525:549 -> a
-    248:249:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):556:557 -> a
-    250:282:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):972:1004 -> a
-    250:282:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    283:283:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):984:984 -> a
-    283:283:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    284:286:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):431:433 -> a
-    284:286:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1071 -> a
-    284:286:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):984 -> a
-    284:286:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    287:287:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):432:432 -> a
-    287:287:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1071 -> a
-    287:287:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):984 -> a
-    287:287:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    288:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1072:1074 -> a
-    288:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):984 -> a
-    288:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    291:291:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):975:975 -> a
-    291:291:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    292:292:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeAssumeUser(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1014:1014 -> a
-    292:292:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):975 -> a
-    292:292:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    293:293:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):982:982 -> a
-    293:293:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    294:309:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeArrayPutUser(com.android.tools.r8.ir.code.ArrayPut,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1047:1062 -> a
-    294:309:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):982 -> a
-    294:309:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    310:310:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):980:980 -> a
-    310:310:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    311:311:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):979:979 -> a
-    311:311:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    312:337:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):977:1002 -> a
-    312:337:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    338:338:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1000:1000 -> a
-    338:338:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    339:343:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeReturnUser(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1332:1336 -> a
-    339:343:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1000 -> a
-    339:343:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    344:344:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):992:992 -> a
-    344:344:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    345:345:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):991:991 -> a
-    345:345:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    346:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):989:989 -> a
-    346:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    347:350:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeInstanceGetUser(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1131:1134 -> a
-    347:350:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):988 -> a
-    347:350:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    351:351:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):986:986 -> a
-    351:351:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    352:352:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1108:1108 -> a
-    352:352:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):986 -> a
-    352:352:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    353:353:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":384,"2":385,"3":386}}
-    384:384:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1108:1108 -> a
-    384:384:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):986 -> a
-    384:384:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    385:385:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1108:1108 -> a
-    385:385:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):986 -> a
-    385:385:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    386:386:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1108:1108 -> a
-    386:386:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):986 -> a
-    386:386:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    354:367:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1109:1122 -> a
-    354:367:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):986 -> a
-    354:367:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    368:383:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559:574 -> a
-    387:387:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens):584:584 -> a
-    388:390:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.initializeCheckNotNullMethods(com.android.tools.r8.graph.GraphLens):590:592 -> a
-    388:390:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens):585 -> a
-    391:396:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.initializeEnumUnboxingCandidates(com.android.tools.r8.graph.GraphLens):597:602 -> a
-    391:396:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens):586 -> a
-    397:399:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):614:616 -> a
-    400:408:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.finishAnalysis():734:742 -> a
-    400:408:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):617 -> a
-    409:428:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):618:637 -> a
-    429:429:com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses.builder(com.android.tools.r8.graph.AppView):60:60 -> a
-    429:429:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):640 -> a
-    430:436:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):641:647 -> a
-    437:437:com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView,java.util.function.BiFunction):63:63 -> a
-    437:437:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):647 -> a
-    438:456:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):647:665 -> a
-    457:457:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):138:138 -> a
-    457:457:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):665 -> a
-    458:458:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):666:666 -> a
-    459:459:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):138:138 -> a
-    459:459:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):669 -> a
-    460:460:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):670:670 -> a
-    461:467:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):667:673 -> a
-    468:468:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):138:138 -> a
-    468:468:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):673 -> a
-    469:469:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):674:674 -> a
-    470:474:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):671:675 -> a
-    475:475:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result):694:694 -> a
-    475:475:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):677 -> a
-    476:479:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):679:682 -> a
-    480:480:java.util.Set lambda$unboxEnums$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.LongLivedClassSetBuilder):648:648 -> a
-    481:482:void updateKeepInfo(java.util.Set):726:727 -> a
-    483:483:void lambda$updateKeepInfo$6(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):730:730 -> a
-    484:484:void lambda$updateKeepInfo$6(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):729:729 -> a
-    485:500:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):765:780 -> a
-    485:500:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    501:501:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1425:1425 -> a
-    501:501:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):782 -> a
-    501:501:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    502:513:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):788:799 -> a
-    502:513:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    514:514:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1425:1425 -> a
-    514:514:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):798 -> a
-    514:514:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    515:515:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinalField():179:179 -> a
-    515:515:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):930 -> a
-    515:515:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):802 -> a
-    515:515:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    516:517:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):930:931 -> a
-    516:517:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):802 -> a
-    516:517:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    518:518:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    518:518:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):931 -> a
-    518:518:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):802 -> a
-    518:518:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    519:521:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):932:934 -> a
-    519:521:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):802 -> a
-    519:521:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    522:526:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):803:807 -> a
-    522:526:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    527:527:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1425:1425 -> a
-    527:527:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):804 -> a
-    527:527:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    528:543:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):810:825 -> a
-    528:543:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    544:544:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1425:1425 -> a
-    544:544:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):824 -> a
-    544:544:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    545:545:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):828:828 -> a
-    545:545:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    546:546:boolean com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.isEnumValuesObjectState():0:0 -> a
-    546:546:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):828 -> a
-    546:546:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    547:549:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):828:830 -> a
-    547:549:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    550:567:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):829:846 -> a
-    550:567:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    568:568:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinalField():179:179 -> a
-    568:568:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):930 -> a
-    568:568:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):846 -> a
-    568:568:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    569:570:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):930:931 -> a
-    569:570:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):846 -> a
-    569:570:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    571:571:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    571:571:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):931 -> a
-    571:571:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):846 -> a
-    571:571:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    572:574:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):932:934 -> a
-    572:574:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):846 -> a
-    572:574:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    575:575:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):846:846 -> a
-    575:575:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    576:576:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinalField():179:179 -> a
-    576:576:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):930 -> a
-    576:576:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):847 -> a
-    576:576:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    577:578:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):930:931 -> a
-    577:578:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):847 -> a
-    577:578:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    579:579:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    579:579:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):931 -> a
-    579:579:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):847 -> a
-    579:579:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    580:582:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):932:934 -> a
-    580:582:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):847 -> a
-    580:582:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    583:584:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):847:848 -> a
-    583:584:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    585:586:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):873:874 -> a
-    585:586:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    585:586:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    587:590:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):894:897 -> a
-    587:590:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):876 -> a
-    587:590:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    587:590:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    591:591:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> a
-    591:591:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):899 -> a
-    591:591:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):876 -> a
-    591:591:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    591:591:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    592:592:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):900:900 -> a
-    592:592:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):876 -> a
-    592:592:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    592:592:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    593:593:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
-    593:593:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
-    593:593:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):900 -> a
-    593:593:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):876 -> a
-    593:593:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    593:593:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    594:598:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):901:905 -> a
-    594:598:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):876 -> a
-    594:598:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    594:598:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    599:599:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1425:1425 -> a
-    599:599:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):904 -> a
-    599:599:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):876 -> a
-    599:599:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    599:599:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    600:600:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):906:906 -> a
-    600:600:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):876 -> a
-    600:600:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    600:600:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    601:601:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    601:601:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):908 -> a
-    601:601:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):876 -> a
-    601:601:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    601:601:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    602:605:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):908:911 -> a
-    602:605:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):876 -> a
-    602:605:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    602:605:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    606:606:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1425:1425 -> a
-    606:606:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):909 -> a
-    606:606:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):876 -> a
-    606:606:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    606:606:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    607:621:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):912:926 -> a
-    607:621:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):876 -> a
-    607:621:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    607:621:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    622:632:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):877:887 -> a
-    622:632:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):857 -> a
-    622:632:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    633:637:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):862:866 -> a
-    633:637:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):750 -> a
-    638:638:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):753:753 -> a
-    639:639:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection.removeCandidate(com.android.tools.r8.graph.DexProgramClass):46:46 -> a
-    639:639:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):753 -> a
-    640:640:void lambda$analyzeEnumInstances$7(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):757:757 -> a
-    641:654:void lambda$analyzeInitializers$8(com.android.tools.r8.graph.DexProgramClass):952:965 -> a
-    655:660:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1085:1090 -> a
-    661:661:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52:52 -> a
-    661:661:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1090 -> a
-    662:662:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    662:662:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52 -> a
-    662:662:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1090 -> a
-    663:672:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1092:1101 -> a
-    673:693:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1144:1164 -> a
-    694:694:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    694:694:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1164 -> a
-    695:698:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1164:1167 -> a
-    699:711:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1162:1174 -> a
-    712:712:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
-    712:712:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1174 -> a
-    713:715:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1176:1178 -> a
-    716:722:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1177:1183 -> a
-    723:737:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1181:1195 -> a
-    738:739:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getArgumentForParameter(int):280:281 -> a
-    738:739:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1196 -> a
-    740:750:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1197:1207 -> a
-    751:751:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    751:751:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1210 -> a
-    752:755:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1211:1214 -> a
-    756:756:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    756:756:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1214 -> a
-    757:757:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1214:1214 -> a
-    758:781:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1236:1259 -> a
-    758:781:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    782:782:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1249:1249 -> a
-    782:782:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    783:783:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):514:514 -> a
-    783:783:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1250 -> a
-    783:783:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    784:784:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1251:1251 -> a
-    784:784:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    785:806:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1241:1262 -> a
-    785:806:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    807:848:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1243:1284 -> a
-    807:848:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    849:856:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1282:1289 -> a
-    849:856:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    857:857:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):514:514 -> a
-    857:857:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1290 -> a
-    857:857:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    858:889:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1291:1322 -> a
-    858:889:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    890:895:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1299:1304 -> a
-    890:895:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    896:896:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):514:514 -> a
-    896:896:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1301 -> a
-    896:896:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    897:897:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1302:1302 -> a
-    897:897:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
-    898:898:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1220:1220 -> a
-    899:899:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):207:207 -> a
-    899:899:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1221 -> a
-    900:901:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1446:1447 -> a
-    902:905:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1454:1457 -> a
-    906:907:void rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):1462:1463 -> a
-    1:1:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):197:197 -> b
-    2:2:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1425:1425 -> b
-    2:2:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):198 -> b
-    3:3:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):200:200 -> b
-    4:6:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.markEnumEligible(com.android.tools.r8.graph.DexType,java.util.Set):309:311 -> b
-    4:6:void lambda$analyzeInvokeCustom$1(java.util.Set,com.android.tools.r8.graph.DexType):335 -> b
-    7:9:void invalidateEnum(com.android.tools.r8.graph.DexType):316:318 -> b
-    10:10:com.android.tools.r8.utils.collections.LongLivedClassSetBuilder lambda$analyzeInvokeUser$9(com.android.tools.r8.graph.GraphLens):1185:1185 -> b
-    11:11:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1441:1441 -> b
-    12:12:void unsetRewriter():1469:1469 -> b
-    1:2:void updateEnumUnboxingCandidatesInfo():184:185 -> c
+    185:185:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set,com.android.tools.r8.graph.ProgramMethod):325 -> a
+    186:199:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set,com.android.tools.r8.graph.ProgramMethod):325:338 -> a
+    200:201:void analyzeInvokeCustomParameters(com.android.tools.r8.ir.code.InvokeCustom,java.util.function.Consumer):349:350 -> a
+    202:202:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> a
+    202:202:void analyzeInvokeCustomParameters(com.android.tools.r8.ir.code.InvokeCustom,java.util.function.Consumer):350 -> a
+    203:204:void analyzeInvokeCustomParameters(com.android.tools.r8.ir.code.InvokeCustom,java.util.function.Consumer):350:351 -> a
+    205:205:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):353:353 -> a
+    206:206:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
+    206:206:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):353 -> a
+    207:208:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):355:356 -> a
+    209:209:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
+    209:209:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):356 -> a
+    210:212:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):357:359 -> a
+    213:214:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):78:79 -> a
+    213:214:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):359 -> a
+    215:215:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):361:361 -> a
+    216:216:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():290:290 -> a
+    216:216:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):361 -> a
+    217:220:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):361:364 -> a
+    221:221:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> a
+    221:221:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):366 -> a
+    222:223:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):367:368 -> a
+    224:225:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):78:79 -> a
+    224:225:void lambda$analyzeInvokeCustomParameters$3(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):368 -> a
+    226:250:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.Set):526:550 -> a
+    251:252:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):557:558 -> a
+    253:285:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):984:1016 -> a
+    253:285:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    286:286:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):996:996 -> a
+    286:286:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    287:289:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):432:434 -> a
+    287:289:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1083 -> a
+    287:289:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):996 -> a
+    287:289:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    290:290:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):433:433 -> a
+    290:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1083 -> a
+    290:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):996 -> a
+    290:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    291:293:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1084:1086 -> a
+    291:293:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):996 -> a
+    291:293:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    294:294:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):987:987 -> a
+    294:294:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    295:295:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeAssumeUser(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1026:1026 -> a
+    295:295:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):987 -> a
+    295:295:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    296:296:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):994:994 -> a
+    296:296:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    297:312:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeArrayPutUser(com.android.tools.r8.ir.code.ArrayPut,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1059:1074 -> a
+    297:312:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):994 -> a
+    297:312:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    313:313:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):992:992 -> a
+    313:313:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    314:314:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):991:991 -> a
+    314:314:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    315:340:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):989:1014 -> a
+    315:340:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    341:341:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1012:1012 -> a
+    341:341:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    342:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeReturnUser(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1344:1348 -> a
+    342:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1012 -> a
+    342:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    347:347:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1004:1004 -> a
+    347:347:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    348:348:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1003:1003 -> a
+    348:348:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    349:349:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1001:1001 -> a
+    349:349:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    350:353:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeInstanceGetUser(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1143:1146 -> a
+    350:353:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1000 -> a
+    350:353:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    354:354:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):998:998 -> a
+    354:354:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    355:355:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1120:1120 -> a
+    355:355:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):998 -> a
+    355:355:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    356:356:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":387,"2":388,"3":389}}
+    387:387:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1120:1120 -> a
+    387:387:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):998 -> a
+    387:387:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    388:388:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1120:1120 -> a
+    388:388:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):998 -> a
+    388:388:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    389:389:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1120:1120 -> a
+    389:389:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):998 -> a
+    389:389:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    357:370:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1121:1134 -> a
+    357:370:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):998 -> a
+    357:370:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    371:386:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):560:575 -> a
+    390:390:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens):585:585 -> a
+    391:393:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.initializeCheckNotNullMethods(com.android.tools.r8.graph.GraphLens):591:593 -> a
+    391:393:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens):586 -> a
+    394:399:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.initializeEnumUnboxingCandidates(com.android.tools.r8.graph.GraphLens):598:603 -> a
+    394:399:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens):587 -> a
+    400:402:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):615:617 -> a
+    403:411:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.finishAnalysis():746:754 -> a
+    403:411:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):618 -> a
+    412:432:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):619:639 -> a
+    433:433:com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses.builder(com.android.tools.r8.graph.AppView):60:60 -> a
+    433:433:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):642 -> a
+    434:440:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):643:649 -> a
+    441:441:com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView,java.util.function.BiFunction):63:63 -> a
+    441:441:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):649 -> a
+    442:464:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):649:671 -> a
+    465:465:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):138:138 -> a
+    465:465:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):671 -> a
+    466:466:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):672:672 -> a
+    467:467:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):138:138 -> a
+    467:467:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):675 -> a
+    468:468:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):676:676 -> a
+    469:475:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):673:679 -> a
+    476:476:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):138:138 -> a
+    476:476:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):679 -> a
+    477:477:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):680:680 -> a
+    478:482:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):677:681 -> a
+    483:489:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result,com.android.tools.r8.graph.GraphLens):700:706 -> a
+    483:489:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):683 -> a
+    490:493:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):685:688 -> a
+    494:494:java.util.Set lambda$unboxEnums$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.LongLivedClassSetBuilder):650:650 -> a
+    495:497:boolean lambda$unboxEnums$6(com.android.tools.r8.graph.ProgramMethod,java.util.Set):654:656 -> a
+    498:498:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
+    498:498:boolean lambda$unboxEnums$6(com.android.tools.r8.graph.ProgramMethod,java.util.Set):656 -> a
+    499:500:void updateKeepInfo(java.util.Set):738:739 -> a
+    501:501:void lambda$updateKeepInfo$7(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):742:742 -> a
+    502:502:void lambda$updateKeepInfo$7(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):741:741 -> a
+    503:518:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):777:792 -> a
+    503:518:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    519:519:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1437:1437 -> a
+    519:519:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    519:519:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    520:531:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):800:811 -> a
+    520:531:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    532:532:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1437:1437 -> a
+    532:532:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):810 -> a
+    532:532:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    533:533:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinalField():180:180 -> a
+    533:533:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):942 -> a
+    533:533:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):814 -> a
+    533:533:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    534:535:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):942:943 -> a
+    534:535:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):814 -> a
+    534:535:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    536:536:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    536:536:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):943 -> a
+    536:536:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):814 -> a
+    536:536:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    537:539:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):944:946 -> a
+    537:539:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):814 -> a
+    537:539:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    540:544:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):815:819 -> a
+    540:544:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    545:545:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1437:1437 -> a
+    545:545:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):816 -> a
+    545:545:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    546:561:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):822:837 -> a
+    546:561:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    562:562:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1437:1437 -> a
+    562:562:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):836 -> a
+    562:562:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    563:563:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):840:840 -> a
+    563:563:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    564:564:boolean com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.isEnumValuesObjectState():0:0 -> a
+    564:564:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):840 -> a
+    564:564:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    565:567:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):840:842 -> a
+    565:567:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    568:585:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):841:858 -> a
+    568:585:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    586:586:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinalField():180:180 -> a
+    586:586:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):942 -> a
+    586:586:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):858 -> a
+    586:586:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    587:588:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):942:943 -> a
+    587:588:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):858 -> a
+    587:588:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    589:589:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    589:589:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):943 -> a
+    589:589:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):858 -> a
+    589:589:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    590:592:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):944:946 -> a
+    590:592:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):858 -> a
+    590:592:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    593:593:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):858:858 -> a
+    593:593:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    594:594:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinalField():180:180 -> a
+    594:594:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):942 -> a
+    594:594:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):859 -> a
+    594:594:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    595:596:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):942:943 -> a
+    595:596:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):859 -> a
+    595:596:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    597:597:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    597:597:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):943 -> a
+    597:597:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):859 -> a
+    597:597:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    598:600:java.util.OptionalInt com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):944:946 -> a
+    598:600:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):859 -> a
+    598:600:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    601:602:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):859:860 -> a
+    601:602:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    603:604:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):885:886 -> a
+    603:604:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    603:604:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    605:608:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):906:909 -> a
+    605:608:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):888 -> a
+    605:608:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    605:608:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    609:609:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> a
+    609:609:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):911 -> a
+    609:609:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):888 -> a
+    609:609:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    609:609:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    610:610:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):912:912 -> a
+    610:610:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):888 -> a
+    610:610:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    610:610:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    611:611:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
+    611:611:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
+    611:611:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):912 -> a
+    611:611:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):888 -> a
+    611:611:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    611:611:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    612:616:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):913:917 -> a
+    612:616:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):888 -> a
+    612:616:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    612:616:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    617:617:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1437:1437 -> a
+    617:617:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):916 -> a
+    617:617:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):888 -> a
+    617:617:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    617:617:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    618:618:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):918:918 -> a
+    618:618:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):888 -> a
+    618:618:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    618:618:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    619:619:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    619:619:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):920 -> a
+    619:619:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):888 -> a
+    619:619:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    619:619:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    620:623:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):920:923 -> a
+    620:623:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):888 -> a
+    620:623:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    620:623:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    624:624:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1437:1437 -> a
+    624:624:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):921 -> a
+    624:624:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):888 -> a
+    624:624:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    624:624:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    625:639:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):924:938 -> a
+    625:639:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):888 -> a
+    625:639:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    625:639:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    640:650:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):889:899 -> a
+    640:650:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):869 -> a
+    640:650:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    651:655:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):874:878 -> a
+    651:655:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):762 -> a
+    656:656:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):765:765 -> a
+    657:657:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection.removeCandidate(com.android.tools.r8.graph.DexProgramClass):46:46 -> a
+    657:657:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):765 -> a
+    658:658:void lambda$analyzeEnumInstances$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):769:769 -> a
+    659:672:void lambda$analyzeInitializers$9(com.android.tools.r8.graph.DexProgramClass):964:977 -> a
+    673:678:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1097:1102 -> a
+    679:679:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52:52 -> a
+    679:679:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1102 -> a
+    680:680:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    680:680:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52 -> a
+    680:680:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1102 -> a
+    681:690:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1104:1113 -> a
+    691:711:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1156:1176 -> a
+    712:712:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    712:712:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1176 -> a
+    713:716:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1176:1179 -> a
+    717:729:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1174:1186 -> a
+    730:730:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
+    730:730:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1186 -> a
+    731:733:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1188:1190 -> a
+    734:740:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1189:1195 -> a
+    741:755:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1193:1207 -> a
+    756:757:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getArgumentForParameter(int):280:281 -> a
+    756:757:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1208 -> a
+    758:768:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1209:1219 -> a
+    769:769:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    769:769:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1222 -> a
+    770:773:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1223:1226 -> a
+    774:774:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    774:774:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1226 -> a
+    775:775:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1226:1226 -> a
+    776:799:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1248:1271 -> a
+    776:799:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    800:800:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1261:1261 -> a
+    800:800:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    801:801:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):515:515 -> a
+    801:801:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1262 -> a
+    801:801:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    802:802:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1263:1263 -> a
+    802:802:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    803:824:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1253:1274 -> a
+    803:824:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    825:866:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1255:1296 -> a
+    825:866:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    867:874:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1294:1301 -> a
+    867:874:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    875:875:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):515:515 -> a
+    875:875:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1302 -> a
+    875:875:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    876:907:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1303:1334 -> a
+    876:907:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    908:913:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1311:1316 -> a
+    908:913:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    914:914:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):515:515 -> a
+    914:914:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1313 -> a
+    914:914:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    915:915:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1314:1314 -> a
+    915:915:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1229 -> a
+    916:916:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1232:1232 -> a
+    917:917:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):208:208 -> a
+    917:917:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1233 -> a
+    918:919:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1458:1459 -> a
+    920:923:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):1469:1472 -> a
+    1:1:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):198:198 -> b
+    2:2:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1437:1437 -> b
+    2:2:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):199 -> b
+    3:3:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):201:201 -> b
+    4:6:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.markEnumEligible(com.android.tools.r8.graph.DexType,java.util.Set):310:312 -> b
+    4:6:void lambda$analyzeInvokeCustom$1(java.util.Set,com.android.tools.r8.graph.DexType):336 -> b
+    7:9:void invalidateEnum(com.android.tools.r8.graph.DexType):317:319 -> b
+    10:10:com.android.tools.r8.utils.collections.LongLivedClassSetBuilder lambda$analyzeInvokeUser$10(com.android.tools.r8.graph.GraphLens):1197:1197 -> b
+    11:11:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1453:1453 -> b
+    12:12:void unsetRewriter():1477:1477 -> b
+    1:2:void updateEnumUnboxingCandidatesInfo():185:186 -> c
     3:3:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection.removeCandidate(com.android.tools.r8.graph.DexProgramClass):46:46 -> c
-    3:3:void updateEnumUnboxingCandidatesInfo():185 -> c
-    4:4:void updateEnumUnboxingCandidatesInfo():187:187 -> c
-    1:15:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():747:761 -> d
-    1:1:void analyzeInitializers():950:950 -> e
-    1:1:com.android.tools.r8.graph.DexClassAndField getOrdinalField():179:179 -> f
-com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl$1 -> com.android.tools.r8.internal.wi:
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl this$0 -> b
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result val$treeFixerResult -> a
-    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl,com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result):697:697 -> <init>
-    1:2:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):700:701 -> a
+    3:3:void updateEnumUnboxingCandidatesInfo():186 -> c
+    4:4:void updateEnumUnboxingCandidatesInfo():188:188 -> c
+    1:15:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():759:773 -> d
+    1:1:void analyzeInitializers():962:962 -> e
+    1:1:com.android.tools.r8.graph.DexClassAndField getOrdinalField():180:180 -> f
+com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl$1 -> com.android.tools.r8.internal.hi:
+    com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens val$graphLens -> a
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl this$0 -> d
+    com.android.tools.r8.graph.GraphLens val$codeLens -> b
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result val$treeFixerResult -> c
+    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result):709:709 -> <init>
+    1:2:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):712:713 -> a
     3:3:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):39:39 -> a
-    3:3:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):701 -> a
-    4:5:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):701:702 -> a
-    6:7:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):708:709 -> a
-    8:8:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):178:178 -> a
-    8:8:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):709 -> a
-    9:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):709:712 -> a
-    13:21:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):711:719 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.Ai:
+    3:3:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):713 -> a
+    4:5:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):713:714 -> a
+    6:7:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):720:721 -> a
+    8:8:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):176:176 -> a
+    8:8:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):721 -> a
+    9:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):721:724 -> a
+    13:21:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):723:731 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.li:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumToUnboxCandidates -> d
@@ -66623,42 +66235,42 @@
     3:3:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):46:46 -> a
     4:18:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):60:74 -> a
     4:18:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):47 -> a
-    19:19:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1425:1425 -> a
+    19:19:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1437:1437 -> a
     19:19:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):74 -> a
     19:19:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):47 -> a
     20:20:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):66:66 -> a
     20:20:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):47 -> a
-    21:21:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1425:1425 -> a
+    21:21:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1437:1437 -> a
     21:21:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):66 -> a
     21:21:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):47 -> a
     22:22:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):48:48 -> a
-    23:23:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():83:83 -> a
-    23:23:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
-    24:24:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    24:24:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():84 -> a
-    24:24:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
-    25:25:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():85:85 -> a
+    23:24:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():83:84 -> a
+    23:24:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
+    25:25:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    25:25:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():84 -> a
     25:25:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
-    26:28:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):94:96 -> a
-    26:28:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():86 -> a
-    26:28:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
-    29:34:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):95:100 -> a
-    29:34:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():86 -> a
-    29:34:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
-    35:39:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):52:56 -> a
-    40:40:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):44:44 -> a
-    41:45:void removePinnedCandidates():110:114 -> a
-    46:46:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):113:113 -> a
-    47:49:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):126:128 -> a
-    47:49:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):113 -> a
-    50:51:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):116:117 -> a
-    52:54:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):126:128 -> a
-    52:54:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):117 -> a
-    55:55:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):118:118 -> a
-    56:58:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):126:128 -> a
-    56:58:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):119 -> a
-    59:61:void removePinnedCandidate(com.android.tools.r8.graph.DexType):133:135 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.Ci:
+    26:26:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():85:85 -> a
+    26:26:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
+    27:29:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):94:96 -> a
+    27:29:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():86 -> a
+    27:29:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
+    30:35:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):95:100 -> a
+    30:35:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():86 -> a
+    30:35:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
+    36:40:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):52:56 -> a
+    41:41:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):44:44 -> a
+    42:46:void removePinnedCandidates():110:114 -> a
+    47:47:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):113:113 -> a
+    48:50:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):126:128 -> a
+    48:50:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):113 -> a
+    51:52:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):116:117 -> a
+    53:55:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):126:128 -> a
+    53:55:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):117 -> a
+    56:56:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):118:118 -> a
+    57:59:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):126:128 -> a
+    57:59:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):119 -> a
+    60:62:void removePinnedCandidate(com.android.tools.r8.graph.DexType):133:135 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.ni:
     java.util.Map enumTypeToInfo -> a
     java.util.Set prunedMethods -> b
     boolean $assertionsDisabled -> c
@@ -66680,7 +66292,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet candidates():62:62 -> c
     1:1:void clear():128:128 -> d
     1:1:boolean isEmpty():58:58 -> e
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.Bi:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.mi:
     java.util.Set requiredInstanceFieldData -> c
     com.android.tools.r8.graph.DexProgramClass enumClass -> a
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodDependencies -> b
@@ -66694,7 +66306,7 @@
     4:4:void addRequiredInstanceFieldData(com.android.tools.r8.graph.DexField):158:158 -> a
     1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):131:131 -> b
     2:2:java.util.Set getRequiredInstanceFieldData():162:162 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.Gi:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.ri:
     1:1:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
     2:22:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):51:71 -> a
     23:23:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
@@ -66745,48 +66357,57 @@
     42:71:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):313:342 -> e
     72:72:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> e
     72:72:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):342 -> e
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.Ii:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.ti:
     java.util.Map prototypeChangesPerMethod -> o
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> n
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums -> p
     boolean $assertionsDisabled -> q
     1:1:void <clinit>():33:33 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeMap,java.util.Map,java.util.Map):45:49 -> <init>
-    1:7:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):57:63 -> a
-    8:8:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.builder():214:214 -> a
-    8:8:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):66 -> a
-    9:14:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):67:72 -> a
-    15:15:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):71:71 -> a
-    16:19:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):70:73 -> a
-    20:39:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):65:84 -> a
-    40:40:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder enumUnboxingLensBuilder(com.android.tools.r8.graph.AppView):99:99 -> a
-    1:4:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):90:93 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.Hi:
+    1:4:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):67:70 -> a
+    5:9:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens.rewriteSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):94:98 -> a
+    5:9:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):71 -> a
+    10:10:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens.rewriteSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):97:97 -> a
+    10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):71 -> a
+    11:11:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.builder():234:234 -> a
+    11:11:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):75 -> a
+    12:16:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):76:80 -> a
+    17:33:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):74:90 -> a
+    34:37:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):107:110 -> a
+    38:38:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder enumUnboxingLensBuilder(com.android.tools.r8.graph.AppView):116:116 -> a
+    boolean hasCustomCodeRewritings() -> f
+    boolean isEnumUnboxerLens() -> h
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.si:
     java.util.Map typeMap -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap newMethodSignatures -> d
     java.util.Map prototypeChangesPerMethod -> e
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> c
-    1:1:void <clinit>():102:102 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):114:114 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.AppView):105:115 -> <init>
-    1:2:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder mapUnboxedEnums(java.util.Set):119:120 -> a
-    3:3:void move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):129:129 -> a
-    4:33:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):142:171 -> a
-    34:34:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.createForRewrittenTypes(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):692:692 -> a
-    34:34:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):171 -> a
-    35:35:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):172:172 -> a
-    36:38:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.withExtraUnusedNullParameters(int):842:844 -> a
-    36:38:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):172 -> a
-    39:39:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):173:173 -> a
-    40:42:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):179:181 -> a
-    43:46:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):180:183 -> a
-    47:50:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):182:185 -> a
-    51:54:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):184:187 -> a
-    55:55:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):186:186 -> a
-    56:62:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens build(com.android.tools.r8.graph.AppView):191:197 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Ji:
+    1:1:void <clinit>():119:119 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):131:131 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.AppView):122:132 -> <init>
+    1:2:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder mapUnboxedEnums(java.util.Set):136:137 -> a
+    3:3:void move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):146:146 -> a
+    4:33:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):159:188 -> a
+    34:34:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.createForRewrittenTypes(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):664:664 -> a
+    34:34:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):188 -> a
+    35:35:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):189:189 -> a
+    36:36:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.withExtraUnusedNullParameters(int):850:850 -> a
+    36:36:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):189 -> a
+    37:37:void com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter.<init>():20:20 -> a
+    37:37:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.withExtraUnusedNullParameters(int):850 -> a
+    37:37:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):189 -> a
+    38:39:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.withExtraUnusedNullParameters(int):851:852 -> a
+    38:39:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):189 -> a
+    40:40:com.android.tools.r8.graph.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):190:190 -> a
+    41:43:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):196:198 -> a
+    44:47:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):197:200 -> a
+    48:51:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):199:202 -> a
+    52:55:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):201:204 -> a
+    56:56:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):203:203 -> a
+    57:63:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens build(com.android.tools.r8.graph.AppView):208:214 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.ui:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnumsData -> e
     java.util.Map checkNotNullToCheckNotZeroMapping -> b
     com.android.tools.r8.graph.DexItemFactory factory -> c
@@ -66795,211 +66416,258 @@
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses utilityClasses -> g
     com.android.tools.r8.utils.InternalOptions options -> d
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:9:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses):67:75 -> <init>
-    1:14:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):89:102 -> a
-    15:16:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):470:471 -> a
-    15:16:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):103 -> a
-    17:21:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):536:540 -> a
-    17:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):471 -> a
-    17:21:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):103 -> a
-    22:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):472:474 -> a
-    22:24:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):103 -> a
-    25:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.insertConstZero(com.android.tools.r8.ir.code.IRCode):487:491 -> a
-    25:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):476 -> a
-    25:29:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):103 -> a
-    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):478:478 -> a
-    30:30:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):103 -> a
-    31:56:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):104:129 -> a
-    57:57:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():83:83 -> a
-    57:57:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):131 -> a
-    58:58:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):131:131 -> a
-    59:67:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):130:138 -> a
-    68:68:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):79:79 -> a
-    68:68:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):463 -> a
-    68:68:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):139 -> a
-    69:72:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):463:466 -> a
-    69:72:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):139 -> a
-    73:73:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):465:465 -> a
-    73:73:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):139 -> a
-    74:75:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):141:142 -> a
-    76:76:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
-    76:76:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):146 -> a
-    77:77:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):79:79 -> a
-    77:77:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):463 -> a
-    77:77:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):147 -> a
-    78:81:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):463:466 -> a
-    78:81:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):147 -> a
-    82:82:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):465:465 -> a
-    82:82:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):147 -> a
-    83:84:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):150:151 -> a
-    85:85:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():83:83 -> a
-    85:85:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):136 -> a
-    86:86:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):136:136 -> a
-    87:87:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):135:135 -> a
-    88:88:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():83:83 -> a
-    88:88:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):127 -> a
-    89:89:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):127:127 -> a
-    90:123:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):126:159 -> a
-    124:124:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):79:79 -> a
-    124:124:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):162 -> a
-    125:127:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):162:164 -> a
-    128:128:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    128:128:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):164 -> a
-    129:129:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):307:307 -> a
-    129:129:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):165 -> a
-    130:130:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):165:165 -> a
-    131:131:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
-    131:131:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):166 -> a
-    132:142:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):166:176 -> a
-    143:143:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.clearOutValue():157:157 -> a
-    143:143:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):177 -> a
-    144:160:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):177:193 -> a
-    161:169:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):305:313 -> a
-    161:169:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    170:170:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):314 -> a
-    170:170:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    171:171:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):314:314 -> a
-    171:171:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    172:172:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    172:172:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):318 -> a
-    172:172:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    173:174:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):318:319 -> a
-    173:174:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    175:175:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):79:79 -> a
-    175:175:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):322 -> a
-    175:175:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    176:197:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):322:343 -> a
-    176:197:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    198:198:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    198:198:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):344 -> a
-    198:198:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    199:204:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):345:350 -> a
-    199:204:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    205:205:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    205:205:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):351 -> a
-    205:205:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    206:206:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):352:352 -> a
-    206:206:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    207:207:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():83:83 -> a
-    207:207:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):357 -> a
-    207:207:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    208:208:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):357:357 -> a
-    208:208:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    209:221:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):354:366 -> a
-    209:221:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    222:222:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):367 -> a
-    222:222:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    223:223:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):368:368 -> a
-    223:223:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    224:224:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):79:79 -> a
-    224:224:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):371 -> a
-    224:224:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    225:228:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):371:374 -> a
-    225:228:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    229:242:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):372:385 -> a
-    229:242:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    243:243:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    243:243:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):386 -> a
-    243:243:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    244:247:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):387:390 -> a
-    244:247:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    248:248:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    248:248:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):396 -> a
-    248:248:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    249:261:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):396:408 -> a
-    249:261:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    262:262:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
-    262:262:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):408 -> a
-    262:262:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    263:265:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):410:412 -> a
-    263:265:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    266:266:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    266:266:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):415 -> a
-    266:266:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    267:267:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):307:307 -> a
-    267:267:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):416 -> a
-    267:267:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    268:279:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):416:427 -> a
-    268:279:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    280:280:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    280:280:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):201 -> a
-    281:297:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):202:218 -> a
-    298:304:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):217:223 -> a
-    305:305:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    305:305:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):223 -> a
-    306:306:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():83:83 -> a
-    306:306:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):224 -> a
-    307:307:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):224:224 -> a
+    1:1:void <clinit>():54:54 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses):69:76 -> <init>
+    1:5:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):119:123 -> a
+    6:7:java.util.Map com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.RewrittenPrototypeDescription):89:90 -> a
+    6:7:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):124 -> a
+    8:9:int com.android.tools.r8.ir.code.IRCode.getNumberOfArguments():1086:1087 -> a
+    8:9:java.util.Map com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.RewrittenPrototypeDescription):92 -> a
+    8:9:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):124 -> a
+    10:14:java.util.Map com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.RewrittenPrototypeDescription):93:97 -> a
+    10:14:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):124 -> a
+    15:15:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
+    15:15:java.util.Map com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.RewrittenPrototypeDescription):97 -> a
+    15:15:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):124 -> a
+    16:17:java.util.Map com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.RewrittenPrototypeDescription):100:101 -> a
+    16:17:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):124 -> a
+    18:18:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
+    18:18:java.util.Map com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.RewrittenPrototypeDescription):102 -> a
+    18:18:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):124 -> a
+    19:20:java.util.Map com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.RewrittenPrototypeDescription):103:104 -> a
+    19:20:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):124 -> a
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.graph.DexType):594:594 -> a
+    21:21:java.util.Map com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.RewrittenPrototypeDescription):104 -> a
+    21:21:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):124 -> a
+    22:22:java.util.Map com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.RewrittenPrototypeDescription):106:106 -> a
+    22:22:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):124 -> a
+    23:30:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):125:132 -> a
+    31:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):521:522 -> a
+    31:32:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):133 -> a
+    33:36:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):587:590 -> a
+    33:36:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):522 -> a
+    33:36:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):133 -> a
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.graph.DexType):594:594 -> a
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):590 -> a
+    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):522 -> a
+    37:37:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):133 -> a
+    38:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):523:525 -> a
+    38:40:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):133 -> a
+    41:45:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.insertConstZero(com.android.tools.r8.ir.code.IRCode):538:542 -> a
+    41:45:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):527 -> a
+    41:45:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):133 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):529:529 -> a
+    46:46:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):133 -> a
+    47:67:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):134:154 -> a
+    68:95:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):153:180 -> a
+    96:96:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():84:84 -> a
+    96:96:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):182 -> a
+    97:97:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):182:182 -> a
+    98:106:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):181:189 -> a
+    107:107:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):80:80 -> a
+    107:107:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):514 -> a
+    107:107:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):190 -> a
+    108:111:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):514:517 -> a
+    108:111:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):190 -> a
+    112:112:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):516:516 -> a
+    112:112:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):190 -> a
+    113:114:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):192:193 -> a
+    115:115:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
+    115:115:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):197 -> a
+    116:116:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):80:80 -> a
+    116:116:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):514 -> a
+    116:116:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):198 -> a
+    117:120:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):514:517 -> a
+    117:120:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):198 -> a
+    121:121:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.MethodProcessor):516:516 -> a
+    121:121:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):198 -> a
+    122:122:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):201:201 -> a
+    123:123:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):484:484 -> a
+    123:123:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):202 -> a
+    124:124:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():84:84 -> a
+    124:124:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):485 -> a
+    124:124:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):202 -> a
+    125:125:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):485:485 -> a
+    125:125:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):202 -> a
+    126:126:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():84:84 -> a
+    126:126:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):187 -> a
+    127:127:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):187:187 -> a
+    128:128:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):186:186 -> a
+    129:129:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():84:84 -> a
+    129:129:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):178 -> a
+    130:130:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):178:178 -> a
+    131:164:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):177:210 -> a
+    165:165:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):80:80 -> a
+    165:165:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):213 -> a
+    166:168:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):213:215 -> a
+    169:169:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
+    169:169:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):215 -> a
+    170:170:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):307:307 -> a
+    170:170:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):216 -> a
+    171:171:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):216:216 -> a
+    172:172:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
+    172:172:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):217 -> a
+    173:183:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):217:227 -> a
+    184:184:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.clearOutValue():157:157 -> a
+    184:184:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):228 -> a
+    185:201:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):228:244 -> a
+    202:210:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):356:364 -> a
+    202:210:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    211:211:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    211:211:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):365 -> a
+    211:211:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    212:212:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):365:365 -> a
+    212:212:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    213:213:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    213:213:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):369 -> a
+    213:213:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    214:215:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):369:370 -> a
+    214:215:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    216:216:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):80:80 -> a
+    216:216:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):373 -> a
+    216:216:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    217:238:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):373:394 -> a
+    217:238:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    239:239:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    239:239:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):395 -> a
+    239:239:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    240:240:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):396:396 -> a
+    240:240:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    241:241:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):484:484 -> a
+    241:241:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):398 -> a
+    241:241:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    242:242:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():84:84 -> a
+    242:242:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):485 -> a
+    242:242:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):398 -> a
+    242:242:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    243:243:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):485:485 -> a
+    243:243:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):398 -> a
+    243:243:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    244:245:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):400:401 -> a
+    244:245:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    246:246:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    246:246:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):402 -> a
+    246:246:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    247:247:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):403:403 -> a
+    247:247:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    248:248:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():84:84 -> a
+    248:248:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):408 -> a
+    248:248:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    249:249:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):408:408 -> a
+    249:249:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    250:262:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):405:417 -> a
+    250:262:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    263:263:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    263:263:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):418 -> a
+    263:263:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    264:264:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):419:419 -> a
+    264:264:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    265:265:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):80:80 -> a
+    265:265:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):422 -> a
+    265:265:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    266:269:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):422:425 -> a
+    266:269:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    270:283:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):423:436 -> a
+    270:283:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    284:284:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    284:284:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):437 -> a
+    284:284:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    285:288:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):438:441 -> a
+    285:288:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    289:289:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    289:289:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):447 -> a
+    289:289:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    290:302:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):447:459 -> a
+    290:302:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    303:303:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
+    303:303:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):459 -> a
+    303:303:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    304:306:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):461:463 -> a
+    304:306:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    307:307:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
+    307:307:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):466 -> a
+    307:307:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
     308:308:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):307:307 -> a
-    308:308:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):224 -> a
-    309:311:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):224:226 -> a
-    312:312:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
-    312:312:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):226 -> a
-    313:317:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):226:230 -> a
-    318:318:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.removeRedundantValuesArrayCloning(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,java.util.Set):439:439 -> a
-    318:318:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):236 -> a
-    319:319:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    319:319:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.removeRedundantValuesArrayCloning(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,java.util.Set):439 -> a
-    319:319:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):236 -> a
-    320:331:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.removeRedundantValuesArrayCloning(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,java.util.Set):439:450 -> a
-    320:331:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):236 -> a
-    332:332:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.removeRedundantValuesArrayCloning(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,java.util.Set):448:448 -> a
-    332:332:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):236 -> a
-    333:336:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):237:240 -> a
-    337:337:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1150:1150 -> a
-    337:337:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):240 -> a
-    338:339:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):241:242 -> a
-    340:340:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    340:340:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):248 -> a
-    341:345:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):249:253 -> a
-    346:348:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.ensureInstanceFieldMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.MethodProcessor):495:497 -> a
-    346:348:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):253 -> a
-    349:349:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():83:83 -> a
-    349:349:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.ensureInstanceFieldMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> a
-    349:349:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):253 -> a
-    350:352:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.ensureInstanceFieldMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.MethodProcessor):498:500 -> a
-    350:352:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):253 -> a
-    353:353:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):79:79 -> a
-    353:353:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.ensureInstanceFieldMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.MethodProcessor):500 -> a
-    353:353:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):253 -> a
-    354:354:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.ensureInstanceFieldMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.MethodProcessor):500:500 -> a
-    354:354:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):253 -> a
-    355:355:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):256:256 -> a
-    356:372:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):255:271 -> a
-    373:386:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.code.ArrayAccess):544:557 -> a
-    373:386:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):272 -> a
-    387:394:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):274:281 -> a
-    395:402:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):516:523 -> a
-    395:402:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):281 -> a
-    403:403:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):521:521 -> a
-    403:403:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):281 -> a
-    404:404:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):284:284 -> a
-    405:405:boolean com.android.tools.r8.ir.code.Instruction.isNewUnboxedEnumInstance():0:0 -> a
-    405:405:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):284 -> a
-    406:407:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):285:286 -> a
-    408:408:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.NewUnboxedEnumInstance.getType():59:59 -> a
-    408:408:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):286 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    409:412:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):286:289 -> a
-    413:413:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1150:1150 -> a
-    413:413:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):288 -> a
-    414:420:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):287:293 -> a
-    421:421:void rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):433:433 -> a
-    422:422:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():83:83 -> a
-    422:422:void rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):434 -> a
-    423:423:void rewriteNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):434:434 -> a
-    424:430:void replaceEnumInvoke(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):505:511 -> a
-    431:433:void replaceEnumInvoke(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):510:512 -> a
-    434:435:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):528:529 -> a
-    436:436:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    436:436:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):529 -> a
-    437:437:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):530:530 -> a
-    438:442:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):536:540 -> a
-    438:442:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):532 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.Li:
+    308:308:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):467 -> a
+    308:308:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    309:320:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor):467:478 -> a
+    309:320:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):243 -> a
+    321:321:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    321:321:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):252 -> a
+    322:338:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):253:269 -> a
+    339:345:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):268:274 -> a
+    346:346:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
+    346:346:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):274 -> a
+    347:347:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():84:84 -> a
+    347:347:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):275 -> a
+    348:348:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):275:275 -> a
+    349:349:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):307:307 -> a
+    349:349:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):275 -> a
+    350:352:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):275:277 -> a
+    353:353:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
+    353:353:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):277 -> a
+    354:358:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):277:281 -> a
+    359:359:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.removeRedundantValuesArrayCloning(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,java.util.Set):490:490 -> a
+    359:359:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):287 -> a
+    360:360:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    360:360:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.removeRedundantValuesArrayCloning(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,java.util.Set):490 -> a
+    360:360:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):287 -> a
+    361:372:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.removeRedundantValuesArrayCloning(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,java.util.Set):490:501 -> a
+    361:372:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):287 -> a
+    373:373:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.removeRedundantValuesArrayCloning(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,java.util.Set):499:499 -> a
+    373:373:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):287 -> a
+    374:377:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):288:291 -> a
+    378:378:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1174:1174 -> a
+    378:378:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):291 -> a
+    379:380:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):292:293 -> a
+    381:381:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    381:381:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):299 -> a
+    382:386:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):300:304 -> a
+    387:389:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.ensureInstanceFieldMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.MethodProcessor):546:548 -> a
+    387:389:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):304 -> a
+    390:390:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getSharedUtilityClass():84:84 -> a
+    390:390:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.ensureInstanceFieldMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.MethodProcessor):549 -> a
+    390:390:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):304 -> a
+    391:393:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.ensureInstanceFieldMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.MethodProcessor):549:551 -> a
+    391:393:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):304 -> a
+    394:394:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getLocalUtilityClass(com.android.tools.r8.graph.DexType):80:80 -> a
+    394:394:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.ensureInstanceFieldMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.MethodProcessor):551 -> a
+    394:394:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):304 -> a
+    395:395:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.ensureInstanceFieldMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.MethodProcessor):551:551 -> a
+    395:395:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):304 -> a
+    396:396:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):307:307 -> a
+    397:413:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):306:322 -> a
+    414:427:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.code.ArrayAccess,java.util.Map):599:612 -> a
+    414:427:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):323 -> a
+    428:435:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):325:332 -> a
+    436:443:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):567:574 -> a
+    436:443:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):332 -> a
+    444:444:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):572:572 -> a
+    444:444:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):332 -> a
+    445:445:boolean com.android.tools.r8.ir.code.Instruction.isNewUnboxedEnumInstance():0:0 -> a
+    445:445:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):335 -> a
+    446:447:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):336:337 -> a
+    448:448:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.NewUnboxedEnumInstance.getType():59:59 -> a
+    448:448:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):337 -> a
+    449:452:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):337:340 -> a
+    453:453:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1174:1174 -> a
+    453:453:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):339 -> a
+    454:460:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.RewrittenPrototypeDescription):338:344 -> a
+    461:467:void replaceEnumInvoke(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):556:562 -> a
+    468:470:void replaceEnumInvoke(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):561:563 -> a
+    471:472:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):579:580 -> a
+    473:473:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
+    473:473:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):580 -> a
+    474:474:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):580:580 -> a
+    475:475:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
+    475:475:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):580 -> a
+    476:479:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):587:590 -> a
+    476:479:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):583 -> a
+    480:480:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.graph.DexType):594:594 -> a
+    480:480:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):590 -> a
+    480:480:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):583 -> a
+    481:481:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):581:581 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.wi:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap enumDataMap -> e
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -67011,206 +66679,200 @@
     1:1:void <clinit>():73:73 -> <clinit>
     1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses):88:97 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple com.android.tools.r8.ir.optimize.info.OptimizationFeedback.getSimple():44:44 -> a
-    1:1:void lambda$duplicateCheckNotNullMethods$5(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):211 -> a
-    2:2:void lambda$duplicateCheckNotNullMethods$5(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):210:210 -> a
+    1:1:void lambda$duplicateCheckNotNullMethods$5(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):217 -> a
+    2:2:void lambda$duplicateCheckNotNullMethods$5(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):216:216 -> a
     3:3:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):129:129 -> a
-    4:67:com.android.tools.r8.com.google.common.collect.BiMap duplicateCheckNotNullMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):145:208 -> a
-    68:68:boolean lambda$duplicateCheckNotNullMethods$1(com.android.tools.r8.graph.ProgramMethod,java.util.Set):153:153 -> a
+    4:67:com.android.tools.r8.com.google.common.collect.BiMap duplicateCheckNotNullMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):151:214 -> a
+    68:68:boolean lambda$duplicateCheckNotNullMethods$1(com.android.tools.r8.graph.ProgramMethod,java.util.Set):159:159 -> a
     69:70:boolean com.android.tools.r8.utils.SetUtils.containsAnyOf(java.util.Set,java.lang.Iterable):19:20 -> a
-    69:70:boolean lambda$duplicateCheckNotNullMethods$1(com.android.tools.r8.graph.ProgramMethod,java.util.Set):153 -> a
-    71:78:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):161:168 -> a
+    69:70:boolean lambda$duplicateCheckNotNullMethods$1(com.android.tools.r8.graph.ProgramMethod,java.util.Set):159 -> a
+    71:78:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):167:174 -> a
     79:79:com.android.tools.r8.graph.DexType[] com.android.tools.r8.graph.DexTypeList.getBacking():63:63 -> a
-    79:79:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):168 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    80:80:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):169:169 -> a
+    79:79:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):174 -> a
+    80:80:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):175:175 -> a
     81:82:java.lang.Object[] com.android.tools.r8.utils.ImmutableArrayUtils.set(java.lang.Object[],int,java.lang.Object):10:11 -> a
-    81:82:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):167 -> a
-    83:83:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):167:167 -> a
-    84:99:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):165:180 -> a
-    100:125:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):174:199 -> a
-    126:129:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):198:201 -> a
-    130:133:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):184:187 -> a
-    134:134:com.android.tools.r8.cf.CfVersion com.android.tools.r8.graph.DexEncodedMethod.getClassFileVersionOrElse(com.android.tools.r8.cf.CfVersion):811:811 -> a
-    134:134:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):188 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    135:145:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):185:195 -> a
-    146:151:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):192:197 -> a
-    152:152:com.android.tools.r8.graph.Code lambda$duplicateCheckNotNullMethods$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):191:191 -> a
-    153:153:void lambda$fixupEnumClassInitializers$6(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):227:227 -> a
-    154:162:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):233:241 -> a
-    163:163:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses.getLocalUtilityClass(com.android.tools.r8.graph.DexProgramClass):46:46 -> a
-    163:163:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):241 -> a
-    164:186:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):244:266 -> a
-    187:187:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    187:187:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):266 -> a
-    188:194:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):270:276 -> a
-    195:195:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    195:195:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):276 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    196:206:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):276:286 -> a
-    207:207:com.android.tools.r8.ir.code.ConstClass$Builder com.android.tools.r8.ir.code.ConstClass.builder():42:42 -> a
-    207:207:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):288 -> a
-    208:210:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):289:291 -> a
-    211:211:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):426:426 -> a
-    211:211:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):291 -> a
-    212:212:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1646:1646 -> a
-    212:212:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):290 -> a
-    213:221:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):290:298 -> a
-    222:227:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):297:302 -> a
-    228:228:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":674,"2":675,"3":676}}
-    674:674:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):302:302 -> a
-    675:675:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    675:675:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):302 -> a
-    676:676:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    676:676:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):302 -> a
-    531:533:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):303:305 -> a
-    534:534:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> a
-    534:534:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):305 -> a
-    535:543:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):306:314 -> a
-    544:544:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405:405 -> a
-    544:544:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):314 -> a
-    545:545:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    545:545:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405 -> a
-    545:545:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):314 -> a
-    546:555:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):315:324 -> a
-    556:556:com.android.tools.r8.ir.code.InvokeDirect$Builder com.android.tools.r8.ir.code.InvokeDirect.builder():50:50 -> a
-    556:556:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):329 -> a
-    557:593:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):330:366 -> a
-    594:603:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):363:372 -> a
-    604:604:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    604:604:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):372 -> a
-    605:619:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):372:386 -> a
-    620:620:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):385:385 -> a
-    621:621:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):384:384 -> a
-    622:632:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):380:390 -> a
-    633:633:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
-    633:633:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):390 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    634:642:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):391:399 -> a
-    643:644:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):556:557 -> a
-    643:644:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):399 -> a
-    645:645:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119:119 -> a
-    645:645:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):557 -> a
-    645:645:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):399 -> a
-    646:646:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):123:123 -> a
-    646:646:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119 -> a
-    646:646:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):557 -> a
-    646:646:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):399 -> a
-    647:647:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127:127 -> a
-    647:647:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):557 -> a
-    647:647:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):399 -> a
-    648:648:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> a
-    648:648:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127 -> a
-    648:648:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):557 -> a
-    648:648:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):399 -> a
-    649:649:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):558:558 -> a
-    649:649:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):399 -> a
-    650:656:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):400:406 -> a
-    657:657:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
-    657:657:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):407 -> a
-    658:663:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):408:413 -> a
-    664:664:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    81:82:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):173 -> a
+    83:83:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):173:173 -> a
+    84:99:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):171:186 -> a
+    100:125:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):180:205 -> a
+    126:129:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):204:207 -> a
+    130:134:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):190:194 -> a
+    135:135:com.android.tools.r8.cf.CfVersion com.android.tools.r8.graph.DexEncodedMethod.getClassFileVersionOrElse(com.android.tools.r8.cf.CfVersion):811:811 -> a
+    135:135:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):194 -> a
+    136:146:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):191:201 -> a
+    147:152:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):198:203 -> a
+    153:153:com.android.tools.r8.graph.Code lambda$duplicateCheckNotNullMethods$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):197:197 -> a
+    154:154:void lambda$fixupEnumClassInitializers$6(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):233:233 -> a
+    155:163:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):239:247 -> a
+    164:164:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses.getLocalUtilityClass(com.android.tools.r8.graph.DexProgramClass):46:46 -> a
+    164:164:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):247 -> a
+    165:187:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):250:272 -> a
+    188:188:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    188:188:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):272 -> a
+    189:195:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):276:282 -> a
+    196:196:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    196:196:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):282 -> a
+    197:207:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):282:292 -> a
+    208:208:com.android.tools.r8.ir.code.ConstClass$Builder com.android.tools.r8.ir.code.ConstClass.builder():42:42 -> a
+    208:208:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):294 -> a
+    209:211:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):295:297 -> a
+    212:212:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):436:436 -> a
+    212:212:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):297 -> a
+    213:213:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
+    213:213:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):296 -> a
+    214:222:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):296:304 -> a
+    223:228:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):303:308 -> a
+    229:229:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":681,"2":682,"3":683}}
+    681:681:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):308:308 -> a
+    682:682:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    682:682:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):308 -> a
+    683:683:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    683:683:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):308 -> a
+    538:540:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):309:311 -> a
+    541:541:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> a
+    541:541:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):311 -> a
+    542:550:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):312:320 -> a
+    551:551:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409:409 -> a
+    551:551:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):320 -> a
+    552:552:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    552:552:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409 -> a
+    552:552:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):320 -> a
+    553:562:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):321:330 -> a
+    563:563:com.android.tools.r8.ir.code.InvokeDirect$Builder com.android.tools.r8.ir.code.InvokeDirect.builder():50:50 -> a
+    563:563:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):335 -> a
+    564:600:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):336:372 -> a
+    601:610:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):369:378 -> a
+    611:611:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    611:611:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):378 -> a
+    612:626:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):378:392 -> a
+    627:627:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):391:391 -> a
+    628:628:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):390:390 -> a
+    629:639:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):386:396 -> a
+    640:640:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
+    640:640:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):396 -> a
+    641:649:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):397:405 -> a
+    650:651:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):562:563 -> a
+    650:651:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):405 -> a
+    652:652:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119:119 -> a
+    652:652:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):563 -> a
+    652:652:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):405 -> a
+    653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):123:123 -> a
+    653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119 -> a
+    653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):563 -> a
+    653:653:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):405 -> a
+    654:654:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127:127 -> a
+    654:654:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):563 -> a
+    654:654:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):405 -> a
+    655:655:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> a
+    655:655:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127 -> a
+    655:655:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):563 -> a
+    655:655:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):405 -> a
+    656:656:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):564:564 -> a
+    656:656:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):405 -> a
+    657:663:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):406:412 -> a
+    664:664:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     664:664:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):413 -> a
-    665:665:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():23:23 -> a
-    665:665:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):414 -> a
-    666:672:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):416:422 -> a
-    673:673:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):421:421 -> a
-    677:682:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):429:434 -> a
-    683:683:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
-    683:683:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):434 -> a
-    684:684:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):449:449 -> a
-    685:685:boolean lambda$createLocalUtilityFields$7(java.util.Map,com.android.tools.r8.graph.DexField):445:445 -> a
-    686:689:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):457:460 -> a
-    690:690:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    690:690:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):461 -> a
-    691:691:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):461:461 -> a
-    692:704:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):458:470 -> a
-    705:706:void lambda$createLocalUtilityField$10(com.android.tools.r8.graph.DexEncodedField$Builder):475:476 -> a
-    707:708:void lambda$createLocalUtilityField$9(com.android.tools.r8.graph.FieldAccessFlags):478:479 -> a
-    709:709:void lambda$createLocalUtilityMethods$11(java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):493:493 -> a
-    710:719:void lambda$createLocalUtilityMethods$13(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramMethod):497:506 -> a
-    720:720:boolean lambda$createLocalUtilityMethods$12(java.util.Map,com.android.tools.r8.graph.DexMethod):504:504 -> a
-    721:727:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):516:522 -> a
-    728:728:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2383:2383 -> a
-    728:728:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):522 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    729:729:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):523:523 -> a
-    730:730:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":758,"2":759,"3":760}}
-    758:758:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):523:523 -> a
-    759:759:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):523:523 -> a
-    760:760:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):523:523 -> a
-    731:731:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    731:731:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):524 -> a
-    732:736:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):524:528 -> a
-    737:738:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):641:642 -> a
-    737:738:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):525 -> a
-    739:741:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):659:661 -> a
-    739:741:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):642 -> a
-    739:741:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):525 -> a
-    742:742:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):643:643 -> a
-    742:742:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):525 -> a
-    743:743:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):529:529 -> a
-    744:754:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):523:533 -> a
-    755:755:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean):133:133 -> a
-    755:755:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):533 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    756:757:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):536:537 -> a
-    761:772:void lambda$createLocalUtilityMethod$15(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):541:552 -> a
-    773:777:void lambda$createLocalUtilityMethod$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodAccessFlags):544:548 -> a
-    778:779:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):556:557 -> a
-    778:779:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):436 -> a
-    780:780:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119:119 -> a
-    780:780:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):557 -> a
-    780:780:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):436 -> a
-    781:781:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):123:123 -> a
-    781:781:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119 -> a
-    781:781:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):557 -> a
-    781:781:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):436 -> a
-    782:782:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127:127 -> a
-    782:782:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):557 -> a
-    782:782:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):436 -> a
-    783:783:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> a
-    783:783:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127 -> a
-    783:783:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):557 -> a
-    783:783:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):436 -> a
-    784:784:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):558:558 -> a
-    784:784:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):436 -> a
-    785:795:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):437:447 -> a
-    796:796:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):562:562 -> a
-    797:798:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):641:642 -> a
-    797:798:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    799:801:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):659:661 -> a
-    799:801:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):642 -> a
-    799:801:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    802:802:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):643:643 -> a
-    802:802:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    803:818:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):564:579 -> a
-    819:821:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):578:580 -> a
-    822:824:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):583:585 -> a
-    825:825:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.RewrittenPrototypeDescription.createMethodOptimizationInfoFixer():705:705 -> a
-    825:825:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):585 -> a
-    826:830:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):584:588 -> a
-    831:831:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1453:1453 -> a
-    831:831:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):587 -> a
-    832:838:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):592:598 -> a
-    839:849:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):596:606 -> a
-    850:850:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):318:318 -> a
-    850:850:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):604 -> a
-    851:851:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):322:322 -> a
-    851:851:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):318 -> a
-    851:851:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):604 -> a
-    852:852:boolean lambda$ensureUniqueMethod$17(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):599:599 -> a
-    853:858:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):616:621 -> a
-    859:859:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):213:213 -> a
-    859:859:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):621 -> a
-    860:871:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):622:633 -> a
-    872:872:void lambda$fixupFields$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$Builder):629:629 -> a
-    873:873:void lambda$fixupFields$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$Builder):628:628 -> a
-    874:882:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):647:655 -> a
-    1:6:void fixupEnumClassInitializers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):220:225 -> b
-    7:29:java.util.Collection createLocalUtilityMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):487:509 -> b
+    665:670:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):414:419 -> a
+    671:671:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    671:671:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):419 -> a
+    672:672:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():24:24 -> a
+    672:672:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):420 -> a
+    673:679:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):422:428 -> a
+    680:680:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):427:427 -> a
+    684:689:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):435:440 -> a
+    690:690:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
+    690:690:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):440 -> a
+    691:691:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):455:455 -> a
+    692:692:boolean lambda$createLocalUtilityFields$7(java.util.Map,com.android.tools.r8.graph.DexField):451:451 -> a
+    693:696:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):463:466 -> a
+    697:697:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
+    697:697:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):467 -> a
+    698:698:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):467:467 -> a
+    699:711:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):464:476 -> a
+    712:713:void lambda$createLocalUtilityField$10(com.android.tools.r8.graph.DexEncodedField$Builder):481:482 -> a
+    714:715:void lambda$createLocalUtilityField$9(com.android.tools.r8.graph.FieldAccessFlags):484:485 -> a
+    716:716:void lambda$createLocalUtilityMethods$11(java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):499:499 -> a
+    717:726:void lambda$createLocalUtilityMethods$13(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramMethod):503:512 -> a
+    727:727:boolean lambda$createLocalUtilityMethods$12(java.util.Map,com.android.tools.r8.graph.DexMethod):510:510 -> a
+    728:734:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):522:528 -> a
+    735:735:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2383:2383 -> a
+    735:735:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):528 -> a
+    736:736:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):529:529 -> a
+    737:737:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":765,"2":766,"3":767}}
+    765:765:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):529:529 -> a
+    766:766:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):529:529 -> a
+    767:767:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):529:529 -> a
+    738:738:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
+    738:738:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):530 -> a
+    739:743:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):530:534 -> a
+    744:745:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):647:648 -> a
+    744:745:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):531 -> a
+    746:748:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):665:667 -> a
+    746:748:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):648 -> a
+    746:748:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):531 -> a
+    749:749:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):649:649 -> a
+    749:749:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):531 -> a
+    750:750:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):535:535 -> a
+    751:761:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):529:539 -> a
+    762:762:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean):150:150 -> a
+    762:762:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):539 -> a
+    763:764:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):542:543 -> a
+    768:779:void lambda$createLocalUtilityMethod$15(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):547:558 -> a
+    780:784:void lambda$createLocalUtilityMethod$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodAccessFlags):550:554 -> a
+    785:786:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):562:563 -> a
+    785:786:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):442 -> a
+    787:787:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119:119 -> a
+    787:787:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):563 -> a
+    787:787:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):442 -> a
+    788:788:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):123:123 -> a
+    788:788:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119 -> a
+    788:788:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):563 -> a
+    788:788:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):442 -> a
+    789:789:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127:127 -> a
+    789:789:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):563 -> a
+    789:789:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):442 -> a
+    790:790:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> a
+    790:790:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127 -> a
+    790:790:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):563 -> a
+    790:790:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):442 -> a
+    791:791:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):564:564 -> a
+    791:791:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):442 -> a
+    792:802:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):443:453 -> a
+    803:803:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):568:568 -> a
+    804:805:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):647:648 -> a
+    804:805:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):569 -> a
+    806:808:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):665:667 -> a
+    806:808:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):648 -> a
+    806:808:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):569 -> a
+    809:809:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):649:649 -> a
+    809:809:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):569 -> a
+    810:825:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):570:585 -> a
+    826:828:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):584:586 -> a
+    829:831:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):589:591 -> a
+    832:832:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.RewrittenPrototypeDescription.createMethodOptimizationInfoFixer():677:677 -> a
+    832:832:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):591 -> a
+    833:837:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):590:594 -> a
+    838:838:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1453:1453 -> a
+    838:838:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):593 -> a
+    839:845:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):598:604 -> a
+    846:856:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):602:612 -> a
+    857:857:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):318:318 -> a
+    857:857:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):610 -> a
+    858:858:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):322:322 -> a
+    858:858:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):318 -> a
+    858:858:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):610 -> a
+    859:859:boolean lambda$ensureUniqueMethod$17(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):605:605 -> a
+    860:865:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):622:627 -> a
+    866:866:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):213:213 -> a
+    866:866:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):627 -> a
+    867:878:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):628:639 -> a
+    879:879:void lambda$fixupFields$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$Builder):635:635 -> a
+    880:880:void lambda$fixupFields$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$Builder):634:634 -> a
+    881:889:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):653:661 -> a
+    1:6:void fixupEnumClassInitializers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):226:231 -> b
+    7:29:java.util.Collection createLocalUtilityMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):493:515 -> b
     1:9:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):102:110 -> c
     10:10:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):28:28 -> c
     10:10:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):110 -> c
@@ -67220,22 +66882,22 @@
     14:26:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):115:127 -> c
     27:27:void com.android.tools.r8.graph.DexClass.setStaticFields(java.util.Collection):412:412 -> c
     27:27:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):127 -> c
-    28:39:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):129:140 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result -> com.android.tools.r8.internal.Ki:
+    28:45:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):129:146 -> c
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result -> com.android.tools.r8.internal.vi:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens lens -> b
     com.android.tools.r8.com.google.common.collect.BiMap checkNotNullToCheckNotZeroMapping -> a
     com.android.tools.r8.graph.PrunedItems prunedItems -> c
-    1:4:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.graph.PrunedItems):675:678 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap getCheckNotNullToCheckNotZeroMapping():682:682 -> a
-    1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens getLens():686:686 -> b
-    1:1:com.android.tools.r8.graph.PrunedItems getPrunedItems():690:690 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClass -> com.android.tools.r8.internal.Mi:
+    1:4:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.graph.PrunedItems):681:684 -> <init>
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap getCheckNotNullToCheckNotZeroMapping():688:688 -> a
+    1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens getLens():692:692 -> b
+    1:1:com.android.tools.r8.graph.PrunedItems getPrunedItems():696:696 -> c
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClass -> com.android.tools.r8.internal.xi:
     com.android.tools.r8.graph.DexProgramClass synthesizingContext -> a
     1:2:void <init>(com.android.tools.r8.graph.DexProgramClass):15:16 -> <init>
     void ensureMethods(com.android.tools.r8.graph.AppView) -> a
     com.android.tools.r8.graph.DexProgramClass getDefinition() -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizingContext():24:24 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses -> com.android.tools.r8.internal.Pi:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses -> com.android.tools.r8.internal.zi:
     com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass sharedUtilityClass -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap localUtilityClasses -> a
     boolean $assertionsDisabled -> c
@@ -67248,8 +66910,7 @@
     3:3:void forEach(java.util.function.Consumer):42:42 -> a
     4:5:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass getLocalUtilityClass(com.android.tools.r8.graph.DexType):50:51 -> a
     6:6:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass getSharedUtilityClass():56:56 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$1 -> com.android.tools.r8.internal.Ni:
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder -> com.android.tools.r8.internal.Oi:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder -> com.android.tools.r8.internal.yi:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder fieldAccessInfoCollectionModifierBuilder -> d
     com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass sharedUtilityClass -> c
@@ -67277,7 +66938,7 @@
     38:40:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):132:134 -> a
     41:41:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):133:133 -> a
     42:42:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):132:132 -> a
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.Si:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.Bi:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -67328,9 +66989,8 @@
     69:69:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):205 -> a
     70:71:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):308:309 -> a
     70:71:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):205 -> a
-    72:72:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1561:1561 -> a
+    72:72:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1583:1583 -> a
     72:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):309 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     72:72:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):205 -> a
     73:78:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):310:315 -> a
     73:78:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):205 -> a
@@ -67366,14 +67026,18 @@
     135:135:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
     135:135:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
     135:135:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):257 -> a
-    136:166:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):258:288 -> a
-    167:167:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    167:167:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):288 -> a
-    168:168:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):288:288 -> a
-    169:170:boolean lambda$removeSwitchMaps$0(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.ir.code.IntSwitch,int):230:231 -> a
-    171:171:void lambda$removeSwitchMaps$1(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):274:274 -> a
+    136:143:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):258:265 -> a
+    144:144:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):335:335 -> a
+    144:144:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):331 -> a
+    144:144:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):268 -> a
+    145:161:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):272:288 -> a
+    162:162:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    162:162:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):288 -> a
+    163:163:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):288:288 -> a
+    164:165:boolean lambda$removeSwitchMaps$0(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.ir.code.IntSwitch,int):230:231 -> a
+    166:166:void lambda$removeSwitchMaps$1(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):274:274 -> a
     1:7:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):62:68 -> b
-    8:8:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> b
+    8:8:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> b
     8:8:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):69 -> b
     9:40:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):70:101 -> b
     41:41:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> b
@@ -67401,7 +67065,7 @@
     70:70:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.getOrdinalValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):343:343 -> b
     70:70:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):112 -> b
     71:72:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):114:115 -> b
-    73:73:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
+    73:73:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> b
     73:73:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):114 -> b
     74:74:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):121:121 -> b
     75:75:com.android.tools.r8.ir.analysis.value.SingleStringValue com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.getNameValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):334:334 -> b
@@ -67426,21 +67090,19 @@
     91:91:com.android.tools.r8.ir.analysis.value.SingleStringValue com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.getNameValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):336:336 -> b
     91:91:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):121 -> b
     92:94:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):127:129 -> b
-    95:95:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
+    95:95:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> b
     95:95:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):129 -> b
-    96:102:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):130:136 -> b
-    103:103:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> b
-    103:103:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):137 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    104:122:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):142:160 -> b
-    123:123:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
-    123:123:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):160 -> b
-    124:128:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):161:165 -> b
-    129:129:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
-    129:129:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):165 -> b
-    130:132:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):165:167 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.internal.Qi:
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.Ri:
+    96:103:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):130:137 -> b
+    104:104:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> b
+    104:104:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):137 -> b
+    105:123:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):142:160 -> b
+    124:124:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> b
+    124:124:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):160 -> b
+    125:129:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):161:165 -> b
+    130:130:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
+    130:130:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):165 -> b
+    131:133:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):165:167 -> b
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.Ai:
     com.android.tools.r8.ir.code.Instruction ordinalInvoke -> b
     com.android.tools.r8.ir.code.Instruction arrayGet -> c
     com.android.tools.r8.ir.code.Instruction staticGet -> d
@@ -67448,7 +67110,7 @@
     com.android.tools.r8.graph.DexType enumClass -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1):362:362 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):375:380 -> <init>
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.android.tools.r8.internal.LC:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.android.tools.r8.internal.TB:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData data -> c
     com.android.tools.r8.graph.DexProgramClass localUtilityClass -> b
     boolean $assertionsDisabled -> d
@@ -67483,9 +67145,9 @@
     115:118:com.android.tools.r8.graph.Code lambda$ensureValueOfMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):110:113 -> a
     119:126:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):122:129 -> a
     127:127:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):123:123 -> a
-    128:128:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):553:553 -> a
+    128:128:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):582:582 -> a
     128:128:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):123 -> a
-    129:129:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):545:545 -> a
+    129:129:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):574:574 -> a
     129:129:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):123 -> a
     130:134:void lambda$internalEnsureMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator,com.android.tools.r8.synthesis.SyntheticMethodBuilder):132:136 -> a
     135:135:com.android.tools.r8.graph.DexProgramClass getDefinition():141:141 -> a
@@ -67494,8 +67156,7 @@
     1:5:com.android.tools.r8.graph.ProgramMethod ensureValueOfMethod(com.android.tools.r8.graph.AppView):101:105 -> c
     6:6:com.android.tools.r8.graph.ProgramMethod ensureValueOfMethod(com.android.tools.r8.graph.AppView):102:102 -> c
     7:7:com.android.tools.r8.graph.DexType getType():145:145 -> c
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$1 -> com.android.tools.r8.internal.JC:
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.KC:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.SB:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData data -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProgramClass enumToUnbox -> c
@@ -67507,7 +67168,7 @@
     1:2:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass build():168:169 -> a
     3:3:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):180:180 -> a
     1:9:com.android.tools.r8.graph.DexProgramClass createClass():173:181 -> b
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass -> com.android.tools.r8.internal.uV:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass -> com.android.tools.r8.internal.KT:
     com.android.tools.r8.graph.DexProgramClass sharedUtilityClass -> b
     com.android.tools.r8.graph.ProgramMethod valuesMethod -> c
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):56:58 -> <init>
@@ -67515,9 +67176,9 @@
     6:6:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):85:85 -> a
     7:14:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):138:145 -> a
     15:15:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):139:139 -> a
-    16:16:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):553:553 -> a
+    16:16:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):582:582 -> a
     16:16:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):139 -> a
-    17:17:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):545:545 -> a
+    17:17:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):574:574 -> a
     17:17:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):139 -> a
     18:22:void lambda$internalEnsureMethod$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator,com.android.tools.r8.synthesis.SyntheticMethodBuilder):148:152 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass getDefinition():157:157 -> a
@@ -67537,8 +67198,7 @@
     7:7:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):125:125 -> e
     1:5:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):120:124 -> f
     6:6:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):121:121 -> f
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$1 -> com.android.tools.r8.internal.sV:
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.tV:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.JT:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder fieldAccessInfoCollectionModifierBuilder -> d
@@ -67560,43 +67220,42 @@
     8:8:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):210 -> a
     9:14:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesField(com.android.tools.r8.graph.DexType):231:236 -> a
     9:14:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):210 -> a
-    15:15:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):244:244 -> a
-    15:15:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
-    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2383:2383 -> a
-    16:16:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):245 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):245:245 -> a
+    15:16:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):244:245 -> a
+    15:16:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2383:2383 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):245 -> a
     17:17:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
-    18:18:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):246 -> a
+    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):245:245 -> a
     18:18:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
-    19:19:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):246:246 -> a
+    19:19:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
+    19:19:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):246 -> a
     19:19:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
-    20:37:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializerCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):256:273 -> a
-    20:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):247 -> a
-    20:37:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
-    38:42:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):247:251 -> a
-    38:42:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
-    43:47:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):279:283 -> a
-    43:47:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
-    48:48:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):281:281 -> a
-    48:48:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
-    49:55:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):280:286 -> a
-    49:55:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
-    56:66:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):302:312 -> a
-    56:66:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):287 -> a
-    56:66:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
-    67:67:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):306:306 -> a
-    67:67:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):287 -> a
-    67:67:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
-    68:73:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):287:292 -> a
-    68:73:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
-    74:74:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):213:213 -> a
-    75:80:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):212:217 -> a
-    81:84:com.android.tools.r8.graph.DexProgramClass findDeterministicContextType(java.util.Set):326:329 -> a
+    20:20:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):246:246 -> a
+    20:20:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    21:38:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializerCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):256:273 -> a
+    21:38:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):247 -> a
+    21:38:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    39:43:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):247:251 -> a
+    39:43:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    44:48:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):279:283 -> a
+    44:48:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):281:281 -> a
+    49:49:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    50:56:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):280:286 -> a
+    50:56:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    57:67:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):302:312 -> a
+    57:67:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):287 -> a
+    57:67:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    68:68:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):306:306 -> a
+    68:68:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):287 -> a
+    68:68:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    69:74:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):287:292 -> a
+    69:74:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    75:75:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):213:213 -> a
+    76:81:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):212:217 -> a
+    82:85:com.android.tools.r8.graph.DexProgramClass findDeterministicContextType(java.util.Set):326:329 -> a
     1:19:com.android.tools.r8.graph.DexProgramClass createClass():201:219 -> b
-com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification -> com.android.tools.r8.internal.D9:
+com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification -> com.android.tools.r8.internal.t9:
     int argumentIndex -> a
     1:2:void <init>(int):16:17 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification asCheckNotNullClassification() -> a
@@ -67611,12 +67270,12 @@
     7:7:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):48 -> a
     8:10:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):51:53 -> a
     1:1:int getArgumentIndex():21:21 -> c
-com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification -> com.android.tools.r8.internal.yi:
+com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification -> com.android.tools.r8.internal.ji:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification asCheckNotNullClassification() -> a
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
     1:1:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification unknown():12:12 -> b
-com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis -> com.android.tools.r8.internal.zi:
+com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis -> com.android.tools.r8.internal.ki:
     1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):38:38 -> a
     2:2:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():12:12 -> a
     2:2:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):40 -> a
@@ -67638,17 +67297,17 @@
     70:70:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):75 -> a
     71:71:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():12:12 -> a
     71:71:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):45 -> a
-com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification -> com.android.tools.r8.internal.D10:
+com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification -> com.android.tools.r8.internal.TZ:
     com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
     1:1:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification getInstance():17:17 -> c
-com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tools.r8.internal.E9:
+com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tools.r8.internal.u9:
     com.android.tools.r8.graph.ProgramMethod checkNotNullMethod -> d
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):39:40 -> <init>
     1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):46:47 -> a
-    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     3:3:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):47 -> a
     4:7:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):53:56 -> a
     8:8:void com.android.tools.r8.utils.IteratorUtils.skip(com.android.tools.r8.ir.code.InstructionIterator,int):160:160 -> a
@@ -67657,10 +67316,10 @@
     12:12:com.android.tools.r8.ir.code.Argument$Builder com.android.tools.r8.ir.code.Argument.builder():36:36 -> a
     12:12:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):61 -> a
     13:13:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):62:62 -> a
-    14:14:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1646:1646 -> a
+    14:14:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
     14:14:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):62 -> a
     15:17:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):62:64 -> a
-    18:18:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    18:18:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     18:18:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):60 -> a
     19:21:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):67:69 -> a
     22:22:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
@@ -67668,19 +67327,18 @@
     23:25:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):70:72 -> a
     26:26:boolean com.android.tools.r8.ir.code.Return.hasReturnValue():55:55 -> a
     26:26:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):72 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     27:27:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):73:73 -> a
-    28:28:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    28:28:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     28:28:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):73 -> a
     29:30:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):78:79 -> a
-    31:31:java.util.LinkedList com.android.tools.r8.ir.code.IRCode.getBlocks():1314:1314 -> a
+    31:31:java.util.LinkedList com.android.tools.r8.ir.code.IRCode.getBlocks():1350:1350 -> a
     31:31:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):81 -> a
     32:36:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):81:85 -> a
     37:37:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):110:110 -> a
     38:38:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):115:115 -> a
     39:39:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):125:125 -> a
-    1:1:boolean computeEquals(java.lang.Object):90:90 -> g
     1:1:int computeHashCode():95:95 -> g0
+    1:1:boolean computeEquals(java.lang.Object):90:90 -> h
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():100:100 -> k0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":122,"2":123,"3":124}}
@@ -67688,7 +67346,7 @@
     123:123:java.lang.String toString():120:120 -> toString
     124:124:java.lang.String toString():120:120 -> toString
     121:121:java.lang.String toString():120:120 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.CQ:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.mP:
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_ON_ARRAY -> p
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_CUSTOM -> o
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_FIELD_PUT -> r
@@ -67714,7 +67372,7 @@
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason OTHER_UNSUPPORTED_INSTRUCTION -> w
     1:28:void <clinit>():12:39 -> <clinit>
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$IllegalInvokeWithImpreciseParameterTypeReason -> com.android.tools.r8.internal.zQ:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$IllegalInvokeWithImpreciseParameterTypeReason -> com.android.tools.r8.internal.jP:
     com.android.tools.r8.graph.DexMethod invokedMethod -> x
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):70:71 -> <init>
     1:1:java.lang.String toString():0:0 -> toString
@@ -67723,11 +67381,11 @@
     84:84:java.lang.String toString():81:81 -> toString
     85:85:java.lang.String toString():81:81 -> toString
     82:82:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.AQ:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.kP:
     java.lang.String message -> x
     1:2:void <init>(java.lang.String):51:52 -> <init>
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.BQ:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.lP:
     com.android.tools.r8.graph.DexMethod invokedMethod -> x
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):207:208 -> <init>
     1:1:java.lang.String toString():0:0 -> toString
@@ -67736,13 +67394,13 @@
     221:221:java.lang.String toString():218:218 -> toString
     222:222:java.lang.String toString():218:218 -> toString
     219:219:java.lang.String toString():218:218 -> toString
-com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.internal.t6:
+com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.internal.p6:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo asConcreteCallSiteOptimizationInfo() -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractArgumentValue(int):32:32 -> a
     1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo top():14:14 -> b
     2:2:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType(int):27:27 -> b
-com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.Xc:
+com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.zc:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap constants -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap dynamicTypes -> b
     int size -> a
@@ -67781,7 +67439,6 @@
     60:70:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):139:149 -> a
     71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):200:200 -> a
     71:71:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):149 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     72:72:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):150:150 -> a
     73:73:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60:60 -> a
     73:73:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):151 -> a
@@ -67801,7 +67458,7 @@
     1:5:boolean equals(java.lang.Object):192:196 -> equals
     1:1:int hashCode():201:201 -> hashCode
     1:2:java.lang.String toString():206:207 -> toString
-com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.Ve:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.ze:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -67814,49 +67471,48 @@
     boolean isDead() -> i
     boolean valueHasBeenPropagated() -> j
     1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():18:18 -> k
-com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.cf:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.Ge:
     com.android.tools.r8.ir.analysis.value.AbstractValue UNKNOWN_ABSTRACT_RETURN_VALUE -> e
     java.util.Set UNKNOWN_INITIALIZED_CLASSES_ON_NORMAL_EXIT -> c
     com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo DEFAULT_INSTANCE -> b
     boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> f
     int UNKNOWN_RETURNED_ARGUMENT -> d
     boolean $assertionsDisabled -> g
-    1:13:void <clinit>():25:37 -> <clinit>
-    1:1:void <init>():42:42 -> <init>
-    1:1:boolean mayHaveSideEffects():181:181 -> A
-    boolean neverReturnsNormally() -> B
-    boolean returnValueHasBeenPropagated() -> C
-    boolean returnValueOnlyDependsOnArguments() -> D
-    boolean returnsArgument() -> E
-    boolean triggersClassInitBeforeAnySideEffect() -> F
-    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo toMutableOptimizationInfo():201:201 -> G
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):90:90 -> a
-    2:2:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):186:186 -> a
-    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo.toMutableOptimizationInfo():201:201 -> b
+    1:12:void <clinit>():25:36 -> <clinit>
+    1:1:void <init>():41:41 -> <init>
+    boolean neverReturnsNormally() -> A
+    boolean returnValueHasBeenPropagated() -> B
+    boolean returnValueOnlyDependsOnArguments() -> C
+    boolean returnsArgument() -> D
+    boolean triggersClassInitBeforeAnySideEffect() -> E
+    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo toMutableOptimizationInfo():195:195 -> F
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):89:89 -> a
+    2:2:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):180:180 -> a
+    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo.toMutableOptimizationInfo():195:195 -> b
     1:1:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo():25 -> b
     boolean cannotBeKept() -> e
-    boolean checksNullReceiverBeforeAnySideEffect() -> f
-    boolean classInitializerMayBePostponed() -> g
-    boolean forceInline() -> h
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():136:136 -> i
-    1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.top():14:14 -> j
-    1:1:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos():60 -> j
-    com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo() -> k
-    1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():65:65 -> l
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():85:85 -> m
-    1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():75:75 -> n
-    1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification():70:70 -> o
-    1:1:java.util.Set getInitializedClassesOnNormalExit():80:80 -> p
-    java.util.BitSet getNonNullParamOnNormalExits() -> q
-    java.util.BitSet getNonNullParamOrThrow() -> r
-    1:3:int getReturnedArgument():120:120 -> s
-    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():146:146 -> t
-    java.util.BitSet getUnusedArguments() -> u
-    boolean hasBeenInlinedIntoSingleCallSite() -> v
-    boolean isInitializerEnablingJavaVmAssertions() -> x
-    boolean isMultiCallerMethod() -> y
-    boolean isReachabilitySensitive() -> z
-com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.Vj:
+    boolean classInitializerMayBePostponed() -> f
+    boolean forceInline() -> g
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():135:135 -> h
+    1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.top():14:14 -> i
+    1:1:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos():59 -> i
+    com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo() -> j
+    1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():64:64 -> k
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():84:84 -> l
+    1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():74:74 -> m
+    1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification():69:69 -> n
+    1:1:java.util.Set getInitializedClassesOnNormalExit():79:79 -> o
+    java.util.BitSet getNonNullParamOnNormalExits() -> p
+    java.util.BitSet getNonNullParamOrThrow() -> q
+    1:3:int getReturnedArgument():119:119 -> r
+    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():145:145 -> s
+    java.util.BitSet getUnusedArguments() -> t
+    boolean hasBeenInlinedIntoSingleCallSite() -> u
+    boolean isInitializerEnablingJavaVmAssertions() -> w
+    boolean isMultiCallerMethod() -> x
+    boolean isReachabilitySensitive() -> y
+    1:1:boolean mayHaveSideEffects():175:175 -> z
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.Cj:
     1:1:void <init>():10:10 -> <init>
     boolean cannotBeKept() -> e
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue() -> f
@@ -67864,52 +67520,51 @@
     int getReadBits() -> h
     boolean isDead() -> i
     boolean valueHasBeenPropagated() -> j
-com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.RB:
+com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.bB:
     com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback INSTANCE -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:void recordLibraryFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue):23:23 -> a
     1:1:com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback getInstance():18:18 -> c
-com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo -> com.android.tools.r8.internal.fE:
+com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo -> com.android.tools.r8.internal.mD:
     com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo asMutableMethodOptimizationInfo() -> a
     com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo() -> b
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> c
     boolean isMutableOptimizationInfo() -> d
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.aF:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.cE:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():21:21 -> <init>
-    boolean mayHaveSideEffects() -> A
-    boolean neverReturnsNormally() -> B
-    boolean returnValueHasBeenPropagated() -> C
-    boolean returnValueOnlyDependsOnArguments() -> D
-    boolean returnsArgument() -> E
-    boolean triggersClassInitBeforeAnySideEffect() -> F
+    boolean neverReturnsNormally() -> A
+    boolean returnValueHasBeenPropagated() -> B
+    boolean returnValueOnlyDependsOnArguments() -> C
+    boolean returnsArgument() -> D
+    boolean triggersClassInitBeforeAnySideEffect() -> E
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect) -> a
     boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions) -> a
     boolean cannotBeKept() -> e
-    boolean checksNullReceiverBeforeAnySideEffect() -> f
-    boolean classInitializerMayBePostponed() -> g
-    boolean forceInline() -> h
-    com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue() -> i
-    com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos() -> j
-    com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo() -> k
-    com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint() -> l
-    com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo() -> m
-    com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType() -> n
-    com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification() -> o
-    java.util.Set getInitializedClassesOnNormalExit() -> p
-    java.util.BitSet getNonNullParamOnNormalExits() -> q
-    java.util.BitSet getNonNullParamOrThrow() -> r
-    int getReturnedArgument() -> s
-    com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint() -> t
-    java.util.BitSet getUnusedArguments() -> u
-    boolean hasBeenInlinedIntoSingleCallSite() -> v
-    1:2:boolean hasUnusedArguments():81:82 -> w
-    boolean isInitializerEnablingJavaVmAssertions() -> x
-    boolean isMultiCallerMethod() -> y
-    boolean isReachabilitySensitive() -> z
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.cF:
+    boolean classInitializerMayBePostponed() -> f
+    boolean forceInline() -> g
+    com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue() -> h
+    com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos() -> i
+    com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo() -> j
+    com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint() -> k
+    com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo() -> l
+    com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType() -> m
+    com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification() -> n
+    java.util.Set getInitializedClassesOnNormalExit() -> o
+    java.util.BitSet getNonNullParamOnNormalExits() -> p
+    java.util.BitSet getNonNullParamOrThrow() -> q
+    int getReturnedArgument() -> r
+    com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint() -> s
+    java.util.BitSet getUnusedArguments() -> t
+    boolean hasBeenInlinedIntoSingleCallSite() -> u
+    1:2:boolean hasUnusedArguments():81:82 -> v
+    boolean isInitializerEnablingJavaVmAssertions() -> w
+    boolean isMultiCallerMethod() -> x
+    boolean isReachabilitySensitive() -> y
+    boolean mayHaveSideEffects() -> z
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.eE:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization checkCastAndInstanceOfMethodSpecialization -> b
@@ -67936,352 +67591,349 @@
     50:53:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):541:544 -> a
     50:53:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):535 -> a
     50:53:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):146 -> a
-    54:60:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):543:549 -> a
-    54:60:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):535 -> a
-    54:60:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):146 -> a
-    61:61:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):548:548 -> a
-    61:61:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):535 -> a
-    61:61:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):146 -> a
-    62:62:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):536:536 -> a
-    62:62:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):146 -> a
-    63:63:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):148:148 -> a
-    64:68:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):806:810 -> a
-    64:68:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):149 -> a
-    69:69:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):819:819 -> a
-    69:69:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    70:74:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):829:833 -> a
-    70:74:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):820 -> a
-    70:74:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    75:76:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):845:846 -> a
-    75:76:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):833 -> a
-    75:76:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):820 -> a
-    75:76:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    77:77:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
-    77:77:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):846 -> a
-    77:77:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):833 -> a
-    77:77:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):820 -> a
+    54:54:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):543:543 -> a
+    54:54:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):535 -> a
+    54:54:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):146 -> a
+    55:55:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):536:536 -> a
+    55:55:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):146 -> a
+    56:56:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):148:148 -> a
+    57:61:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):801:805 -> a
+    57:61:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):149 -> a
+    62:62:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):814:814 -> a
+    62:62:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
+    63:67:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):824:828 -> a
+    63:67:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):815 -> a
+    63:67:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
+    68:69:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):840:841 -> a
+    68:69:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):828 -> a
+    68:69:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):815 -> a
+    68:69:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
+    70:70:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
+    70:70:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):841 -> a
+    70:70:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):828 -> a
+    70:70:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):815 -> a
+    70:70:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
+    71:72:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):842:843 -> a
+    71:72:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):828 -> a
+    71:72:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):815 -> a
+    71:72:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
+    73:73:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
+    73:73:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):844 -> a
+    73:73:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):828 -> a
+    73:73:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):815 -> a
+    73:73:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
+    74:76:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):844:846 -> a
+    74:76:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):828 -> a
+    74:76:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):815 -> a
+    74:76:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
+    77:77:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):845:845 -> a
+    77:77:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):828 -> a
+    77:77:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):815 -> a
     77:77:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    78:79:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):847:848 -> a
-    78:79:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):833 -> a
-    78:79:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):820 -> a
-    78:79:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    80:80:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
-    80:80:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):849 -> a
-    80:80:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):833 -> a
-    80:80:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):820 -> a
-    80:80:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    81:83:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):849:851 -> a
-    81:83:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):833 -> a
-    81:83:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):820 -> a
-    81:83:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    84:84:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):850:850 -> a
-    84:84:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):833 -> a
-    84:84:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):820 -> a
-    84:84:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    85:85:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isUnknownClassification():0:0 -> a
-    85:85:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):853 -> a
-    85:85:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):833 -> a
-    85:85:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):820 -> a
-    85:85:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    86:86:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):853:853 -> a
-    86:86:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):833 -> a
-    86:86:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):820 -> a
-    86:86:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    87:89:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):836:838 -> a
-    87:89:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):820 -> a
-    87:89:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    90:90:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):821:821 -> a
-    90:90:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
-    91:92:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):860:861 -> a
-    91:92:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    93:95:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):869:869 -> a
-    93:95:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):862 -> a
-    93:95:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    96:96:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):863:863 -> a
-    96:96:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    97:97:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):879:879 -> a
-    97:97:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    98:109:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):892:903 -> a
-    98:109:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):880 -> a
-    98:109:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    110:112:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):902:904 -> a
-    110:112:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):880 -> a
-    110:112:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    113:113:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.setDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):42:42 -> a
-    113:113:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):904 -> a
-    113:113:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):880 -> a
+    78:78:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isUnknownClassification():0:0 -> a
+    78:78:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):848 -> a
+    78:78:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):828 -> a
+    78:78:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):815 -> a
+    78:78:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
+    79:79:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.verifyEnumUnboxerMethodClassificationCorrect(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):848:848 -> a
+    79:79:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):828 -> a
+    79:79:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):815 -> a
+    79:79:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
+    80:82:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):831:833 -> a
+    80:82:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):815 -> a
+    80:82:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
+    83:83:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):816:816 -> a
+    83:83:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):151 -> a
+    84:85:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):855:856 -> a
+    84:85:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    86:88:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):864:864 -> a
+    86:88:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):857 -> a
+    86:88:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    89:89:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):858:858 -> a
+    89:89:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    90:90:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):874:874 -> a
+    90:90:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
+    91:102:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):887:898 -> a
+    91:102:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):875 -> a
+    91:102:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
+    103:105:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):897:899 -> a
+    103:105:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):875 -> a
+    103:105:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
+    106:106:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.setDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):42:42 -> a
+    106:106:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):899 -> a
+    106:106:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):875 -> a
+    106:106:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
+    107:108:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):903:904 -> a
+    107:108:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):875 -> a
+    107:108:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
+    109:109:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.setDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):42:42 -> a
+    109:109:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):904 -> a
+    109:109:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):875 -> a
+    109:109:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
+    110:110:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):910:910 -> a
+    110:110:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):875 -> a
+    110:110:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
+    111:111:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60:60 -> a
+    111:111:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):910 -> a
+    111:111:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):875 -> a
+    111:111:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
+    112:112:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    112:112:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65 -> a
+    112:112:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60 -> a
+    112:112:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):910 -> a
+    112:112:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):875 -> a
+    112:112:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
+    113:113:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65:65 -> a
+    113:113:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60 -> a
+    113:113:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):910 -> a
+    113:113:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):875 -> a
     113:113:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    114:115:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):908:909 -> a
-    114:115:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):880 -> a
-    114:115:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    116:116:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.setDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):42:42 -> a
-    116:116:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):909 -> a
-    116:116:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):880 -> a
-    116:116:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    117:117:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):915:915 -> a
-    117:117:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):880 -> a
+    114:116:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):912:914 -> a
+    114:116:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):875 -> a
+    114:116:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
+    117:117:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.setDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):42:42 -> a
+    117:117:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):914 -> a
+    117:117:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):875 -> a
     117:117:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    118:118:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60:60 -> a
-    118:118:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):915 -> a
-    118:118:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):880 -> a
+    118:118:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):876:876 -> a
     118:118:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    119:119:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    119:119:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65 -> a
-    119:119:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60 -> a
-    119:119:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):915 -> a
-    119:119:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):880 -> a
-    119:119:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    120:120:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65:65 -> a
-    120:120:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60 -> a
-    120:120:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):915 -> a
-    120:120:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):880 -> a
-    120:120:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    121:123:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):917:919 -> a
-    121:123:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):880 -> a
-    121:123:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    124:124:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.setDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):42:42 -> a
-    124:124:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):919 -> a
-    124:124:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):880 -> a
-    124:124:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    125:125:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):881:881 -> a
-    125:125:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):153 -> a
-    126:126:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):154:154 -> a
-    127:127:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):925:925 -> a
-    127:127:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
-    128:134:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):932:938 -> a
-    128:134:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):926 -> a
-    128:134:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
-    135:135:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):927:927 -> a
-    135:135:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
-    136:136:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):233:233 -> a
-    136:136:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    137:149:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):243:255 -> a
-    137:149:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    137:149:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    150:150:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo.builder(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):64:64 -> a
-    150:150:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):260 -> a
-    150:150:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    150:150:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    151:364:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):283:496 -> a
-    151:364:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    151:364:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    151:364:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    365:366:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):475:476 -> a
-    365:366:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    365:366:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    365:366:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    367:367:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):613:613 -> a
-    367:367:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):476 -> a
-    367:367:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    367:367:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    367:367:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    368:369:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):479:480 -> a
-    368:369:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    368:369:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    368:369:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    370:371:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):443:444 -> a
-    370:371:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    370:371:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    370:371:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    372:372:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):613:613 -> a
-    372:372:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):444 -> a
-    372:372:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    372:372:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    372:372:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    373:394:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):445:466 -> a
-    373:394:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    373:394:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    373:394:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    395:397:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):391:393 -> a
-    395:397:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    395:397:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    395:397:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    398:398:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
-    398:398:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):393 -> a
-    398:398:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    398:398:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    398:398:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    399:415:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):394:410 -> a
-    399:415:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    399:415:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    399:415:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    416:420:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):409:413 -> a
-    416:420:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    416:420:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    416:420:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    421:421:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
-    421:421:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):413 -> a
-    421:421:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    421:421:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    421:421:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    422:434:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):414:426 -> a
-    422:434:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    422:434:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    422:434:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    435:462:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):406:433 -> a
-    435:462:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    435:462:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    435:462:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    463:470:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):365:372 -> a
-    463:470:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    463:470:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    463:470:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    119:119:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):154:154 -> a
+    120:120:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):920:920 -> a
+    120:120:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
+    121:127:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):927:933 -> a
+    121:127:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):921 -> a
+    121:127:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
+    128:128:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):922:922 -> a
+    128:128:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
+    129:129:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):233:233 -> a
+    129:129:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    130:142:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):243:255 -> a
+    130:142:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    130:142:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    143:143:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo.builder(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):64:64 -> a
+    143:143:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):260 -> a
+    143:143:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    143:143:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    144:357:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):283:496 -> a
+    144:357:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    144:357:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    144:357:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    358:359:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):475:476 -> a
+    358:359:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    358:359:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    358:359:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    360:360:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):613:613 -> a
+    360:360:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):476 -> a
+    360:360:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    360:360:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    360:360:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    361:362:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):479:480 -> a
+    361:362:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    361:362:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    361:362:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    363:364:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):443:444 -> a
+    363:364:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    363:364:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    363:364:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    365:365:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):613:613 -> a
+    365:365:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):444 -> a
+    365:365:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    365:365:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    365:365:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    366:387:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):445:466 -> a
+    366:387:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    366:387:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    366:387:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    388:390:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):391:393 -> a
+    388:390:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    388:390:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    388:390:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    391:391:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
+    391:391:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):393 -> a
+    391:391:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    391:391:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    391:391:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    392:408:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):394:410 -> a
+    392:408:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    392:408:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    392:408:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    409:413:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder) -> a
+    409:413:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    409:413:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    409:413:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    414:414:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    414:414:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):413 -> a
+    414:414:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    414:414:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    414:414:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    415:427:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):414:426 -> a
+    415:427:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    415:427:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    415:427:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    428:455:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):406:433 -> a
+    428:455:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    428:455:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    428:455:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    456:463:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):365:372 -> a
+    456:463:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    456:463:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    456:463:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    464:464:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    464:464:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):372 -> a
+    464:464:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    464:464:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    464:464:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    465:465:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):373:373 -> a
+    465:465:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    465:465:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    465:465:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    466:466:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> a
+    466:466:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):373 -> a
+    466:466:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    466:466:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    466:466:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    467:470:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):374:377 -> a
+    467:470:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    467:470:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    467:470:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
     471:471:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
-    471:471:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):372 -> a
+    471:471:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):377 -> a
     471:471:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
     471:471:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
     471:471:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    472:472:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):373:373 -> a
-    472:472:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    472:472:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    472:472:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    473:473:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> a
-    473:473:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):373 -> a
-    473:473:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    473:473:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    473:473:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    474:477:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):374:377 -> a
-    474:477:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    474:477:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    474:477:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    478:478:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
-    478:478:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):377 -> a
-    478:478:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    478:478:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    478:478:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    479:483:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):380:384 -> a
-    479:483:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    479:483:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    479:483:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    484:492:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):346:354 -> a
-    484:492:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    484:492:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    484:492:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    493:493:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    493:493:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):355 -> a
-    493:493:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    493:493:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    493:493:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    494:494:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):357:357 -> a
-    494:494:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    494:494:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    494:494:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    495:672:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):310:487 -> a
-    495:672:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    495:672:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    495:672:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    673:852:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):338:517 -> a
-    673:852:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
-    673:852:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    673:852:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    853:853:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):263:263 -> a
-    853:853:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    853:853:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    854:854:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):262:262 -> a
-    854:854:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
-    854:854:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    855:855:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):235:235 -> a
-    855:855:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    856:858:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):945:947 -> a
-    856:858:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):159 -> a
-    859:859:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1037:1037 -> a
-    859:859:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):160 -> a
-    860:866:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1044:1050 -> a
-    860:866:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1038 -> a
-    860:866:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):160 -> a
-    867:867:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1039:1039 -> a
-    867:867:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):160 -> a
-    868:868:java.util.BitSet com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1056:1056 -> a
-    868:868:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):161 -> a
-    869:891:java.util.BitSet com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1065:1087 -> a
-    869:891:java.util.BitSet com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1057 -> a
-    869:891:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):161 -> a
-    892:892:java.util.BitSet com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1058:1058 -> a
-    892:892:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):161 -> a
-    893:893:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,java.util.BitSet,com.android.tools.r8.utils.Timing):1095:1095 -> a
-    893:893:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):162 -> a
-    894:913:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,java.util.BitSet):1102:1121 -> a
-    894:913:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,java.util.BitSet,com.android.tools.r8.utils.Timing):1096 -> a
-    894:913:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):162 -> a
-    914:914:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,java.util.BitSet,com.android.tools.r8.utils.Timing):1097:1097 -> a
-    914:914:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):162 -> a
-    915:915:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1236:1236 -> a
-    915:915:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):163 -> a
-    916:925:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1243:1252 -> a
-    916:925:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1237 -> a
-    916:925:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):163 -> a
-    926:926:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1238:1238 -> a
-    926:926:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):163 -> a
-    927:927:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):522:522 -> a
-    928:928:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
-    928:928:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):526 -> a
-    929:929:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.ir.code.IRCode):560:560 -> a
-    930:932:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):563:565 -> a
-    933:952:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):564:583 -> a
-    953:1011:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):595:653 -> a
-    1012:1051:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):614:653 -> a
-    1052:1064:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):641:653 -> a
-    1065:1065:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):664:664 -> a
-    1066:1069:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):667:670 -> a
-    1070:1072:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):777:779 -> a
-    1070:1072:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):670 -> a
-    1073:1077:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):671:675 -> a
-    1078:1085:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):742:749 -> a
-    1078:1085:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):675 -> a
-    1086:1086:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    1086:1086:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):749 -> a
-    1086:1086:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):675 -> a
-    1087:1089:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):750:752 -> a
-    1087:1089:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):675 -> a
-    1090:1090:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    1090:1090:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):754 -> a
-    1090:1090:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):675 -> a
-    1091:1091:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):755:755 -> a
-    1091:1091:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):675 -> a
-    1092:1094:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):676:678 -> a
-    1095:1102:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):763:770 -> a
-    1095:1102:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):678 -> a
-    1103:1103:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    1103:1103:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):770 -> a
-    1103:1103:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):678 -> a
-    1104:1106:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):771:773 -> a
-    1104:1106:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):678 -> a
-    1107:1108:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):681:682 -> a
-    1109:1111:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):777:779 -> a
-    1109:1111:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):682 -> a
-    1112:1120:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):683:691 -> a
-    1121:1128:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):788:795 -> a
-    1121:1128:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):691 -> a
-    1129:1140:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):692:703 -> a
-    1141:1141:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    1141:1141:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):706 -> a
-    1142:1148:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):706:712 -> a
-    1149:1172:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):953:976 -> a
-    1173:1173:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):975:975 -> a
-    1174:1174:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
-    1174:1174:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):985 -> a
-    1175:1175:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):988:988 -> a
-    1176:1187:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexProgramClass):1021:1032 -> a
-    1176:1187:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):988 -> a
-    1188:1207:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):996:1015 -> a
-    1208:1208:boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexProgramClass):978:978 -> a
-    1209:1217:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1127:1135 -> a
-    1218:1218:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    1218:1218:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1136 -> a
-    1219:1228:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1136:1145 -> a
-    1229:1260:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1140:1171 -> a
-    1261:1306:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1185:1230 -> a
-    1261:1306:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1172 -> a
-    1307:1307:boolean lambda$isNonNullOnNormalExit$4(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1143:1143 -> a
+    472:476:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):380:384 -> a
+    472:476:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    472:476:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    472:476:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    477:485:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):346:354 -> a
+    477:485:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    477:485:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    477:485:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    486:486:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    486:486:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):355 -> a
+    486:486:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    486:486:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    486:486:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    487:487:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):357:357 -> a
+    487:487:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    487:487:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    487:487:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    488:665:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):310:487 -> a
+    488:665:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    488:665:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    488:665:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    666:845:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):338:517 -> a
+    666:845:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):261 -> a
+    666:845:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    666:845:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    846:846:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):263:263 -> a
+    846:846:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    846:846:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    847:847:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):262:262 -> a
+    847:847:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):234 -> a
+    847:847:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    848:848:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):235:235 -> a
+    848:848:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    849:851:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):940:942 -> a
+    849:851:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):159 -> a
+    852:852:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1032:1032 -> a
+    852:852:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):160 -> a
+    853:859:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1039:1045 -> a
+    853:859:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1033 -> a
+    853:859:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):160 -> a
+    860:860:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1034:1034 -> a
+    860:860:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):160 -> a
+    861:861:java.util.BitSet com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1051:1051 -> a
+    861:861:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):161 -> a
+    862:884:java.util.BitSet com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1060:1082 -> a
+    862:884:java.util.BitSet com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1052 -> a
+    862:884:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):161 -> a
+    885:885:java.util.BitSet com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1053:1053 -> a
+    885:885:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):161 -> a
+    886:886:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,java.util.BitSet,com.android.tools.r8.utils.Timing):1090:1090 -> a
+    886:886:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):162 -> a
+    887:906:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,java.util.BitSet):1097:1116 -> a
+    887:906:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,java.util.BitSet,com.android.tools.r8.utils.Timing):1091 -> a
+    887:906:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):162 -> a
+    907:907:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,java.util.BitSet,com.android.tools.r8.utils.Timing):1092:1092 -> a
+    907:907:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):162 -> a
+    908:908:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1231:1231 -> a
+    908:908:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):163 -> a
+    909:918:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1238:1247 -> a
+    909:918:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1232 -> a
+    909:918:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):163 -> a
+    919:919:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1233:1233 -> a
+    919:919:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):163 -> a
+    920:920:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):522:522 -> a
+    921:921:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    921:921:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):526 -> a
+    922:922:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.ir.code.IRCode):555:555 -> a
+    923:925:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):558:560 -> a
+    926:945:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):559:578 -> a
+    946:1004:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):590:648 -> a
+    1005:1044:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):609:648 -> a
+    1045:1057:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):636:648 -> a
+    1058:1058:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):659:659 -> a
+    1059:1062:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):662:665 -> a
+    1063:1065:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):772:774 -> a
+    1063:1065:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):665 -> a
+    1066:1070:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):666:670 -> a
+    1071:1078:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):737:744 -> a
+    1071:1078:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):670 -> a
+    1079:1079:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    1079:1079:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):744 -> a
+    1079:1079:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):670 -> a
+    1080:1082:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):745:747 -> a
+    1080:1082:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):670 -> a
+    1083:1083:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    1083:1083:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):749 -> a
+    1083:1083:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):670 -> a
+    1084:1084:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):750:750 -> a
+    1084:1084:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):670 -> a
+    1085:1087:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):671:673 -> a
+    1088:1095:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):758:765 -> a
+    1088:1095:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):673 -> a
+    1096:1096:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    1096:1096:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):765 -> a
+    1096:1096:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):673 -> a
+    1097:1099:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):766:768 -> a
+    1097:1099:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):673 -> a
+    1100:1101:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):676:677 -> a
+    1102:1104:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):772:774 -> a
+    1102:1104:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):677 -> a
+    1105:1113:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):678:686 -> a
+    1114:1121:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):783:790 -> a
+    1114:1121:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):686 -> a
+    1122:1133:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):687:698 -> a
+    1134:1134:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    1134:1134:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):701 -> a
+    1135:1141:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):701:707 -> a
+    1142:1165:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):948:971 -> a
+    1166:1166:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):970:970 -> a
+    1167:1167:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
+    1167:1167:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):980 -> a
+    1168:1168:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):983:983 -> a
+    1169:1180:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexProgramClass):1016:1027 -> a
+    1169:1180:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):983 -> a
+    1181:1200:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):991:1010 -> a
+    1201:1201:boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexProgramClass):973:973 -> a
+    1202:1210:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1122:1130 -> a
+    1211:1211:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    1211:1211:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1131 -> a
+    1212:1221:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1131:1140 -> a
+    1222:1253:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1135:1166 -> a
+    1254:1299:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1180:1225 -> a
+    1254:1299:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1167 -> a
+    1300:1300:boolean lambda$isNonNullOnNormalExit$4(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1138:1138 -> a
     boolean lambda$computeMayHaveSideEffects$3(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.bF:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.dE:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect NO_EFFECT -> e
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect OTHER_EFFECT -> d
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect CONDITIONAL_EFFECT -> c
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect DESIRED_EFFECT -> b
-    1:4:void <clinit>():731:734 -> <clinit>
-    1:1:void <init>(java.lang.String,int):730:730 -> <init>
-com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.HG:
+    1:4:void <clinit>():726:729 -> <clinit>
+    1:1:void <init>(java.lang.String,int):725:725 -> <init>
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.EF:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> d
     int flags -> b
@@ -68294,22 +67946,22 @@
     3:3:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.getAbstractValue():59:59 -> a
     3:3:void setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):63 -> a
     4:5:void setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):63:64 -> a
-    6:6:void fixupAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):68:68 -> a
-    7:7:void joinReadBits(int):77:77 -> a
-    8:8:void setDynamicType(com.android.tools.r8.ir.analysis.type.DynamicType):95:95 -> a
+    6:6:void fixupAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):69:69 -> a
+    7:7:void joinReadBits(int):78:78 -> a
+    8:8:void setDynamicType(com.android.tools.r8.ir.analysis.type.DynamicType):96:96 -> a
     com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo() -> b
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> c
-    1:1:boolean cannotBeKept():82:82 -> e
+    1:1:boolean cannotBeKept():83:83 -> e
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue():59:59 -> f
-    1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():91:91 -> g
-    1:1:int getReadBits():73:73 -> h
-    1:1:boolean isDead():100:100 -> i
-    1:1:boolean valueHasBeenPropagated():109:109 -> j
-    1:1:void markAsDead():104:104 -> k
-    1:1:void markAsPropagated():113:113 -> l
-    1:1:void markCannotBeKept():86:86 -> m
+    1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():92:92 -> g
+    1:1:int getReadBits():74:74 -> h
+    1:1:boolean isDead():101:101 -> i
+    1:1:boolean valueHasBeenPropagated():110:110 -> j
+    1:1:void markAsDead():105:105 -> k
+    1:1:void markAsPropagated():114:114 -> l
+    1:1:void markCannotBeKept():87:87 -> m
     1:5:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():49:53 -> n
-com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo -> com.android.tools.r8.internal.IG:
+com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo -> com.android.tools.r8.internal.FF:
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification enumUnboxerMethodClassification -> g
     java.util.BitSet nonNullParamOnNormalExits -> m
     java.util.BitSet nonNullParamOrThrow -> l
@@ -68328,186 +67980,182 @@
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> h
     int DEFAULT_FLAGS -> q
     1:74:void <clinit>():35:108 -> <clinit>
-    75:75:boolean com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo.mayHaveSideEffects():181:181 -> <clinit>
+    75:75:boolean com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo.mayHaveSideEffects():175:175 -> <clinit>
     75:75:void <clinit>():111 -> <clinit>
-    76:99:void <clinit>():111:134 -> <clinit>
-    1:1:void <init>():139:139 -> <init>
-    2:101:void <init>():38:137 -> <init>
-    102:102:void <init>(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):145:145 -> <init>
-    103:224:void <init>(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):38:159 -> <init>
-    1:1:boolean mayHaveSideEffects():499:499 -> A
-    1:1:boolean neverReturnsNormally():400:400 -> B
-    1:1:boolean returnValueHasBeenPropagated():694:694 -> C
-    1:1:boolean returnValueOnlyDependsOnArguments():515:515 -> D
-    1:1:boolean returnsArgument():389:389 -> E
-    1:1:boolean triggersClassInitBeforeAnySideEffect():494:494 -> F
-    1:1:void markAsPropagated():689:689 -> G
-    1:1:void markCannotBeKept():227:227 -> H
-    1:1:void markClassInitializerMayBePostponed():236:236 -> I
-    1:2:void markForceInline():655:656 -> J
-    1:1:void markInlinedIntoSingleCallSite():375:375 -> K
-    1:1:void markMayNotHaveSideEffects():584:584 -> L
-    1:1:void markNeverReturnsNormally():600:600 -> M
-    1:1:void markReturnValueOnlyDependsOnArguments():592:592 -> N
-    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo mutableCopy():713:713 -> O
-    1:1:void setInitializerEnablingJavaAssertions():552:552 -> P
-    1:4:void setMultiCallerMethod():664:667 -> Q
-    1:1:void unsetAbstractReturnValue():614:614 -> R
-    1:1:void unsetBridgeInfo():421:421 -> S
-    1:1:void unsetCheckNullReceiverBeforeAnySideEffect():676:676 -> T
-    1:1:void unsetClassInitializerMayBePostponed():240:240 -> U
-    1:1:void unsetClassInlinerMethodConstraint():277:277 -> V
-    1:1:void unsetDynamicType():649:649 -> W
-    1:1:void unsetEnumUnboxerMethodClassification():295:295 -> X
-    1:1:void unsetForceInline():660:660 -> Y
-    1:1:void unsetInitializedClassesOnNormalExit():564:564 -> Z
+    76:97:void <clinit>():111:132 -> <clinit>
+    1:1:void <init>():137:137 -> <init>
+    2:99:void <init>():38:135 -> <init>
+    100:100:void <init>(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):143:143 -> <init>
+    101:220:void <init>(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):38:157 -> <init>
+    1:1:boolean neverReturnsNormally():401:401 -> A
+    1:1:boolean returnValueHasBeenPropagated():682:682 -> B
+    1:1:boolean returnValueOnlyDependsOnArguments():511:511 -> C
+    1:1:boolean returnsArgument():390:390 -> D
+    1:1:boolean triggersClassInitBeforeAnySideEffect():490:490 -> E
+    1:1:void markAsPropagated():677:677 -> F
+    1:1:void markCannotBeKept():228:228 -> G
+    1:1:void markClassInitializerMayBePostponed():237:237 -> H
+    1:2:void markForceInline():651:652 -> I
+    1:1:void markInlinedIntoSingleCallSite():376:376 -> J
+    1:1:void markMayNotHaveSideEffects():580:580 -> K
+    1:1:void markNeverReturnsNormally():596:596 -> L
+    1:1:void markReturnValueOnlyDependsOnArguments():588:588 -> M
+    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo mutableCopy():701:701 -> N
+    1:1:void setInitializerEnablingJavaAssertions():548:548 -> O
+    1:4:void setMultiCallerMethod():660:663 -> P
+    1:1:void unsetAbstractReturnValue():610:610 -> Q
+    1:1:void unsetBridgeInfo():422:422 -> R
+    1:1:void unsetClassInitializerMayBePostponed():241:241 -> S
+    1:1:void unsetClassInlinerMethodConstraint():278:278 -> T
+    1:1:void unsetDynamicType():645:645 -> U
+    1:1:void unsetEnumUnboxerMethodClassification():296:296 -> V
+    1:1:void unsetForceInline():656:656 -> W
+    1:1:void unsetInitializedClassesOnNormalExit():560:560 -> X
+    1:1:void unsetInitializerEnablingJavaVmAssertions():552:552 -> Y
+    1:1:void unsetInlinedIntoSingleCallSite():380:380 -> Z
     com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo asMutableMethodOptimizationInfo() -> a
-    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):183:183 -> a
-    2:2:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupAbstractReturnValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):189:189 -> a
-    3:4:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupInstanceInitializerInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):195:196 -> a
-    5:7:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setFlag(int,boolean):202:204 -> a
-    5:7:void markCheckNullReceiverBeforeAnySideEffect(boolean):672 -> a
-    8:8:void clearFlag(int):213:213 -> a
-    9:9:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):249:249 -> a
-    9:9:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):164 -> a
+    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):181:181 -> a
+    2:2:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupAbstractReturnValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):187:187 -> a
+    3:4:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupInstanceInitializerInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):196:197 -> a
+    5:7:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setFlag(int,boolean):203:205 -> a
+    5:7:void markTriggerClassInitBeforeAnySideEffect(boolean):668 -> a
+    8:8:void clearFlag(int):214:214 -> a
+    9:9:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):250:250 -> a
+    9:9:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):162 -> a
     10:10:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
-    10:10:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):249 -> a
-    10:10:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):164 -> a
-    11:12:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):250:251 -> a
-    11:12:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):164 -> a
-    13:15:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupBridgeInfo(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):409:411 -> a
-    13:15:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):165 -> a
-    16:17:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupClassInlinerMethodConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):267:268 -> a
-    16:17:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):166 -> a
-    18:19:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):300:301 -> a
-    18:19:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):167 -> a
-    20:21:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupInstanceInitializerInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):327:328 -> a
-    20:21:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):168 -> a
-    22:22:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):357:357 -> a
-    22:22:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):169 -> a
-    23:23:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):338:338 -> a
-    23:23:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):170 -> a
-    24:24:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupReturnedArgumentIndex(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):579:579 -> a
-    24:24:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):171 -> a
-    25:27:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupSimpleInliningConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):536:538 -> a
-    25:27:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):172 -> a
-    28:28:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupSimpleInliningConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):537:537 -> a
-    28:28:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):172 -> a
-    29:29:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupUnusedArguments(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):449:449 -> a
-    29:29:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):173 -> a
-    30:30:void setArgumentInfos(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):257:257 -> a
-    31:31:void setClassInlinerMethodConstraint(com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):273:273 -> a
-    32:32:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):288:288 -> a
+    10:10:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):250 -> a
+    10:10:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):162 -> a
+    11:12:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):251:252 -> a
+    11:12:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):162 -> a
+    13:15:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupBridgeInfo(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):410:412 -> a
+    13:15:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):163 -> a
+    16:17:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupClassInlinerMethodConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):268:269 -> a
+    16:17:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):164 -> a
+    18:19:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):301:302 -> a
+    18:19:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):165 -> a
+    20:21:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupInstanceInitializerInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):328:329 -> a
+    20:21:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):166 -> a
+    22:22:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):358:358 -> a
+    22:22:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):167 -> a
+    23:23:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):339:339 -> a
+    23:23:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):168 -> a
+    24:24:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupReturnedArgumentIndex(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):575:575 -> a
+    24:24:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):169 -> a
+    25:27:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupSimpleInliningConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):532:534 -> a
+    25:27:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):170 -> a
+    28:28:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupSimpleInliningConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):533:533 -> a
+    28:28:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):170 -> a
+    29:29:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupUnusedArguments(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):450:450 -> a
+    29:29:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):171 -> a
+    30:30:void setArgumentInfos(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):258:258 -> a
+    31:31:void setClassInlinerMethodConstraint(com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):274:274 -> a
+    32:32:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):289:289 -> a
     33:33:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
-    33:33:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):288 -> a
-    34:34:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):289:289 -> a
+    33:33:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):289 -> a
+    34:34:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):290:290 -> a
     35:35:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
-    35:35:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):289 -> a
-    36:38:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):288:290 -> a
-    39:39:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):322:322 -> a
-    40:40:void setBridgeInfo(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):417:417 -> a
-    41:41:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupUnusedArguments(java.util.BitSet):455:455 -> a
-    42:42:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.mayHaveSideEffects():499:499 -> a
-    42:42:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):504 -> a
-    43:43:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):434:434 -> a
-    43:43:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):507 -> a
-    44:44:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getSimpleInliningConstraint():440:440 -> a
-    44:44:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):435 -> a
-    44:44:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):507 -> a
-    45:45:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):507:507 -> a
-    46:46:void setSimpleInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):527:527 -> a
-    47:47:void setInstanceInitializerInfoCollection(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):544:544 -> a
-    48:48:void markInitializesClassesOnNormalExit(java.util.Set):560:560 -> a
-    49:49:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):608:608 -> a
+    35:35:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):290 -> a
+    36:38:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):289:291 -> a
+    39:39:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):323:323 -> a
+    40:40:void setBridgeInfo(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):418:418 -> a
+    41:41:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupUnusedArguments(java.util.BitSet):456:456 -> a
+    42:42:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.mayHaveSideEffects():495:495 -> a
+    42:42:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):500 -> a
+    43:43:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):435:435 -> a
+    43:43:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):503 -> a
+    44:44:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getSimpleInliningConstraint():441:441 -> a
+    44:44:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):436 -> a
+    44:44:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):503 -> a
+    45:45:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):503:503 -> a
+    46:46:void setSimpleInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):523:523 -> a
+    47:47:void setInstanceInitializerInfoCollection(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):540:540 -> a
+    48:48:void markInitializesClassesOnNormalExit(java.util.Set):556:556 -> a
+    49:49:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):604:604 -> a
     50:50:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":661,"2":662,"3":663}}
-    661:661:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):608:608 -> a
-    662:662:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):608:608 -> a
-    663:663:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):608:608 -> a
-    658:660:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):608:610 -> a
-    664:664:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):618:618 -> a
-    665:665:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):632:632 -> a
-    665:665:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):626 -> a
-    666:666:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getReturnType():335:335 -> a
-    666:666:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):633 -> a
-    666:666:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):626 -> a
-    667:667:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):633:633 -> a
-    667:667:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):626 -> a
-    668:668:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    668:668:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):633 -> a
-    668:668:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):626 -> a
-    669:669:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    669:669:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    669:669:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):633 -> a
-    669:669:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):626 -> a
-    670:674:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):634:638 -> a
-    670:674:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):626 -> a
-    675:675:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):627:627 -> a
-    1:1:void unsetInitializerEnablingJavaVmAssertions():556:556 -> a0
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":657,"2":658,"3":659}}
+    657:657:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):604:604 -> a
+    658:658:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):604:604 -> a
+    659:659:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):604:604 -> a
+    654:656:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):604:606 -> a
+    660:660:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):614:614 -> a
+    661:662:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):628:629 -> a
+    661:662:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):622 -> a
+    663:663:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getReturnType():335:335 -> a
+    663:663:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):629 -> a
+    663:663:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):622 -> a
+    664:664:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):629:629 -> a
+    664:664:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):622 -> a
+    665:665:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    665:665:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):629 -> a
+    665:665:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):622 -> a
+    666:666:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    666:666:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    666:666:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):629 -> a
+    666:666:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):622 -> a
+    667:671:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):630:634 -> a
+    667:671:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):622 -> a
+    672:672:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):623:623 -> a
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection.empty():23:23 -> a0
+    1:1:void unsetInstanceInitializerInfoCollection():544 -> a0
+    2:2:void unsetInstanceInitializerInfoCollection():544:544 -> a0
     com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo() -> b
-    1:3:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setFlag(int,boolean):202:204 -> b
-    1:3:void markTriggerClassInitBeforeAnySideEffect(boolean):680 -> b
-    4:4:boolean isFlagSet(int):217:217 -> b
-    5:5:void setNonNullParamOnNormalExits(java.util.BitSet):362:362 -> b
-    1:1:void unsetInlinedIntoSingleCallSite():379:379 -> b0
-    1:3:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setFlag(int,boolean):202:204 -> c
-    1:3:void setReachabilitySensitive(boolean):519 -> c
-    4:4:void setNonNullParamOrThrow(java.util.BitSet):343:343 -> c
-    5:7:void markReturnsArgument(int):568:570 -> c
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection.empty():23:23 -> c0
-    1:1:void unsetInstanceInitializerInfoCollection():548 -> c0
-    2:2:void unsetInstanceInitializerInfoCollection():548:548 -> c0
+    1:3:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setFlag(int,boolean):203:205 -> b
+    1:3:void setReachabilitySensitive(boolean):515 -> b
+    4:4:boolean isFlagSet(int):218:218 -> b
+    5:5:void setNonNullParamOnNormalExits(java.util.BitSet):363:363 -> b
+    1:1:void unsetMayNotHaveSideEffects():584:584 -> b0
+    1:1:void setNonNullParamOrThrow(java.util.BitSet):344:344 -> c
+    2:4:void markReturnsArgument(int):564:566 -> c
+    1:1:void unsetNeverReturnsNormally():600:600 -> c0
     boolean isMutableOptimizationInfo() -> d
-    1:1:void setFlag(int):209:209 -> d
-    2:3:void setUnusedArguments(java.util.BitSet):461:462 -> d
-    4:4:java.util.BitSet com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getUnusedArguments():445:445 -> d
-    4:4:void setUnusedArguments(java.util.BitSet):463 -> d
-    5:7:void setUnusedArguments(java.util.BitSet):463:465 -> d
-    1:1:void unsetMayNotHaveSideEffects():588:588 -> d0
-    1:1:boolean cannotBeKept():222:222 -> e
-    1:1:void unsetNeverReturnsNormally():604:604 -> e0
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():489:489 -> f
-    1:1:void unsetNonNullParamOnNormalExits():366:366 -> f0
-    1:1:boolean classInitializerMayBePostponed():232:232 -> g
-    1:1:void unsetNonNullParamOrThrow():347:347 -> g0
-    1:1:boolean forceInline():484:484 -> h
-    1:1:void unsetReachabilitySensitive():523:523 -> h0
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():426:426 -> i
-    1:1:void unsetReturnValueOnlyDependsOnArguments():596:596 -> i0
-    1:1:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos():245:245 -> j
-    1:1:void unsetReturnedArgument():574:574 -> j0
-    1:1:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo():405:405 -> k
-    1:1:void unsetSimpleInliningConstraint():531:531 -> k0
-    1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():262:262 -> l
-    1:1:void unsetTriggerClassInitBeforeAnySideEffect():684:684 -> l0
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():317:317 -> m
-    1:1:void unsetUnusedArguments():469:469 -> m0
-    1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():307:307 -> n
-    1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification():282:282 -> o
-    1:1:java.util.Set getInitializedClassesOnNormalExit():312:312 -> p
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():352:352 -> q
-    1:1:java.util.BitSet getNonNullParamOrThrow():334:334 -> r
-    1:2:int getReturnedArgument():394:395 -> s
-    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():440:440 -> t
-    1:1:java.util.BitSet getUnusedArguments():445:445 -> u
-    1:1:boolean hasBeenInlinedIntoSingleCallSite():371:371 -> v
-    1:1:boolean isInitializerEnablingJavaVmAssertions():474:474 -> x
-    1:1:boolean isMultiCallerMethod():479:479 -> y
-    1:1:boolean isReachabilitySensitive():384:384 -> z
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.ZK:
+    1:1:void setFlag(int):210:210 -> d
+    2:3:void setUnusedArguments(java.util.BitSet):462:463 -> d
+    4:4:java.util.BitSet com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getUnusedArguments():446:446 -> d
+    4:4:void setUnusedArguments(java.util.BitSet):464 -> d
+    5:7:void setUnusedArguments(java.util.BitSet):464:466 -> d
+    1:1:void unsetNonNullParamOnNormalExits():367:367 -> d0
+    1:1:boolean cannotBeKept():223:223 -> e
+    1:1:void unsetNonNullParamOrThrow():348:348 -> e0
+    1:1:boolean classInitializerMayBePostponed():233:233 -> f
+    1:1:void unsetReachabilitySensitive():519:519 -> f0
+    1:1:boolean forceInline():485:485 -> g
+    1:1:void unsetReturnValueOnlyDependsOnArguments():592:592 -> g0
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():427:427 -> h
+    1:1:void unsetReturnedArgument():570:570 -> h0
+    1:1:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos():246:246 -> i
+    1:1:void unsetSimpleInliningConstraint():527:527 -> i0
+    1:1:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo():406:406 -> j
+    1:1:void unsetTriggerClassInitBeforeAnySideEffect():672:672 -> j0
+    1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():263:263 -> k
+    1:1:void unsetUnusedArguments():470:470 -> k0
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():318:318 -> l
+    1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():308:308 -> m
+    1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification():283:283 -> n
+    1:1:java.util.Set getInitializedClassesOnNormalExit():313:313 -> o
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():353:353 -> p
+    1:1:java.util.BitSet getNonNullParamOrThrow():335:335 -> q
+    1:2:int getReturnedArgument():395:396 -> r
+    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():441:441 -> s
+    1:1:java.util.BitSet getUnusedArguments():446:446 -> t
+    1:1:boolean hasBeenInlinedIntoSingleCallSite():372:372 -> u
+    1:1:boolean isInitializerEnablingJavaVmAssertions():475:475 -> w
+    1:1:boolean isMultiCallerMethod():480:480 -> x
+    1:1:boolean isReachabilitySensitive():385:385 -> y
+    1:1:boolean mayHaveSideEffects():495:495 -> z
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.VJ:
     1:1:void <init>():20:20 -> <init>
     void modifyAppInfoWithLiveness(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple com.android.tools.r8.ir.optimize.info.OptimizationFeedback.getSimple():44:44 -> a
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple getSimpleFeedback():48 -> a
     2:2:void fixupOptimizationInfos(java.lang.Iterable,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):62:62 -> a
     3:3:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):63:63 -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.YK:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.UJ:
     void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo) -> a
     void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo) -> a
     1:3:void fixup(com.android.tools.r8.graph.DexEncodedMember):30:32 -> a
     4:4:void lambda$fixup$0(com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo,com.android.tools.r8.graph.DexEncodedField):33:33 -> a
     5:5:void lambda$fixup$1(com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo,com.android.tools.r8.graph.DexEncodedMethod):34:34 -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.aL:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.WJ:
     java.util.Map fieldOptimizationInfos -> b
     java.util.Map methodOptimizationInfos -> c
     java.util.Map processed -> d
@@ -68517,20 +68165,20 @@
     1:10:void <init>():33:42 -> <init>
     1:6:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getFieldOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedField):50:55 -> a
     7:7:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):71:71 -> a
-    7:7:void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):251 -> a
-    8:8:void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):252:252 -> a
+    7:7:void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):245 -> a
+    8:8:void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):246:246 -> a
     9:9:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):71:71 -> a
-    9:9:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):258 -> a
-    10:10:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):259:259 -> a
+    9:9:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):252 -> a
+    10:10:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):253:253 -> a
     11:11:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):71:71 -> a
-    11:11:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):288 -> a
-    12:12:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):288:288 -> a
+    11:11:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):282 -> a
+    12:12:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):282:282 -> a
     13:13:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):71:71 -> a
-    13:13:void setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet):298 -> a
-    14:14:void setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet):298:298 -> a
+    13:13:void setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet):292 -> a
+    14:14:void setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet):292:292 -> a
     15:15:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):71:71 -> a
-    15:15:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):335 -> a
-    16:16:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):335:335 -> a
+    15:15:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):324 -> a
+    16:16:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):324:324 -> a
     17:17:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):78:78 -> a
     18:18:void com.android.tools.r8.ir.optimize.info.OptimizationFeedback.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):54:54 -> a
     18:18:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):79 -> a
@@ -68542,7 +68190,6 @@
     24:28:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):152:156 -> a
     29:29:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
     29:29:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):156 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:30:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):157:157 -> a
     31:37:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):153:159 -> a
     38:39:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):183:184 -> a
@@ -68550,19 +68197,18 @@
     41:42:void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):195:196 -> a
     43:43:void setDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):203:203 -> a
     44:44:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):228:228 -> a
-    45:45:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):240:240 -> a
-    46:46:void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):245:245 -> a
-    47:48:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):266:267 -> a
-    49:49:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):272:272 -> a
-    50:50:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):277:277 -> a
+    45:45:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):234:234 -> a
+    46:46:void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):239:239 -> a
+    47:48:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):260:261 -> a
+    49:49:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):266:266 -> a
+    50:50:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):271:271 -> a
     1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):71:71 -> b
-    1:1:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):340 -> b
-    2:2:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):340:340 -> b
+    1:1:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):329 -> b
+    2:2:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):329:329 -> b
     3:3:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):97:97 -> b
     4:9:boolean noUpdatesLeft():113:118 -> b
     10:10:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):213:213 -> b
-    11:11:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):234:234 -> b
-    12:12:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):282:282 -> b
+    11:11:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):276:276 -> b
     1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):71:71 -> c
     1:1:void methodNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):208 -> c
     2:2:void methodNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):208:208 -> c
@@ -68575,7 +68221,7 @@
     14:23:void updateVisibleOptimizationInfo():100:109 -> c
     24:24:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):172:172 -> c
     1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):218:218 -> d
-    1:1:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> e
+    1:1:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):287:287 -> e
     1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):177:177 -> f
     1:6:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):61:66 -> g
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.ir.optimize.info.b:
@@ -68600,7 +68246,6 @@
     void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint) -> a
     void setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet) -> a
     void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod) -> a
-    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
     void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
     void unsetForceInline(com.android.tools.r8.graph.ProgramMethod) -> b
@@ -68612,7 +68257,7 @@
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> f
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.ir.optimize.info.a:
     1:1:void <init>():26:26 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.cL:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.YJ:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>():29:29 -> <init>
@@ -68627,267 +68272,255 @@
     5:5:void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):105:105 -> a
     6:6:void setDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):111:111 -> a
     7:7:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):136:136 -> a
-    8:8:void setArgumentInfos(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):150:150 -> a
-    9:9:void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):155:155 -> a
-    10:12:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):168:170 -> a
-    13:14:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):178:179 -> a
-    15:15:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):184:184 -> a
-    16:16:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):189:189 -> a
-    17:17:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):200:200 -> a
-    18:18:void setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet):210:210 -> a
-    19:24:void fixupUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):214:219 -> a
-    25:25:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):261:261 -> a
-    26:26:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> a
-    26:26:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):261 -> a
+    8:8:void setArgumentInfos(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):145:145 -> a
+    9:9:void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):150:150 -> a
+    10:12:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):163:165 -> a
+    13:14:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):173:174 -> a
+    15:15:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):179:179 -> a
+    16:16:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):184:184 -> a
+    17:17:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):195:195 -> a
+    18:18:void setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet):205:205 -> a
+    19:24:void fixupUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):209:214 -> a
+    25:25:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):250:250 -> a
+    26:26:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> a
+    26:26:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):250 -> a
     27:27:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":28,"2":29,"3":30}}
-    28:28:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> a
-    28:28:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):261 -> a
-    29:29:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> a
-    29:29:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):261 -> a
-    30:30:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> a
-    30:30:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):261 -> a
+    28:28:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> a
+    28:28:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):250 -> a
+    29:29:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> a
+    29:29:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):250 -> a
+    30:30:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> a
+    30:30:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):250 -> a
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple getInstance():32:32 -> b
     2:2:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):49:49 -> b
     3:3:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):116:116 -> b
-    4:4:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):141:141 -> b
-    5:5:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):194:194 -> b
-    6:6:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):267:267 -> b
-    7:7:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> b
-    7:7:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):267 -> b
-    8:8:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9,"2":10,"3":11}}
-    9:9:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> b
-    9:9:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):267 -> b
-    10:10:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> b
-    10:10:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):267 -> b
-    11:11:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> b
-    11:11:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):267 -> b
+    4:4:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):189:189 -> b
+    5:5:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):256:256 -> b
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> b
+    6:6:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):256 -> b
+    7:7:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8,"2":9,"3":10}}
+    8:8:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> b
+    8:8:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):256 -> b
+    9:9:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> b
+    9:9:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):256 -> b
+    10:10:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> b
+    10:10:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):256 -> b
     1:1:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):39:39 -> c
     2:2:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):83:83 -> c
     3:3:void methodNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):126:126 -> c
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> d
     1:1:void setMultiCallerMethod(com.android.tools.r8.graph.ProgramMethod):71:71 -> d
-    1:1:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):205:205 -> e
-    2:2:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):227:227 -> e
-    3:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> e
-    3:3:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):227 -> e
+    1:1:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):200:200 -> e
+    2:2:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):222:222 -> e
+    3:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> e
+    3:3:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):222 -> e
     4:4:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):0:0 -> e
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5,"2":6,"3":7}}
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> e
-    5:5:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):227 -> e
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> e
-    6:6:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):227 -> e
-    7:7:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> e
-    7:7:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):227 -> e
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> e
+    5:5:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):222 -> e
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> e
+    6:6:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):222 -> e
+    7:7:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> e
+    7:7:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):222 -> e
     1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):88:88 -> f
-    2:2:void unsetCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):238:238 -> f
-    3:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> f
-    3:3:void unsetCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):238 -> f
-    4:4:void unsetCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):0:0 -> f
+    2:2:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):233:233 -> f
+    3:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> f
+    3:3:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):233 -> f
+    4:4:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):0:0 -> f
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5,"2":6,"3":7}}
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> f
-    5:5:void unsetCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):238 -> f
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> f
-    6:6:void unsetCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):238 -> f
-    7:7:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> f
-    7:7:void unsetCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):238 -> f
-    1:1:void unsetBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod):233:233 -> g
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):362:363 -> g
-    2:3:void unsetBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod):233 -> g
-    4:4:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):244:244 -> g
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> g
-    5:5:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):244 -> g
-    6:6:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):0:0 -> g
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> f
+    5:5:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):233 -> f
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> f
+    6:6:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):233 -> f
+    7:7:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> f
+    7:7:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):233 -> f
+    1:1:void unsetBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod):228:228 -> g
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):351:352 -> g
+    2:3:void unsetBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod):228 -> g
+    4:4:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):239:239 -> g
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> g
+    5:5:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):239 -> g
+    6:6:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):0:0 -> g
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7,"2":8,"3":9}}
-    7:7:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> g
-    7:7:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):244 -> g
-    8:8:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> g
-    8:8:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):244 -> g
-    9:9:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> g
-    9:9:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):244 -> g
-    1:1:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):250:250 -> h
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> h
-    2:2:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):250 -> h
-    3:3:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):0:0 -> h
+    7:7:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> g
+    7:7:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):239 -> g
+    8:8:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> g
+    8:8:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):239 -> g
+    9:9:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> g
+    9:9:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):239 -> g
+    1:1:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):245:245 -> h
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> h
+    2:2:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):245 -> h
+    3:3:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):0:0 -> h
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> h
-    4:4:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):250 -> h
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> h
-    5:5:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):250 -> h
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> h
-    6:6:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):250 -> h
-    1:1:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):256:256 -> i
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> i
-    2:2:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):256 -> i
-    3:3:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):0:0 -> i
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> h
+    4:4:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):245 -> h
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> h
+    5:5:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):245 -> h
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> h
+    6:6:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):245 -> h
+    1:1:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):261:261 -> i
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> i
+    2:2:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):261 -> i
+    3:3:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):0:0 -> i
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> i
-    4:4:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):256 -> i
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> i
-    5:5:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):256 -> i
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> i
-    6:6:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):256 -> i
-    1:1:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):272:272 -> j
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> j
-    2:2:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):272 -> j
-    3:3:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):0:0 -> j
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> i
+    4:4:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):261 -> i
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> i
+    5:5:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):261 -> i
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> i
+    6:6:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):261 -> i
+    1:1:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):267:267 -> j
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> j
+    2:2:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):267 -> j
+    3:3:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):0:0 -> j
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> j
-    4:4:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):272 -> j
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> j
-    5:5:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):272 -> j
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> j
-    6:6:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):272 -> j
-    1:1:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):278:278 -> k
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> k
-    2:2:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):278 -> k
-    3:3:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):0:0 -> k
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> j
+    4:4:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):267 -> j
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> j
+    5:5:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):267 -> j
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> j
+    6:6:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):267 -> j
+    1:1:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):273:273 -> k
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> k
+    2:2:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):273 -> k
+    3:3:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):0:0 -> k
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> k
-    4:4:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):278 -> k
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> k
-    5:5:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):278 -> k
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> k
-    6:6:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):278 -> k
-    1:1:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):284:284 -> l
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> l
-    2:2:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):284 -> l
-    3:3:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):0:0 -> l
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> k
+    4:4:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):273 -> k
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> k
+    5:5:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):273 -> k
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> k
+    6:6:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):273 -> k
+    1:1:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):279:279 -> l
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> l
+    2:2:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):279 -> l
+    3:3:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):0:0 -> l
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> l
-    4:4:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):284 -> l
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> l
-    5:5:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):284 -> l
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> l
-    6:6:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):284 -> l
-    1:1:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):290:290 -> m
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> m
-    2:2:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):290 -> m
-    3:3:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):0:0 -> m
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> l
+    4:4:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):279 -> l
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> l
+    5:5:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):279 -> l
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> l
+    6:6:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):279 -> l
+    1:1:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):285:285 -> m
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> m
+    2:2:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):285 -> m
+    3:3:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):0:0 -> m
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> m
-    4:4:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):290 -> m
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> m
-    5:5:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):290 -> m
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> m
-    6:6:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):290 -> m
-    1:1:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):296:296 -> n
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> n
-    2:2:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):296 -> n
-    3:3:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):0:0 -> n
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> m
+    4:4:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):285 -> m
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> m
+    5:5:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):285 -> m
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> m
+    6:6:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):285 -> m
+    1:1:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):291:291 -> n
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> n
+    2:2:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):291 -> n
+    3:3:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):0:0 -> n
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> n
-    4:4:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):296 -> n
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> n
-    5:5:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):296 -> n
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> n
-    6:6:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):296 -> n
-    1:1:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):302:302 -> o
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> o
-    2:2:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):302 -> o
-    3:3:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):0:0 -> o
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> n
+    4:4:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):291 -> n
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> n
+    5:5:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):291 -> n
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> n
+    6:6:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):291 -> n
+    1:1:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):297:297 -> o
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> o
+    2:2:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):297 -> o
+    3:3:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):0:0 -> o
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> o
-    4:4:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):302 -> o
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> o
-    5:5:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):302 -> o
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> o
-    6:6:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):302 -> o
-    1:1:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):308:308 -> p
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> p
-    2:2:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):308 -> p
-    3:3:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):0:0 -> p
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> o
+    4:4:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):297 -> o
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> o
+    5:5:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):297 -> o
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> o
+    6:6:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):297 -> o
+    1:1:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):303:303 -> p
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> p
+    2:2:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):303 -> p
+    3:3:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):0:0 -> p
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> p
-    4:4:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):308 -> p
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> p
-    5:5:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):308 -> p
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> p
-    6:6:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):308 -> p
-    1:1:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):314:314 -> q
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> q
-    2:2:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):314 -> q
-    3:3:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):0:0 -> q
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> p
+    4:4:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):303 -> p
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> p
+    5:5:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):303 -> p
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> p
+    6:6:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):303 -> p
+    1:1:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):309:309 -> q
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> q
+    2:2:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):309 -> q
+    3:3:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):0:0 -> q
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> q
-    4:4:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):314 -> q
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> q
-    5:5:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):314 -> q
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> q
-    6:6:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):314 -> q
-    1:1:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):320:320 -> r
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> r
-    2:2:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):320 -> r
-    3:3:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):0:0 -> r
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> q
+    4:4:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):309 -> q
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> q
+    5:5:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):309 -> q
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> q
+    6:6:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):309 -> q
+    1:1:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):320:320 -> r
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> r
+    2:2:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):320 -> r
+    3:3:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):0:0 -> r
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> r
-    4:4:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):320 -> r
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> r
-    5:5:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):320 -> r
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> r
-    6:6:void unsetReachabilitySensitive(com.android.tools.r8.graph.ProgramMethod):320 -> r
-    1:1:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):331:331 -> s
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> s
-    2:2:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):331 -> s
-    3:3:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):0:0 -> s
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> r
+    4:4:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):320 -> r
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> r
+    5:5:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):320 -> r
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> r
+    6:6:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):320 -> r
+    1:1:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):315:315 -> s
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> s
+    2:2:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):315 -> s
+    3:3:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):0:0 -> s
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> s
-    4:4:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):331 -> s
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> s
-    5:5:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):331 -> s
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> s
-    6:6:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):331 -> s
-    1:1:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):326:326 -> t
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> t
-    2:2:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):326 -> t
-    3:3:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):0:0 -> t
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> s
+    4:4:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):315 -> s
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> s
+    5:5:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):315 -> s
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> s
+    6:6:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):315 -> s
+    1:1:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):326:326 -> t
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> t
+    2:2:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):326 -> t
+    3:3:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):0:0 -> t
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> t
-    4:4:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):326 -> t
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> t
-    5:5:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):326 -> t
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> t
-    6:6:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):326 -> t
-    1:1:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):337:337 -> u
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> u
-    2:2:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):337 -> u
-    3:3:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):0:0 -> u
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> t
+    4:4:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):326 -> t
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> t
+    5:5:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):326 -> t
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> t
+    6:6:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):326 -> t
+    1:1:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):332:332 -> u
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> u
+    2:2:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):332 -> u
+    3:3:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):0:0 -> u
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> u
-    4:4:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):337 -> u
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> u
-    5:5:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):337 -> u
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> u
-    6:6:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):337 -> u
-    1:1:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):343:343 -> v
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> v
-    2:2:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):343 -> v
-    3:3:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):0:0 -> v
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> u
+    4:4:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):332 -> u
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> u
+    5:5:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):332 -> u
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> u
+    6:6:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):332 -> u
+    1:1:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):338:338 -> v
+    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):343:343 -> v
+    2:2:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):338 -> v
+    3:3:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):0:0 -> v
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> v
-    4:4:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):343 -> v
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> v
-    5:5:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):343 -> v
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> v
-    6:6:void unsetTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.ProgramMethod):343 -> v
-    1:1:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):349:349 -> w
-    2:2:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):354:354 -> w
-    2:2:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):349 -> w
-    3:3:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):0:0 -> w
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4,"2":5,"3":6}}
-    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> w
-    4:4:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):349 -> w
-    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> w
-    5:5:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):349 -> w
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):355:355 -> w
-    6:6:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):349 -> w
-com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.JZ:
+    4:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> v
+    4:4:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):338 -> v
+    5:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> v
+    5:5:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):338 -> v
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):344:344 -> v
+    6:6:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):338 -> v
+com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.ZX:
     com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo getInstance():14:14 -> c
-com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.Q5:
+com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.N5:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:51:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):27:77 -> a
@@ -68911,30 +68544,30 @@
     100:100:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
     101:101:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeCheckCastAfterInvoke(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):148:148 -> a
     101:101:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
-com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.X20:
+com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.k10:
     com.android.tools.r8.graph.DexMethod invokedMethod -> a
     1:1:void com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo.<init>():10:10 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):32 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexMethod):33:33 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> a
-com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Qh:
+com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Ah:
     com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
     void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
+    void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField):47:47 -> a
-    void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> b
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection getInstance():28:28 -> c
     1:1:java.lang.String toString():69:69 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.Op:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.qp:
     boolean $assertionsDisabled -> b
     int argumentIndex -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:void <init>(int):23:24 -> <init>
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:2:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):44:45 -> a
     3:3:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
     3:3:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):45 -> a
@@ -68954,52 +68587,52 @@
     77:77:java.lang.String toString():74:74 -> toString
     78:78:java.lang.String toString():74:74 -> toString
     79:79:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.Pp:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.rp:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
     boolean isTypeInitializationInfo() -> a
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo() -> f
     boolean isSingleValue() -> g
     boolean isArgumentInitializationInfo() -> h
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> j
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Rp:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.tp:
     1:1:void <init>():25:25 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
     void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
+    void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField) -> a
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder():28:28 -> a
-    void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> b
     boolean isEmpty() -> b
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.Qp:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.sp:
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():53:53 -> <clinit>
     1:3:void <init>():53:55 -> <init>
     1:3:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder recordInitializationInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):63:65 -> a
     4:7:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection build():71:74 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.Sp:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.up:
     java.util.concurrent.ConcurrentHashMap argumentInitializationInfos -> a
     1:3:void <init>():11:13 -> <init>
     1:3:com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo createArgumentInitializationInfo(int):18:18 -> a
     4:4:com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo createTypeInitializationInfo(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):24:24 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.Up:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.wp:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> a
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> b
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):27:29 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
     boolean isTypeInitializationInfo() -> a
-    1:13:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):59:71 -> a
-    14:14:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):88:88 -> a
-    14:14:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):72 -> a
-    15:17:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):72:74 -> a
-    18:18:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):88:88 -> a
-    18:18:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):74 -> a
-    19:19:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):74:74 -> a
+    1:13:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):59:71 -> a
+    14:14:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):96:96 -> a
+    14:14:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):72 -> a
+    15:17:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):72:74 -> a
+    18:18:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):96:96 -> a
+    18:18:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):74 -> a
+    19:19:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):74:74 -> a
     1:6:boolean equals(java.lang.Object):87:92 -> equals
     1:1:int hashCode():79:79 -> hashCode
     1:1:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.VH:
+com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.SG:
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -69008,41 +68641,38 @@
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):73 -> a
     2:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):74:78 -> a
     7:7:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection.builder():28:28 -> a
-    7:7:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):84 -> a
-    8:12:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):85:89 -> a
-    13:13:void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):39:39 -> a
-    14:19:void lambda$forEach$0(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):41:46 -> a
-    20:22:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField):61:61 -> a
-    23:23:void lambda$fixupAfterParametersChanged$1(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):77:77 -> a
-    24:24:void lambda$fixupAfterParametersChanged$1(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):76:76 -> a
-    25:25:void lambda$toString$3(java.util.List,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):95:95 -> a
-    26:26:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
-    26:26:void lambda$rewrittenWithLens$2(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):88 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    27:27:void lambda$rewrittenWithLens$2(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):88:88 -> a
-    28:28:void lambda$rewrittenWithLens$2(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):87:87 -> a
+    7:7:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):84 -> a
+    8:13:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):85:90 -> a
+    14:14:void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):39:39 -> a
+    15:20:void lambda$forEach$0(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):41:46 -> a
+    21:21:void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):56:56 -> a
+    22:24:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField):61:61 -> a
+    25:25:void lambda$fixupAfterParametersChanged$1(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):77:77 -> a
+    26:26:void lambda$fixupAfterParametersChanged$1(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):76:76 -> a
+    27:28:void lambda$rewrittenWithLens$2(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):88:89 -> a
+    29:29:void lambda$rewrittenWithLens$2(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):87:87 -> a
+    30:30:void lambda$toString$3(java.util.List,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):96:96 -> a
     boolean isEmpty() -> b
-    1:1:void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):56:56 -> b
-    1:4:java.lang.String toString():94:97 -> toString
-com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.G10:
+    1:4:java.lang.String toString():95:98 -> toString
+com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.WZ:
     com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo getInstance():24:24 -> b
     1:1:java.lang.String toString():46:46 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.ie:
+com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Kd:
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo info -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo):19:20 -> <init>
     1:4:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):41:44 -> a
-    5:8:com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):52:55 -> a
-    5:8:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):14 -> a
+    5:8:com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):55:58 -> a
+    5:8:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):14 -> a
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.get(com.android.tools.r8.ir.code.InvokeDirect):30:30 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect):14 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.getContextInsensitive():25:25 -> c
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():14 -> c
-com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.Ze:
+com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.De:
     com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo INSTANCE -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():23:23 -> <init>
@@ -69053,19 +68683,19 @@
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():51:51 -> f
     boolean receiverNeverEscapesOutsideConstructorChain() -> g
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo getInstance():26:26 -> h
-    1:1:java.lang.String toString():83:83 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Rh:
+    1:1:java.lang.String toString():86:86 -> toString
+com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Bh:
     com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection EMPTY -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
-    com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
+    com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection.get(com.android.tools.r8.ir.code.InvokeDirect):32:32 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect):14 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection.getContextInsensitive():27:27 -> c
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():14 -> c
     1:1:com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection getInstance():22:22 -> d
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.aq:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.Cp:
     1:1:void <init>():16:16 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo asNonTrivialInstanceInitializerInfo() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos() -> b
@@ -69074,7 +68704,7 @@
     boolean mayHaveOtherSideEffectsThanInstanceFieldAssignments() -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet() -> f
     boolean receiverNeverEscapesOutsideConstructorChain() -> g
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.bq:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.Dp:
     1:1:void <init>():16:16 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
     1:1:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.isNonTrivialInstanceInitializerInfo():0:0 -> a
@@ -69082,11 +68712,11 @@
     2:3:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection of(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):28:29 -> a
     4:4:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection.empty():23:23 -> a
     4:4:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection of(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):31 -> a
-    com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
+    com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
     5:5:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection empty():23:23 -> a
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect) -> b
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive() -> c
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.YH:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.UG:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
@@ -69098,11 +68728,7 @@
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo asNonTrivialInstanceInitializerInfo() -> a
     1:1:boolean verifyNoUnknownBits(int):58:58 -> a
     2:5:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):105:108 -> a
-    6:9:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):115:118 -> a
-    10:10:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    10:10:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):119 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):119:119 -> a
+    6:10:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):118:122 -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos():79:79 -> b
     1:1:com.android.tools.r8.graph.DexMethod getParent():74:74 -> c
     1:1:boolean instanceFieldInitializationMayDependOnEnvironment():89:89 -> d
@@ -69110,73 +68736,72 @@
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():84:84 -> f
     1:1:boolean receiverNeverEscapesOutsideConstructorChain():99:99 -> g
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":126,"2":127,"3":128}}
-    126:126:java.lang.String toString():124:124 -> toString
-    127:127:java.lang.String toString():124:124 -> toString
-    128:128:java.lang.String toString():124:124 -> toString
-    125:125:java.lang.String toString():124:124 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.WH:
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.XH:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":129,"2":130,"3":131}}
+    129:129:java.lang.String toString():127:127 -> toString
+    130:130:java.lang.String toString():127:127 -> toString
+    131:131:java.lang.String toString():127:127 -> toString
+    128:128:java.lang.String toString():127:127 -> toString
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.TG:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection instanceFieldInitializationInfos -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
     com.android.tools.r8.graph.DexMethod parent -> d
     int data -> b
-    1:1:void <clinit>():127:127 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):138:138 -> <init>
-    2:10:void <init>(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):131:139 -> <init>
-    1:3:boolean com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.isTrivial():143:145 -> a
-    1:3:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo build():230 -> a
+    1:1:void <clinit>():130:130 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):141:141 -> <init>
+    2:10:void <init>(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):134:142 -> <init>
+    1:3:boolean com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.isTrivial():146:148 -> a
+    1:3:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo build():233 -> a
     4:4:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet.isTop():0:0 -> a
-    4:4:boolean com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.isTrivial():145 -> a
-    4:4:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo build():230 -> a
-    5:5:boolean com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.isTrivial():145:145 -> a
-    5:5:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo build():230 -> a
-    6:7:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo build():231:232 -> a
-    8:9:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder markFieldAsRead(com.android.tools.r8.graph.DexEncodedField):150:151 -> a
+    4:4:boolean com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.isTrivial():148 -> a
+    4:4:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo build():233 -> a
+    5:5:boolean com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.isTrivial():148:148 -> a
+    5:5:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo build():233 -> a
+    6:7:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo build():234:235 -> a
+    8:9:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder markFieldAsRead(com.android.tools.r8.graph.DexEncodedField):153:154 -> a
     10:10:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet.isBottom():0:0 -> a
-    10:10:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder markFieldAsRead(com.android.tools.r8.graph.DexEncodedField):151 -> a
-    11:16:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder markFieldAsRead(com.android.tools.r8.graph.DexEncodedField):152:157 -> a
-    17:17:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):183:183 -> a
-    18:18:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):162:162 -> a
-    18:18:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):183 -> a
+    10:10:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder markFieldAsRead(com.android.tools.r8.graph.DexEncodedField):154 -> a
+    11:16:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder markFieldAsRead(com.android.tools.r8.graph.DexEncodedField):155:160 -> a
+    17:17:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):186:186 -> a
+    18:18:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):165:165 -> a
+    18:18:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):186 -> a
     19:19:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet.isTop():0:0 -> a
-    19:19:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):162 -> a
-    19:19:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):183 -> a
-    20:20:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):162:162 -> a
-    20:20:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):183 -> a
+    19:19:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):165 -> a
+    19:19:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):186 -> a
+    20:20:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):165:165 -> a
+    20:20:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):186 -> a
     21:21:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet.isBottom():0:0 -> a
-    21:21:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):162 -> a
-    21:21:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):183 -> a
+    21:21:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):165 -> a
+    21:21:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):186 -> a
     22:22:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet.isTop():0:0 -> a
-    22:22:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):165 -> a
-    22:22:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):183 -> a
-    23:23:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markAllFieldsAsRead():178:178 -> a
-    23:23:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):166 -> a
-    23:23:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):183 -> a
-    24:25:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):168:169 -> a
-    24:25:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):183 -> a
+    22:22:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):168 -> a
+    22:22:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):186 -> a
+    23:23:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markAllFieldsAsRead():181:181 -> a
+    23:23:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):169 -> a
+    23:23:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):186 -> a
+    24:25:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):171:172 -> a
+    24:25:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):186 -> a
     26:26:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet.isBottom():0:0 -> a
-    26:26:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):169 -> a
-    26:26:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):183 -> a
-    27:29:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):170:172 -> a
-    27:29:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):183 -> a
-    30:34:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):184:188 -> a
+    26:26:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):172 -> a
+    26:26:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):186 -> a
+    27:29:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.markFieldsAsRead(com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet):173:175 -> a
+    27:29:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):186 -> a
+    30:34:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):187:191 -> a
     35:35:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.receiverMayEscapeOutsideConstructorChain():72:72 -> a
-    35:35:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):190 -> a
-    36:36:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):191:191 -> a
-    37:37:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setParent(com.android.tools.r8.graph.DexMethod):224:224 -> a
-    38:38:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.getParent():220:220 -> a
-    38:38:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setParent(com.android.tools.r8.graph.DexMethod):224 -> a
-    39:40:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setParent(com.android.tools.r8.graph.DexMethod):224:225 -> a
-    1:1:com.android.tools.r8.graph.DexMethod getParent():220:220 -> b
-    1:1:boolean hasParent():216:216 -> c
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder markAllFieldsAsRead():178:178 -> d
-    1:1:boolean mayHaveOtherSideEffectsThanInstanceFieldAssignments():202:202 -> e
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():197:197 -> f
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():206:206 -> g
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():211:211 -> h
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.Ye:
+    35:35:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):193 -> a
+    36:36:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder merge(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):194:194 -> a
+    37:37:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setParent(com.android.tools.r8.graph.DexMethod):227:227 -> a
+    38:38:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder.getParent():223:223 -> a
+    38:38:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setParent(com.android.tools.r8.graph.DexMethod):227 -> a
+    39:40:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setParent(com.android.tools.r8.graph.DexMethod):227:228 -> a
+    1:1:com.android.tools.r8.graph.DexMethod getParent():223:223 -> b
+    1:1:boolean hasParent():219:219 -> c
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder markAllFieldsAsRead():181:181 -> d
+    1:1:boolean mayHaveOtherSideEffectsThanInstanceFieldAssignments():205:205 -> e
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():200:200 -> f
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():209:209 -> g
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():214:214 -> h
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.Ce:
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation callSiteInformation -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions$InlinerOptions options -> c
@@ -69189,40 +68814,39 @@
     24:24:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     24:24:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):74 -> a
     24:24:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
-    25:25:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):74:74 -> a
-    25:25:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
-    26:26:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
-    26:26:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):75 -> a
-    26:26:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
-    27:27:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):75:75 -> a
+    25:26:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):74:75 -> a
+    25:26:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
+    27:27:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
+    27:27:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):75 -> a
     27:27:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
-    28:28:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):57:57 -> a
-    29:33:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isMultiCallerInlineCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):86:90 -> a
-    29:33:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):59 -> a
-    34:34:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isPostMethodProcessor():0:0 -> a
-    34:34:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isMultiCallerInlineCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):92 -> a
-    34:34:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):59 -> a
-    35:35:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isMultiCallerInlineCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):93:93 -> a
+    28:28:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):75:75 -> a
+    28:28:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
+    29:29:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):57:57 -> a
+    30:34:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isMultiCallerInlineCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):86:90 -> a
+    30:34:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):59 -> a
+    35:35:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isPostMethodProcessor():0:0 -> a
+    35:35:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isMultiCallerInlineCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):92 -> a
     35:35:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):59 -> a
-    36:40:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):60:64 -> a
-com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.xk:
+    36:36:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isMultiCallerInlineCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):93:93 -> a
+    36:36:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):59 -> a
+    37:41:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):60:64 -> a
+com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.ck:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.Inliner$Reason):17:18 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):28:28 -> a
-com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.Bp:
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.dp:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:4:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20:23 -> a
     5:5:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
     6:6:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():204:204 -> a
     6:6:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:8:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:33 -> a
     9:9:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     9:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):33 -> a
     10:10:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):36:36 -> a
     11:11:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
-com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.Dp:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.fp:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> d
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> f
@@ -69235,26 +68859,31 @@
     3:9:void <init>():26:32 -> <init>
     10:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):36:36 -> <init>
     11:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):26:40 -> <init>
-    1:10:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,boolean):81:90 -> a
-    11:18:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):40:47 -> a
-    11:18:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,boolean):90 -> a
-    19:20:com.android.tools.r8.ir.code.IRCode getAndCacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,boolean):96:97 -> a
-    21:22:void cacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):102:103 -> a
-    23:23:com.android.tools.r8.ir.conversion.MethodProcessor getMethodProcessor():107:107 -> a
-    24:24:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):116:116 -> a
+    1:2:com.android.tools.r8.ir.code.IRCode getAndCacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):93:94 -> a
+    3:4:void cacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):99:100 -> a
+    5:5:com.android.tools.r8.ir.conversion.MethodProcessor getMethodProcessor():104:104 -> a
+    6:6:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):113:113 -> a
     1:1:com.android.tools.r8.ir.optimize.inliner.InliningIRProvider getThrowingInstance():44:44 -> b
-    1:1:boolean verifyIRCacheIsEmpty():111:111 -> c
-com.android.tools.r8.ir.optimize.inliner.InliningIRProvider$1 -> com.android.tools.r8.internal.Cp:
+    2:11:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):78:87 -> b
+    12:17:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):40:45 -> b
+    12:17:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):83 -> b
+    18:18:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.GraphLens.lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):460:460 -> b
+    18:18:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):45 -> b
+    18:18:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):83 -> b
+    19:19:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):47:47 -> b
+    19:19:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):83 -> b
+    1:1:boolean verifyIRCacheIsEmpty():108:108 -> c
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider$1 -> com.android.tools.r8.internal.ep:
     1:1:void <init>():44:44 -> <init>
-    1:1:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,boolean):48:48 -> a
-    2:2:com.android.tools.r8.ir.code.IRCode getAndCacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,boolean):54:54 -> a
-    3:3:void cacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):59:59 -> a
-    4:4:com.android.tools.r8.ir.conversion.MethodProcessor getMethodProcessor():64:64 -> a
-    5:5:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):74:74 -> a
-    1:1:boolean verifyIRCacheIsEmpty():69:69 -> c
-com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Fp:
+    1:1:com.android.tools.r8.ir.code.IRCode getAndCacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):52:52 -> a
+    2:2:void cacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):57:57 -> a
+    3:3:com.android.tools.r8.ir.conversion.MethodProcessor getMethodProcessor():62:62 -> a
+    4:4:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):72:72 -> a
+    1:1:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):47:47 -> b
+    1:1:boolean verifyIRCacheIsEmpty():67:67 -> c
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.hp:
     com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor) -> a
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.aI:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.WG:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -69290,7 +68919,7 @@
     void reportUnknownTarget() -> u
     boolean unsetReasonHasBeenReportedFlag() -> v
     1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():21:21 -> w
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.x30:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.J10:
     1:1:void <init>():18:18 -> <init>
     void reportCallerNotSameClass() -> a
     void reportIncorrectArity(int,int) -> a
@@ -69325,7 +68954,7 @@
     void reportRecursiveMethod() -> t
     void reportUnknownTarget() -> u
     boolean unsetReasonHasBeenReportedFlag() -> v
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.y30:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.K10:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.ProgramMethod context -> b
     com.android.tools.r8.graph.ProgramMethod callee -> a
@@ -69384,23 +69013,23 @@
     1:1:void reportRecursiveMethod():209:209 -> t
     1:1:void reportUnknownTarget():214:214 -> u
     1:2:boolean unsetReasonHasBeenReportedFlag():270:271 -> v
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph -> com.android.tools.r8.internal.kG:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph -> com.android.tools.r8.internal.hF:
     1:1:void <init>(java.util.Map):16:16 -> <init>
     1:1:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder builder(com.android.tools.r8.graph.AppView):20:20 -> a
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder -> com.android.tools.r8.internal.lG:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder -> com.android.tools.r8.internal.iF:
     1:1:void <init>(com.android.tools.r8.graph.AppView):21:21 -> <init>
     1:1:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder.createNode(com.android.tools.r8.graph.ProgramMethod):26:26 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod):17 -> a
     2:3:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph build(java.util.concurrent.ExecutorService):31:32 -> a
     4:4:void processClass(com.android.tools.r8.graph.DexProgramClass):36:36 -> a
     1:4:void processMethod(com.android.tools.r8.graph.ProgramMethod):40:43 -> c
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerInvokeRegistry -> com.android.tools.r8.internal.mG:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerInvokeRegistry -> com.android.tools.r8.internal.jF:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode,java.util.function.Function,java.util.Map):28:28 -> <init>
     1:1:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     1:1:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):40 -> a
     2:3:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):41:42 -> a
     1:1:com.android.tools.r8.graph.GraphLens getCodeLens():33:33 -> c
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode -> com.android.tools.r8.internal.nG:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode -> com.android.tools.r8.internal.kF:
     java.util.concurrent.atomic.AtomicInteger numberOfCallSites -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
@@ -69413,7 +69042,7 @@
     5:5:void com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode.addReaderConcurrently(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode):28:28 -> a
     5:5:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase):12 -> a
     1:1:int getNumberOfCallSites():32:32 -> c
-com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.u5:
+com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.r5:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):29:31 -> <init>
@@ -69442,7 +69071,7 @@
     31:37:void com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):101:101 -> a
     31:37:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):53 -> a
     1:1:com.android.tools.r8.graph.DexType getType():36:36 -> getType
-com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer -> com.android.tools.r8.internal.W5:
+com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer -> com.android.tools.r8.internal.T5:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):25:27 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):44:44 -> a
@@ -69457,13 +69086,12 @@
     10:11:void com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer.optimizeByteValue(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):57:58 -> a
     10:11:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):45 -> a
     1:1:com.android.tools.r8.graph.DexType getType():32:32 -> getType
-com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.ui:
+com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.fi:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):29:30 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):47:47 -> a
     2:2:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):47 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:5:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):48:50 -> a
     6:25:void com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer.insertAssumeDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):60:79 -> a
     6:25:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):50 -> a
@@ -69480,18 +69108,18 @@
     29:30:void com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer.insertAssumeDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):83:84 -> a
     29:30:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):50 -> a
     1:1:com.android.tools.r8.graph.DexType getType():35:35 -> getType
-com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.HB:
+com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.RA:
     1:3:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):27:29 -> a
     4:4:com.android.tools.r8.graph.DexLibraryClass com.android.tools.r8.graph.DexLibraryClass.asLibraryClassOrNull(com.android.tools.r8.graph.DexClass):78:78 -> a
     4:4:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):29 -> a
     5:5:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31:31 -> a
     6:12:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):33:39 -> a
     13:16:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):38:41 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():475:475 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():498:498 -> a
     17:17:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):43 -> a
     18:18:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):44:44 -> a
     19:19:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):35:35 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.IB:
+com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.SA:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map libraryMethodModelCollections -> d
     java.util.Set modeledLibraryTypes -> c
@@ -69528,11 +69156,11 @@
     143:143:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):177 -> a
     144:144:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):177:177 -> a
     145:145:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State lambda$optimize$1(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):160:160 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.KB:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.UA:
     com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor) -> a
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.JB:
-com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.OB:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.TA:
+com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.YA:
     java.util.Map finalMethodsWithoutSideEffects -> a
     java.util.Set nonFinalMethodsWithoutSideEffects -> c
     java.util.Set unconditionalFinalMethodsWithoutSideEffects -> b
@@ -69550,14 +69178,13 @@
     28:30:boolean isSideEffectFreeFinalMethod(com.android.tools.r8.graph.DexMethod,java.util.List):123:125 -> a
     31:31:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):713:713 -> a
     31:31:boolean isSideEffectFreeFinalMethod(com.android.tools.r8.graph.DexMethod,java.util.List):125 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     32:33:boolean isSideEffectFreeFinalMethod(com.android.tools.r8.graph.DexMethod,java.util.List):125:126 -> a
     34:35:boolean isSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.LibraryMethod):132:133 -> a
     1:1:boolean lambda$buildFinalMethodsWithoutSideEffects$0(com.android.tools.r8.graph.DexMethod,java.util.List):44:44 -> b
     2:2:boolean lambda$buildFinalMethodsWithoutSideEffects$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List):56:56 -> b
     3:29:java.util.Set buildUnconditionalFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):71:97 -> b
     1:1:boolean lambda$buildFinalMethodsWithoutSideEffects$2(com.android.tools.r8.graph.DexMethod,java.util.List):52:52 -> c
-com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.QB:
+com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.aB:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> a
@@ -69623,14 +69250,12 @@
     64:64:void run(java.util.Set):51 -> a
     65:65:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1503:1503 -> a
     65:65:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():158 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     65:65:void run(java.util.Set):51 -> a
     66:69:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():158:161 -> a
     66:69:void run(java.util.Set):51 -> a
     70:82:void lambda$modelLibraryMethodsNonNullParamOrThrow$0(com.android.tools.r8.graph.DexMethod,int[]):104:116 -> a
     83:83:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo.hasNonNullParamOnNormalExits():49:49 -> a
     83:83:void lambda$modelLibraryMethodsNonNullParamOrThrow$0(com.android.tools.r8.graph.DexMethod,int[]):116 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     84:86:void lambda$modelLibraryMethodsNonNullParamOrThrow$0(com.android.tools.r8.graph.DexMethod,int[]):117:119 -> a
     87:89:void lambda$modelLibraryMethodsWithoutSideEffects$1(com.android.tools.r8.graph.DexMethod):150:152 -> a
     1:1:void modelLibraryMethodsNonNullParamOrThrow():102:102 -> b
@@ -69639,7 +69264,7 @@
     3:3:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):167 -> b
     4:6:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):168:170 -> b
     1:3:void modelLibraryMethodsWithoutSideEffects():146:148 -> c
-com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.QC:
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.YB:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod wtfMethod -> i
     com.android.tools.r8.graph.DexMethod eMethod -> h
@@ -69661,14 +69286,14 @@
     4:38:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):113:147 -> a
     39:42:void replaceInvokeWithConstNumber(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,int):154:157 -> a
     1:1:com.android.tools.r8.graph.DexType getType():101:101 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.vK:
+com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.rJ:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):41:41 -> a
     2:4:void com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer.optimizeGetClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):47:49 -> a
     2:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):42 -> a
     1:1:com.android.tools.r8.graph.DexType getType():29:29 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.NK:
+com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.JJ:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -69679,7 +69304,6 @@
     1:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):55:56 -> a
     3:3:byte com.android.tools.r8.graph.DexString.byteAt(int):54:54 -> a
     3:3:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):56 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):68:68 -> a
     5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
     5:5:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeIsNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):150 -> a
@@ -69707,75 +69331,73 @@
     30:30:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):90:90 -> a
     31:31:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isToStringMethod(com.android.tools.r8.graph.DexMethod):1499:1499 -> a
     31:31:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):90 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
     32:32:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):221 -> a
     32:32:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):91 -> a
-    33:33:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):222:222 -> a
-    33:33:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):91 -> a
-    34:34:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> a
-    34:34:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):225 -> a
-    34:34:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):91 -> a
-    35:56:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):226:247 -> a
-    35:56:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):91 -> a
-    57:57:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):78:78 -> a
-    58:58:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1491:1491 -> a
-    58:58:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):78 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    59:59:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):180:180 -> a
-    59:59:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
-    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    60:60:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):185 -> a
-    60:60:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
-    61:70:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):186:195 -> a
-    61:70:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
-    71:71:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():642:642 -> a
-    71:71:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):195 -> a
-    71:71:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
-    72:74:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):196:196 -> a
-    72:74:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
-    77:86:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):199:208 -> a
-    77:86:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
-    87:87:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):73:73 -> a
-    88:88:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    88:88:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):162 -> a
-    88:88:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):74 -> a
-    89:94:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):163:168 -> a
-    89:94:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):74 -> a
-    95:95:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):58:58 -> a
-    96:96:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    96:96:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):103 -> a
-    96:96:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
-    97:107:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):104:114 -> a
-    97:107:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
-    108:108:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    108:108:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):114 -> a
-    108:108:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
-    109:112:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):114:117 -> a
-    109:112:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
-    113:113:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
-    113:113:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):117 -> a
-    113:113:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
-    114:115:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):117:118 -> a
-    114:115:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
-    116:126:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):113:123 -> a
-    116:126:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
-    127:127:com.android.tools.r8.ir.code.InvokeVirtual$Builder com.android.tools.r8.ir.code.InvokeVirtual.builder():37:37 -> a
-    127:127:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):123 -> a
-    127:127:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
-    128:132:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):123:127 -> a
-    128:132:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
-    133:133:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):122:122 -> a
-    133:133:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
+    33:36:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):222:225 -> a
+    33:36:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):91 -> a
+    37:37:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> a
+    37:37:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):225 -> a
+    37:37:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):91 -> a
+    38:59:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):226:247 -> a
+    38:59:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):91 -> a
+    60:60:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):78:78 -> a
+    61:61:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1491:1491 -> a
+    61:61:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):78 -> a
+    62:62:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):180:180 -> a
+    62:62:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
+    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    63:63:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):185 -> a
+    63:63:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
+    64:73:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):186:195 -> a
+    64:73:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
+    74:74:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():642:642 -> a
+    74:74:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):195 -> a
+    74:74:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
+    75:77:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):196:196 -> a
+    75:77:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
+    80:89:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):199:208 -> a
+    80:89:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
+    90:90:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):73:73 -> a
+    91:91:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    91:91:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):162 -> a
+    91:91:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):74 -> a
+    92:97:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):163:168 -> a
+    92:97:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):74 -> a
+    98:98:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):58:58 -> a
+    99:99:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    99:99:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):103 -> a
+    99:99:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
+    100:110:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):104:114 -> a
+    100:110:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
+    111:111:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
+    111:111:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):114 -> a
+    111:111:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
+    112:115:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):114:117 -> a
+    112:115:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
+    116:116:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
+    116:116:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):117 -> a
+    116:116:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
+    117:118:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod) -> a
+    117:118:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
+    119:129:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):113:123 -> a
+    119:129:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
+    130:130:com.android.tools.r8.ir.code.InvokeVirtual$Builder com.android.tools.r8.ir.code.InvokeVirtual.builder():37:37 -> a
+    130:130:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):123 -> a
+    130:130:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
+    131:135:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):123:127 -> a
+    131:135:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
+    136:136:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):122:122 -> a
+    136:136:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
     1:1:com.android.tools.r8.graph.DexType getType():43:43 -> getType
-com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.cX:
+com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.yV:
     1:1:void <init>():19:19 -> <init>
     com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor) -> a
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set) -> a
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):19:19 -> a
     2:2:void com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):48:48 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):19 -> a
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.BX:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.WV:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -69785,95 +69407,98 @@
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44:44 -> a
     3:5:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):80:82 -> a
     3:5:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    6:13:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):103:110 -> a
-    6:13:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    6:13:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    14:14:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendStringMethod(com.android.tools.r8.graph.DexMethod):1988:1988 -> a
-    14:14:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):111 -> a
-    14:14:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    14:14:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    15:15:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendObjectMethod(com.android.tools.r8.graph.DexMethod):1980:1980 -> a
-    15:15:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):113 -> a
+    6:14:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):103:111 -> a
+    6:14:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    6:14:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    15:15:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendStringMethod(com.android.tools.r8.graph.DexMethod):1988:1988 -> a
+    15:15:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):111 -> a
     15:15:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
     15:15:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    16:20:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):114:118 -> a
-    16:20:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    16:20:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    21:21:com.android.tools.r8.ir.code.InvokeVirtual$Builder com.android.tools.r8.ir.code.InvokeVirtual.builder():37:37 -> a
-    21:21:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):118 -> a
-    21:21:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    21:21:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    22:23:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):118:119 -> a
-    22:23:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    22:23:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    24:24:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
-    24:24:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):120 -> a
-    24:24:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    24:24:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    25:26:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):120:121 -> a
-    25:26:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    25:26:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    27:35:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):117:125 -> a
-    27:35:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    27:35:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    36:36:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    36:36:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):125 -> a
-    36:36:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    36:36:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    37:38:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):125:126 -> a
-    37:38:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    37:38:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    39:39:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
-    39:39:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):127 -> a
-    39:39:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    39:39:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    40:41:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):127:128 -> a
-    40:41:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    40:41:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    42:56:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):124:138 -> a
-    42:56:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    42:56:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    57:57:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    57:57:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):138 -> a
-    57:57:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    57:57:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    58:58:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):139:139 -> a
-    58:58:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    58:58:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    59:59:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):307:307 -> a
-    59:59:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):139 -> a
+    16:16:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):113:113 -> a
+    16:16:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    16:16:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    17:17:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendObjectMethod(com.android.tools.r8.graph.DexMethod):1980:1980 -> a
+    17:17:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):113 -> a
+    17:17:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    17:17:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    18:22:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):114:118 -> a
+    18:22:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    18:22:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    23:23:com.android.tools.r8.ir.code.InvokeVirtual$Builder com.android.tools.r8.ir.code.InvokeVirtual.builder():37:37 -> a
+    23:23:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):118 -> a
+    23:23:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    23:23:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    24:25:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):118:119 -> a
+    24:25:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    24:25:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    26:26:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
+    26:26:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):120 -> a
+    26:26:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    26:26:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    27:28:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):120:121 -> a
+    27:28:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    27:28:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    29:37:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):117:125 -> a
+    29:37:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    29:37:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    38:38:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
+    38:38:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):125 -> a
+    38:38:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    38:38:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    39:40:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):125:126 -> a
+    39:40:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    39:40:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    41:41:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
+    41:41:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):127 -> a
+    41:41:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    41:41:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    42:43:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):127:128 -> a
+    42:43:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    42:43:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    44:58:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):124:138 -> a
+    44:58:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    44:58:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    59:59:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
+    59:59:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):138 -> a
     59:59:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
     59:59:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
     60:60:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):139:139 -> a
     60:60:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
     60:60:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    61:61:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
-    61:61:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):140 -> a
+    61:61:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):307:307 -> a
+    61:61:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):139 -> a
     61:61:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
     61:61:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    62:64:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):140:142 -> a
-    62:64:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    62:64:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    65:65:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):112:112 -> a
-    65:65:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
-    65:65:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    66:66:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):90:90 -> a
-    66:66:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    67:67:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeToString(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):150:150 -> a
-    67:67:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):91 -> a
+    62:62:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):139:139 -> a
+    62:62:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    62:62:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    63:63:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):298:298 -> a
+    63:63:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):140 -> a
+    63:63:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    63:63:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    64:66:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):140:142 -> a
+    64:66:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
+    64:66:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    67:67:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):112:112 -> a
+    67:67:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
     67:67:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    68:81:boolean com.android.tools.r8.utils.ValueUtils.isNonNullStringBuilder(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):24:37 -> a
-    68:81:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeToString(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):150 -> a
-    68:81:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):91 -> a
-    68:81:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    82:83:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeToString(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):151:152 -> a
-    82:83:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):91 -> a
-    82:83:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    84:84:com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor):61:61 -> a
-    84:84:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor):44 -> a
+    68:68:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):90:90 -> a
+    68:68:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    69:69:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeToString(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):150:150 -> a
+    69:69:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):91 -> a
+    69:69:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    70:83:boolean com.android.tools.r8.utils.ValueUtils.isNonNullStringBuilder(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):24:37 -> a
+    70:83:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeToString(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):150 -> a
+    70:83:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):91 -> a
+    70:83:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    84:85:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeToString(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):151:152 -> a
+    84:85:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):91 -> a
+    84:85:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
+    86:86:com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor):61:61 -> a
+    86:86:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor):44 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer):44:44 -> b
     1:1:com.android.tools.r8.graph.DexType getType():66:66 -> getType
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.AX:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.VV:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap unusedBuilders -> b
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> a
     com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer this$0 -> c
@@ -69898,7 +69523,7 @@
     155:155:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):180:180 -> a
     156:156:void lambda$computeIsUnusedBuilder$0(boolean,com.android.tools.r8.ir.code.Value):180:180 -> a
     1:5:boolean isUnusedBuilder(com.android.tools.r8.ir.code.Value):168:172 -> b
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.HX:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.cW:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):32:34 -> <init>
@@ -69906,33 +69531,34 @@
     4:10:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeVirtual):61:67 -> a
     4:10:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):53 -> a
     11:12:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):54:55 -> a
-    13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    13:13:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):77 -> a
+    13:13:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):77:77 -> a
     13:13:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):55 -> a
-    14:14:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):78:78 -> a
+    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    14:14:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):77 -> a
     14:14:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):55 -> a
-    15:15:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():402:402 -> a
-    15:15:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):81 -> a
-    15:15:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):55 -> a
-    16:29:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):82:95 -> a
-    16:29:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):55 -> a
-    30:46:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):106:122 -> a
-    47:47:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    47:47:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):122 -> a
-    48:50:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):126:128 -> a
-    51:51:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    51:51:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):128 -> a
-    52:54:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):128:130 -> a
+    15:18:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):78:81 -> a
+    15:18:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):55 -> a
+    19:19:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> a
+    19:19:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):81 -> a
+    19:19:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):55 -> a
+    20:33:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):82:95 -> a
+    20:33:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):55 -> a
+    34:50:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):106:122 -> a
+    51:51:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    51:51:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):122 -> a
+    52:54:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):126:128 -> a
+    55:55:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    55:55:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):128 -> a
+    56:58:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):128:130 -> a
     1:1:com.android.tools.r8.graph.DexType getType():39:39 -> getType
-com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.Av:
+com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.Uu:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
-    1:20:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):22:41 -> a
-    21:21:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):794:794 -> a
-    21:21:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):44 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    22:27:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):49:54 -> a
-com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo -> com.android.tools.r8.internal.E3:
+    1:23:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):22:44 -> a
+    24:24:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):794:794 -> a
+    24:24:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):44 -> a
+    25:30:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):49:54 -> a
+com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo -> com.android.tools.r8.internal.C3:
     com.android.tools.r8.shaking.ProguardMemberRule rule -> b
     com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType type -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType,com.android.tools.r8.shaking.ProguardMemberRule):26:28 -> <init>
@@ -69943,9 +69569,9 @@
     1:1:boolean isAssumeValues():44:44 -> d
     1:5:boolean equals(java.lang.Object):56:60 -> equals
     1:1:int hashCode():65:65 -> hashCode
-com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup -> com.android.tools.r8.internal.F3:
+com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup -> com.android.tools.r8.internal.D3:
     1:15:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMember):35:49 -> a
-com.android.tools.r8.ir.optimize.outliner.OutlineCollection -> com.android.tools.r8.internal.vL:
+com.android.tools.r8.ir.optimize.outliner.OutlineCollection -> com.android.tools.r8.internal.rK:
     java.util.Map canonicalization -> a
     java.util.Map outlines -> c
     com.android.tools.r8.graph.GraphLens appliedGraphLens -> b
@@ -69973,7 +69599,7 @@
     48:51:void lambda$computeMethodsPerOutline$2(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMethod,java.util.List):100:103 -> a
     52:61:void lambda$computeMethodsPerOutline$2(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMethod,java.util.List):102:111 -> a
     1:5:com.android.tools.r8.utils.collections.ProgramMethodSet computeMethodsSubjectToOutlining(com.android.tools.r8.graph.AppView):84:88 -> b
-com.android.tools.r8.ir.optimize.outliner.Outliner -> com.android.tools.r8.internal.yL:
+com.android.tools.r8.ir.optimize.outliner.Outliner -> com.android.tools.r8.internal.uK:
     1:1:void <init>():19:19 -> <init>
     void collectOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing) -> a
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -69985,7 +69611,7 @@
     3:3:com.android.tools.r8.ir.optimize.outliner.Outliner empty():26:26 -> a
     void onMethodPruned(com.android.tools.r8.graph.ProgramMethod) -> b
     void rewriteWithLens() -> b
-com.android.tools.r8.ir.optimize.outliner.Outliner$1 -> com.android.tools.r8.internal.xL:
+com.android.tools.r8.ir.optimize.outliner.Outliner$1 -> com.android.tools.r8.internal.tK:
     1:1:void <init>():26:26 -> <init>
     void collectOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing) -> a
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -69993,7 +69619,7 @@
     void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens) -> a
     void onMethodPruned(com.android.tools.r8.graph.ProgramMethod) -> b
     void rewriteWithLens() -> b
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.C4:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.z4:
     1:1:java.util.List com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher.nonDestructivePeepholes():23:23 -> a
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):39 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):39:39 -> a
@@ -70009,10 +69635,10 @@
     30:42:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):67:79 -> a
     43:43:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():11:11 -> a
     43:43:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):81 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.D4:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.A4:
     boolean match(com.android.tools.r8.ir.code.InstructionListIterator) -> a
     boolean resetAfterMatch() -> a
-com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.Eh:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.lh:
     com.android.tools.r8.ir.optimize.peepholes.Point dup3Exp -> c
     com.android.tools.r8.ir.optimize.peepholes.Point dup2Exp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point dup1Exp -> a
@@ -70024,7 +69650,7 @@
     2:2:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):31 -> a
     3:3:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     4:37:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:74 -> a
-    38:38:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    38:38:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     38:38:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):75 -> a
     39:39:void com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper.resetPrevious(com.android.tools.r8.ir.code.InstructionListIterator,int):33:33 -> a
     39:39:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):78 -> a
@@ -70036,7 +69662,7 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> c
     2:2:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35 -> c
     3:3:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35:35 -> c
-com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.FC:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.OB:
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point lastLoadExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
@@ -70045,12 +69671,12 @@
     1:8:void <init>():30:37 -> <init>
     boolean resetAfterMatch() -> a
     1:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:64 -> a
-    25:25:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    25:25:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     25:25:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):64 -> a
-com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.dE:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.kD:
     java.util.List instructions -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[],java.util.List):14:16 -> <init>
-com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.aG:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.XE:
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoad -> d
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> e
     com.android.tools.r8.ir.code.Instruction insertPosition -> c
@@ -70083,12 +69709,12 @@
     12:12:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
     12:12:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):59 -> b
     13:13:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):60:60 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.dM:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.ZK:
     int getMin() -> a
     void setIndex(int) -> a
     java.util.function.Predicate getPredicate() -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.eM:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.aL:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
@@ -70099,7 +69725,7 @@
     23:23:boolean lambda$moveInstructionsUpToCurrentPosition$1(java.util.List,com.android.tools.r8.ir.code.Instruction):66:66 -> a
     1:4:int numberOfValuesPutOnStack(com.android.tools.r8.ir.code.Instruction):38:41 -> b
     5:5:boolean lambda$moveInstructionsUpToCurrentPosition$2(java.util.List,com.android.tools.r8.ir.code.Instruction):72:72 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.fM:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.bL:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -70108,7 +69734,7 @@
     2:5:com.android.tools.r8.ir.optimize.peepholes.Match test(com.android.tools.r8.ir.code.InstructionListIterator):37:40 -> a
     6:42:com.android.tools.r8.ir.optimize.peepholes.Match testDirection(java.util.function.Supplier,java.util.function.Supplier,java.lang.Runnable):48:84 -> a
     1:1:com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout lookForward(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[]):29:29 -> b
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.pM:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.kL:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -70120,7 +69746,7 @@
     3:3:com.android.tools.r8.ir.code.Instruction get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
     1:1:java.util.function.Predicate getPredicate():21:21 -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.dT:
+com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.FR:
     com.android.tools.r8.ir.optimize.peepholes.Point secondInstructionExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point debugPositionExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
@@ -70130,14 +69756,14 @@
     boolean lambda$match$0(com.android.tools.r8.ir.code.DebugPosition,com.android.tools.r8.ir.code.Instruction) -> a
     boolean resetAfterMatch() -> a
     1:33:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):52:84 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.qX:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.LV:
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
     1:6:void <init>():22:27 -> <init>
     boolean resetAfterMatch() -> a
     1:18:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):31:48 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.rX:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.MV:
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> d
@@ -70156,7 +69782,7 @@
     24:24:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> a
     24:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):62 -> a
     25:43:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):62:80 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.sX:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.NV:
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> c
     com.android.tools.r8.ir.code.Store store -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> f
@@ -70171,7 +69797,7 @@
     2:2:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):42 -> a
     3:9:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):43:49 -> a
     10:50:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):85:125 -> a
-    51:51:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    51:51:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     51:51:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):125 -> a
     52:52:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):126:126 -> a
     1:1:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):56:56 -> b
@@ -70182,7 +69808,7 @@
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> c
     3:3:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):73 -> c
     4:5:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):74:75 -> c
-com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.C30:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.O10:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -70194,537 +69820,8 @@
     3:3:java.util.List get(com.android.tools.r8.ir.optimize.peepholes.Match):42:42 -> a
     1:1:java.util.function.Predicate getPredicate():22:22 -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.internal.ab:
-    com.android.tools.r8.graph.DexItemFactory factory -> b
-    com.android.tools.r8.graph.GraphLens graphLensForOptimizationPass -> d
-    java.util.concurrent.ConcurrentHashMap candidates -> g
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set prunedMethods -> f
-    boolean $assertionsDisabled -> h
-    java.util.Map referencedFrom -> e
-    com.android.tools.r8.ir.conversion.IRConverter converter -> c
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):113:113 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):105:116 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):54:54 -> a
-    2:2:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):124:124 -> a
-    3:4:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens):128:129 -> a
-    5:7:void lambda$prepareForSecondaryOptimizationPass$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):142:144 -> a
-    8:66:void collectCandidates():153:211 -> a
-    67:69:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):167:169 -> a
-    70:71:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):231:232 -> a
-    70:71:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):171 -> a
-    72:73:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):176:177 -> a
-    74:75:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):231:232 -> a
-    74:75:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):177 -> a
-    76:77:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):181:182 -> a
-    78:79:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):231:232 -> a
-    78:79:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):183 -> a
-    80:80:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
-    80:80:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):185 -> a
-    81:81:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):186:186 -> a
-    82:83:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):231:232 -> a
-    82:83:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):186 -> a
-    84:96:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):191:203 -> a
-    97:98:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):231:232 -> a
-    97:98:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):203 -> a
-    99:104:void lambda$collectCandidates$2(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):213:218 -> a
-    105:110:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):237:242 -> a
-    105:110:void lambda$collectCandidates$2(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):220 -> a
-    111:114:void lambda$collectCandidates$2(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):221:224 -> a
-    115:128:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):272:285 -> a
-    129:142:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):282:295 -> a
-    143:146:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):582:585 -> a
-    143:146:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
-    147:147:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    147:147:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):585 -> a
-    147:147:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
-    148:153:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):586:591 -> a
-    148:153:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
-    154:154:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    154:154:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):594 -> a
-    154:154:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
-    155:160:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):594:599 -> a
-    155:160:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
-    161:183:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):298:320 -> a
-    184:184:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():83:83 -> a
-    184:184:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):142 -> a
-    184:184:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):320 -> a
-    185:185:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):143:143 -> a
-    185:185:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):320 -> a
-    186:195:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):320:329 -> a
-    196:204:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):441:449 -> a
-    196:204:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330 -> a
-    205:205:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):86:86 -> a
-    205:205:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):452 -> a
-    205:205:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330 -> a
-    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> a
-    206:206:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):86 -> a
-    206:206:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):452 -> a
-    206:206:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330 -> a
-    207:247:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):455:495 -> a
-    207:247:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330 -> a
-    248:248:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):530:530 -> a
-    248:248:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):495 -> a
-    248:248:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330 -> a
-    249:264:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):498:513 -> a
-    249:264:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330 -> a
-    265:271:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):565:571 -> a
-    265:271:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):514 -> a
-    265:271:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330 -> a
-    272:278:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):515:521 -> a
-    272:278:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330 -> a
-    279:282:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isSelectedValueUsersValid(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set):665:668 -> a
-    279:282:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):523 -> a
-    279:282:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330 -> a
-    283:283:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):524:524 -> a
-    283:283:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330 -> a
-    284:284:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):332:332 -> a
-    285:285:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    285:285:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):332 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    286:292:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):332:338 -> a
-    293:294:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):432:433 -> a
-    293:294:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):338 -> a
-    295:295:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    295:295:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):434 -> a
-    295:295:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):338 -> a
-    296:296:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):435:435 -> a
-    296:296:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):338 -> a
-    297:302:boolean com.android.tools.r8.ir.code.Goto.isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):108:113 -> a
-    297:302:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):435 -> a
-    297:302:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):338 -> a
-    303:303:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):436:436 -> a
-    303:303:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):338 -> a
-    304:321:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):339:356 -> a
-    322:322:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    322:322:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):361 -> a
-    323:323:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):363:363 -> a
-    324:332:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):612:620 -> a
-    324:332:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):363 -> a
-    333:339:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):619:625 -> a
-    333:339:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):363 -> a
-    340:342:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):365:367 -> a
-    343:343:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    343:343:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):369 -> a
-    344:352:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):369:377 -> a
-    353:362:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):633:642 -> a
-    353:362:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):377 -> a
-    363:365:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):379:381 -> a
-    366:366:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    366:366:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):383 -> a
-    367:378:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):383:394 -> a
-    379:379:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
-    379:379:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):399 -> a
-    380:382:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):401:403 -> a
-    383:383:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    383:383:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):407 -> a
-    384:389:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):407:412 -> a
-    390:397:void addReferencedFrom(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.graph.ProgramMethod):420:427 -> a
-    398:398:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$addReferencedFrom$3(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):426:426 -> a
-    399:424:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):535:560 -> a
-    425:425:boolean lambda$isValidInitCall$4(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):545:545 -> a
-    426:431:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):649:654 -> a
-    432:435:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isSelectedValueUsersValid(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set):665:668 -> a
-    432:435:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):653 -> a
-    436:436:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):655:655 -> a
-    437:437:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):684:684 -> a
-    438:438:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    438:438:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):684 -> a
-    439:470:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):685:716 -> a
-    471:471:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):740:740 -> a
-    1:1:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):124:124 -> b
-    1:1:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):120 -> b
-    2:11:void prepareForSecondaryOptimizationPass(com.android.tools.r8.graph.GraphLens):137:146 -> b
-    12:12:boolean lambda$isValidValueUser$5(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):693:693 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.Ya:
-    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> e
-    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):745:746 -> <init>
-    1:2:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerMethod(com.android.tools.r8.graph.DexMethod):750:751 -> a
-    1:2:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):771 -> a
-    3:4:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerField(com.android.tools.r8.graph.DexField):755:756 -> a
-    3:4:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):796 -> a
-    1:2:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerMethod(com.android.tools.r8.graph.DexMethod):750:751 -> b
-    1:2:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):781 -> b
-    3:3:void registerInitClass(com.android.tools.r8.graph.DexType):761:761 -> b
-    1:2:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerField(com.android.tools.r8.graph.DexField):755:756 -> c
-    1:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):791 -> c
-    3:3:void registerInstanceOf(com.android.tools.r8.graph.DexType):824:824 -> c
-    1:2:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerMethod(com.android.tools.r8.graph.DexMethod):750:751 -> d
-    1:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):776 -> d
-    3:3:void registerNewInstance(com.android.tools.r8.graph.DexType):801:801 -> d
-    1:2:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerField(com.android.tools.r8.graph.DexField):755:756 -> e
-    1:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):806 -> e
-    1:2:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerMethod(com.android.tools.r8.graph.DexMethod):750:751 -> f
-    1:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):786 -> f
-    3:5:void registerTypeReference(com.android.tools.r8.graph.DexType):816:818 -> f
-    1:2:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerMethod(com.android.tools.r8.graph.DexMethod):750:751 -> g
-    1:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):766 -> g
-    3:4:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerField(com.android.tools.r8.graph.DexField):755:756 -> g
-    3:4:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):811 -> g
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.internal.Za:
-    java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
-    com.android.tools.r8.graph.DexEncodedField singletonField -> b
-    java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
-    java.util.concurrent.atomic.AtomicReference getter -> g
-    boolean $assertionsDisabled -> i
-    java.util.concurrent.atomic.AtomicBoolean preserveRead -> c
-    com.android.tools.r8.graph.DexProgramClass candidate -> a
-    java.util.concurrent.atomic.AtomicReference constructor -> f
-    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> h
-    1:1:void <clinit>():64:64 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):75:75 -> <init>
-    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):67:82 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():100:100 -> a
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.bb:
-    boolean $assertionsDisabled -> n
-    1:1:void <clinit>():14:14 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap):20:20 -> <init>
-    1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):25:27 -> b
-com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.oX:
-    com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> b
-    com.android.tools.r8.utils.collections.ProgramMethodSet methodsToReprocess -> d
-    boolean $assertionsDisabled -> l
-    com.android.tools.r8.utils.collections.ProgramMethodSet methodsToBeStaticized -> h
-    java.util.Map singletonFields -> i
-    java.util.Map singletonGetters -> j
-    com.android.tools.r8.utils.collections.ProgramMethodSet referencingExtraMethods -> f
-    java.util.Map candidateToHostMapping -> k
-    java.util.Map processingQueue -> e
-    com.android.tools.r8.ir.conversion.IRConverter converter -> c
-    java.util.Map hostClassInits -> g
-    1:1:void <clinit>():71:71 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):93:93 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):77:96 -> <init>
-    1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():94:94 -> a
-    1:1:void lambda$run$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):114 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():94 -> a
-    2:2:void lambda$run$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):114 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:4:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():94:95 -> a
-    3:4:void lambda$run$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):114 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:void lambda$run$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):114:114 -> a
-    6:9:void lambda$run$1(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):118:121 -> a
-    10:10:void lambda$run$2(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):127:127 -> a
-    11:20:java.util.Map finalEligibilityCheck():163:172 -> a
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> a
-    21:21:java.util.Map finalEligibilityCheck():173 -> a
-    22:93:java.util.Map finalEligibilityCheck():174:245 -> a
-    94:94:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):138:138 -> a
-    94:94:java.util.Map finalEligibilityCheck():245 -> a
-    95:108:java.util.Map finalEligibilityCheck():245:258 -> a
-    109:109:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.util.Iterator):84:84 -> a
-    109:109:java.util.Map finalEligibilityCheck():258 -> a
-    110:133:java.util.Map finalEligibilityCheck():258:281 -> a
-    134:134:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    134:134:java.util.Map finalEligibilityCheck():281 -> a
-    135:135:java.util.Map finalEligibilityCheck():281:281 -> a
-    136:136:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    136:136:java.util.Map finalEligibilityCheck():283 -> a
-    137:141:java.util.Map finalEligibilityCheck():284:288 -> a
-    142:155:java.util.Map finalEligibilityCheck():287:300 -> a
-    156:164:com.android.tools.r8.utils.TraversalContinuation lambda$finalEligibilityCheck$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):218:226 -> a
-    165:170:com.android.tools.r8.utils.TraversalContinuation lambda$finalEligibilityCheck$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):225:230 -> a
-    171:171:boolean lambda$finalEligibilityCheck$7(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):261:261 -> a
-    172:172:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    172:172:boolean lambda$finalEligibilityCheck$7(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):261 -> a
-    173:181:boolean lambda$finalEligibilityCheck$7(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):262:270 -> a
-    182:185:void prepareCandidates(java.util.Map):309:312 -> a
-    186:186:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():94:94 -> a
-    186:186:void prepareCandidates(java.util.Map):314 -> a
-    187:187:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> a
-    187:187:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():94 -> a
-    187:187:void prepareCandidates(java.util.Map):314 -> a
-    188:189:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():94:95 -> a
-    188:189:void prepareCandidates(java.util.Map):314 -> a
-    190:211:void prepareCandidates(java.util.Map):315:336 -> a
-    212:213:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):345:346 -> a
-    212:213:void prepareCandidates(java.util.Map):337 -> a
-    214:214:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
-    214:214:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):346 -> a
-    214:214:void prepareCandidates(java.util.Map):337 -> a
-    215:216:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):347:348 -> a
-    215:216:void prepareCandidates(java.util.Map):337 -> a
-    217:220:void prepareCandidates(java.util.Map):338:341 -> a
-    221:223:boolean lambda$prepareCandidates$8(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):323:325 -> a
-    224:228:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):356:360 -> a
-    229:229:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):359:359 -> a
-    230:230:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):358:358 -> a
-    231:231:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder lambda$enqueueMethodsWithCodeOptimizations$9(com.android.tools.r8.graph.DexEncodedMethod):360:360 -> a
-    232:244:void processMethodsConcurrently(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):376:388 -> a
-    245:248:void lambda$processMethodsConcurrently$10(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):380:380 -> a
-    249:252:void forEachMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor):397:400 -> a
-    253:253:void lambda$forEachMethod$11(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,java.util.function.BiConsumer):398:398 -> a
-    254:256:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):404:406 -> a
-    257:257:java.util.function.BiConsumer collectOptimizationInfo(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):412:412 -> a
-    258:267:void lambda$collectOptimizationInfo$12(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):413:413 -> a
-    268:268:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):484:484 -> a
-    269:269:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    269:269:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):484 -> a
-    270:272:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):484:486 -> a
-    273:277:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):485:489 -> a
-    278:278:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):488:488 -> a
-    279:299:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):517:537 -> a
-    300:304:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):544:548 -> a
-    305:308:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):547:550 -> a
-    309:309:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    309:309:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):552 -> a
-    310:312:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):552:554 -> a
-    313:313:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    313:313:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):555 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    314:323:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):555:564 -> a
-    324:335:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):603:614 -> a
-    336:336:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    336:336:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):614 -> a
-    337:337:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):614:614 -> a
-    338:338:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    338:338:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):617 -> a
-    339:353:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):617:631 -> a
-    354:360:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):639:645 -> a
-    361:364:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):644:647 -> a
-    365:365:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    365:365:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):649 -> a
-    366:368:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):649:651 -> a
-    369:369:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    369:369:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):652 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    370:379:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):652:661 -> a
-    380:381:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):665:666 -> a
-    382:382:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    382:382:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):666 -> a
-    383:396:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):669:682 -> a
-    397:397:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):681:681 -> a
-    398:402:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):798:802 -> a
-    403:403:boolean lambda$classMembersConflict$14(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):800:800 -> a
-    404:404:boolean lambda$classMembersConflict$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):802:802 -> a
-    405:409:boolean hasMembersNotStaticized(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):808:812 -> a
-    1:31:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):103:133 -> b
-    32:32:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():753:753 -> b
-    32:32:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    33:33:void com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.<init>():22:22 -> b
-    33:33:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():753 -> b
-    33:33:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    34:34:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():755:755 -> b
-    34:34:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    35:35:void com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.<init>():22:22 -> b
-    35:35:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():755 -> b
-    35:35:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    36:44:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():758:766 -> b
-    36:44:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    45:45:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():895:895 -> b
-    45:45:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():767 -> b
-    45:45:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    46:49:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():767:770 -> b
-    46:49:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    50:50:boolean com.android.tools.r8.utils.collections.ProgramMethodSet.createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> b
-    50:50:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():770 -> b
-    50:50:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    51:55:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():771:775 -> b
-    51:55:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> b
-    56:56:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():778 -> b
-    56:56:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    57:61:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779:783 -> b
-    57:61:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    62:73:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):822:833 -> b
-    62:73:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    62:73:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    74:74:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):887:887 -> b
-    74:74:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):833 -> b
-    74:74:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    74:74:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    75:75:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():895:895 -> b
-    75:75:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):888 -> b
-    75:75:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):833 -> b
-    75:75:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    75:75:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    76:77:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):889:890 -> b
-    76:77:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):833 -> b
-    76:77:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    76:77:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    78:78:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):888:888 -> b
-    78:78:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):833 -> b
-    78:78:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    78:78:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    79:80:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):834:835 -> b
-    79:80:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    79:80:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    81:81:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> b
-    81:81:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):835 -> b
-    81:81:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    81:81:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    82:92:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):835:845 -> b
-    82:92:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    82:92:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    93:93:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):887:887 -> b
-    93:93:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):845 -> b
-    93:93:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    93:93:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    94:94:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():895:895 -> b
-    94:94:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):888 -> b
-    94:94:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):845 -> b
-    94:94:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    94:94:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    95:96:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):889:890 -> b
-    95:96:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):845 -> b
-    95:96:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    95:96:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    97:97:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):888:888 -> b
-    97:97:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):845 -> b
-    97:97:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    97:97:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    98:99:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):846:847 -> b
-    98:99:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    98:99:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    100:100:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> b
-    100:100:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):847 -> b
-    100:100:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    100:100:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    101:111:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):847:857 -> b
-    101:111:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    101:111:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    112:112:boolean com.android.tools.r8.graph.MethodCollection.hasDirectMethods():66:66 -> b
-    112:112:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):857 -> b
-    112:112:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    112:112:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    113:116:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):861:864 -> b
-    113:116:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    113:116:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    117:117:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():895:895 -> b
-    117:117:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):867 -> b
-    117:117:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    117:117:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    118:118:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):868:868 -> b
-    118:118:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    118:118:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    119:124:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):866:871 -> b
-    119:124:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    119:124:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    125:125:boolean com.android.tools.r8.utils.collections.ProgramMethodSet.createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> b
-    125:125:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):874 -> b
-    125:125:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    125:125:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    126:133:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):876:883 -> b
-    126:133:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785 -> b
-    126:133:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    134:135:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():791:792 -> b
-    134:135:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    136:153:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):142:159 -> b
-    154:157:void lambda$run$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):147:150 -> b
-    158:158:boolean lambda$finalEligibilityCheck$4(com.android.tools.r8.graph.DexEncodedMethod):209:209 -> b
-    159:170:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):425:436 -> b
-    171:171:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():895:895 -> b
-    171:171:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):436 -> b
-    172:179:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):436:443 -> b
-    180:180:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> b
-    180:180:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):443 -> b
-    181:181:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):444:444 -> b
-    182:182:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):327:327 -> b
-    182:182:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):445 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    183:189:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):448:454 -> b
-    190:190:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):327:327 -> b
-    190:190:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):455 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    191:194:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):457:460 -> b
-    195:195:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):459:459 -> b
-    196:196:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):327:327 -> b
-    196:196:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):463 -> b
-    197:197:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):469:469 -> b
-    1:1:boolean lambda$finalEligibilityCheck$6(com.android.tools.r8.graph.DexEncodedMethod):232:232 -> c
-    2:2:void removeReferencesToThis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):474:474 -> c
-    1:1:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):481:481 -> d
-    2:2:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.util.Iterator):84:84 -> d
-    2:2:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):481 -> d
-    3:16:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):481:494 -> d
-    17:17:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> d
-    17:17:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):494 -> d
-    18:29:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):495:506 -> d
-    30:30:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):327:327 -> d
-    30:30:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):507 -> d
-    31:31:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):510:510 -> d
-    32:32:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> d
-    32:32:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):688 -> d
-    32:32:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    33:36:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):689:692 -> d
-    33:36:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    37:37:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> d
-    37:37:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):692 -> d
-    37:37:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    38:39:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):693:694 -> d
-    38:39:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    40:40:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapFieldIfMoved(com.android.tools.r8.graph.DexField):741:741 -> d
-    40:40:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):694 -> d
-    40:40:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    41:41:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():895:895 -> d
-    41:41:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapFieldIfMoved(com.android.tools.r8.graph.DexField):743 -> d
-    41:41:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):694 -> d
-    41:41:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    42:44:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapFieldIfMoved(com.android.tools.r8.graph.DexField):743:745 -> d
-    42:44:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):694 -> d
-    42:44:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    45:45:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():895:895 -> d
-    45:45:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapFieldIfMoved(com.android.tools.r8.graph.DexField):747 -> d
-    45:45:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):694 -> d
-    45:45:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    46:46:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapFieldIfMoved(com.android.tools.r8.graph.DexField):747:747 -> d
-    46:46:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):694 -> d
-    46:46:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    47:54:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):695:702 -> d
-    47:54:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    55:57:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):701:703 -> d
-    55:57:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    58:58:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):700:700 -> d
-    58:58:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    59:59:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> d
-    59:59:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):698 -> d
-    59:59:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    60:62:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):709:711 -> d
-    60:62:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    63:63:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapFieldIfMoved(com.android.tools.r8.graph.DexField):741:741 -> d
-    63:63:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):711 -> d
-    63:63:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    64:64:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():895:895 -> d
-    64:64:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapFieldIfMoved(com.android.tools.r8.graph.DexField):743 -> d
-    64:64:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):711 -> d
-    64:64:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    65:67:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapFieldIfMoved(com.android.tools.r8.graph.DexField):743:745 -> d
-    65:67:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):711 -> d
-    65:67:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    68:68:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():895:895 -> d
-    68:68:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapFieldIfMoved(com.android.tools.r8.graph.DexField):747 -> d
-    68:68:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):711 -> d
-    68:68:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    69:69:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.mapFieldIfMoved(com.android.tools.r8.graph.DexField):747:747 -> d
-    69:69:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):711 -> d
-    69:69:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    70:71:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):712:713 -> d
-    70:71:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    72:72:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> d
-    72:72:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):713 -> d
-    72:72:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    73:76:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):718:721 -> d
-    73:76:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    77:77:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():895:895 -> d
-    77:77:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):723 -> d
-    77:77:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    78:86:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):723:731 -> d
-    78:86:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    87:89:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):730:732 -> d
-    87:89:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    90:94:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):729:733 -> d
-    90:94:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-    95:95:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> d
-    95:95:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):733 -> d
-    95:95:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):511 -> d
-com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis -> com.android.tools.r8.ir.optimize.string.d:
-com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$1 -> com.android.tools.r8.ir.optimize.string.a:
-com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl -> com.android.tools.r8.ir.optimize.string.b:
+com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis -> com.android.tools.r8.ir.optimize.string.c:
+com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl -> com.android.tools.r8.ir.optimize.string.a:
     java.util.Set liveAppendInstructions -> a
     com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl BOTTOM -> b
     1:1:void <clinit>():53:53 -> <clinit>
@@ -70733,19 +69830,19 @@
     3:3:void <clinit>():53:53 -> <clinit>
     1:2:void <init>(java.util.Set):63:64 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> a
-    1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):51:51 -> a
-    2:10:com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl join(com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl):89:97 -> a
-    2:10:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):51 -> a
-    11:11:boolean isAppendInstructionLive(com.android.tools.r8.ir.code.InvokeVirtual):79:79 -> a
-    11:11:boolean access$100(com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl,com.android.tools.r8.ir.code.InvokeVirtual):51 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:4:com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl addLiveAppendInstruction(com.android.tools.r8.ir.code.InvokeVirtual):72:75 -> b
-    1:4:com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl access$200(com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl,com.android.tools.r8.ir.code.InvokeVirtual):51 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:boolean access$100(com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl,com.android.tools.r8.ir.code.InvokeVirtual):51:51 -> a
+    2:2:boolean isAppendInstructionLive(com.android.tools.r8.ir.code.InvokeVirtual):79:79 -> a
+    2:2:boolean access$100(com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl,com.android.tools.r8.ir.code.InvokeVirtual):51 -> a
+    3:3:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):51:51 -> a
+    4:12:com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl join(com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl):89:97 -> a
+    4:12:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):51 -> a
+    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl access$200(com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl,com.android.tools.r8.ir.code.InvokeVirtual):51:51 -> b
+    2:5:com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl addLiveAppendInstruction(com.android.tools.r8.ir.code.InvokeVirtual):72:75 -> b
+    2:5:com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl access$200(com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl,com.android.tools.r8.ir.code.InvokeVirtual):51 -> b
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl bottom():68:68 -> d
     1:5:boolean equals(java.lang.Object):102:106 -> equals
     1:1:int hashCode():111:111 -> hashCode
-com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$TransferFunction -> com.android.tools.r8.ir.optimize.string.c:
+com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$TransferFunction -> com.android.tools.r8.ir.optimize.string.b:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration configuration -> b
     com.android.tools.r8.ir.code.Value builder -> a
     boolean $assertionsDisabled -> c
@@ -70769,7 +69866,7 @@
     16:16:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl,com.android.tools.r8.ir.code.InvokeMethod):154:154 -> a
     16:16:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl):138 -> a
     16:16:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):124 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.ir.optimize.string.e:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.ir.optimize.string.d:
     boolean isBuilderInit(com.android.tools.r8.graph.DexMethod) -> a
     boolean isBuilderInit(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType) -> a
     boolean isBuilderInitWithInitialValue(com.android.tools.r8.ir.code.InvokeMethod) -> a
@@ -70777,7 +69874,7 @@
     boolean isSupportedAppendMethod(com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isToStringMethod(com.android.tools.r8.graph.DexMethod) -> b
     boolean isAppendMethod(com.android.tools.r8.graph.DexMethod) -> c
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.ir.optimize.string.g:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.ir.optimize.string.e:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int numberOfBuildersSimplified -> n
     int numberOfBuildersWithNonDeterministicArg -> l
@@ -70832,15 +69929,14 @@
     1:1:com.android.tools.r8.graph.DexItemFactory access$700(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):84:84 -> n
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$800(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):84:84 -> o
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$900(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):84:84 -> p
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$1 -> com.android.tools.r8.ir.optimize.string.f:
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState -> com.android.tools.r8.ir.optimize.string.g$a:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState -> com.android.tools.r8.ir.optimize.string.e$a:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState previous -> a
     java.util.Set nexts -> c
     java.lang.String addition -> b
     1:4:void <init>():1002:1005 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState createRoot():1009:1009 -> a
     2:8:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState createChild(java.lang.String):1013:1019 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration -> com.android.tools.r8.ir.optimize.string.h:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration -> com.android.tools.r8.ir.optimize.string.f:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():822:822 -> <clinit>
@@ -70858,7 +69954,7 @@
     31:31:boolean isSupportedAppendMethod(com.android.tools.r8.ir.code.InvokeMethod):876 -> a
     1:4:boolean isToStringMethod(com.android.tools.r8.graph.DexMethod):883:886 -> b
     1:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):851:852 -> c
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringBuilderOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.ir.optimize.string.i:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringBuilderOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.ir.optimize.string.g:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> b
     com.android.tools.r8.graph.DexType builderType -> a
     boolean $assertionsDisabled -> c
@@ -70871,7 +69967,7 @@
     12:12:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):927 -> a
     13:76:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):928:991 -> a
     77:77:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):918:918 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.ir.optimize.string.g$b:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.ir.optimize.string.e$b:
     java.util.Map builderStates -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap builderToStringCounts -> b
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> f
@@ -70884,95 +69980,88 @@
     2:377:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):212:587 -> <init>
     378:378:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):215:215 -> <init>
     1:1:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):200:200 -> a
-    2:24:java.util.Set findAllLocalBuilders():226:248 -> a
-    25:27:java.util.Set collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value):261:263 -> a
-    25:27:java.util.Set findAllLocalBuilders():249 -> a
-    28:36:java.util.Set findAllLocalBuilders():249:257 -> a
-    37:45:void collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):268:276 -> a
-    46:69:boolean canBeOptimized(com.android.tools.r8.ir.code.Value):284:307 -> a
-    46:69:boolean access$2000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,com.android.tools.r8.ir.code.Value):200 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    70:70:java.util.Map createBuilderState(com.android.tools.r8.ir.code.Value):316:316 -> a
-    71:99:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):350:378 -> a
-    71:99:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    100:100:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):321:321 -> a
-    100:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):379 -> a
-    100:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    101:130:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):380:409 -> a
-    101:130:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    131:131:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):321:321 -> a
-    131:131:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):410 -> a
-    131:131:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    132:145:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):411:424 -> a
-    132:145:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    146:146:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):321:321 -> a
-    146:146:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):427 -> a
-    146:146:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    147:155:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):428:436 -> a
-    147:155:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    156:160:java.lang.String extractConstantArgument(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):446:450 -> a
-    161:161:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    161:161:java.lang.String extractConstantArgument(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):450 -> a
-    162:188:java.lang.String extractConstantArgument(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):451:477 -> a
-    189:196:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState findDominantState(com.android.tools.r8.ir.code.DominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction):534:541 -> a
-    197:216:void logHistogramOfChains(java.util.List,boolean):549:568 -> a
-    217:233:void logHistogramOfChains(java.util.List,boolean):563:579 -> a
-    234:234:void logHistogramOfChains(java.util.List,boolean):574:574 -> a
-    235:236:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):590:591 -> a
-    237:237:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
-    237:237:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):591 -> a
-    238:272:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):592:626 -> a
-    273:276:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):625:628 -> a
-    277:277:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
-    277:277:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):628 -> a
-    278:279:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):629:630 -> a
-    280:284:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):603:607 -> a
-    285:288:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):605:608 -> a
-    289:289:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
-    289:289:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):608 -> a
-    290:314:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):610:634 -> a
-    315:315:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    315:315:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):634 -> a
-    316:316:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):634:634 -> a
-    317:343:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):640:666 -> a
-    317:343:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):593 -> a
-    344:389:java.lang.String toCompileTimeString(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):678:723 -> a
-    390:393:boolean com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis.hasAppendInstructionInLoop(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration):43:46 -> a
-    390:393:java.lang.String toCompileTimeString(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):723 -> a
-    394:394:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult.isFailedAnalysisResult():0:0 -> a
-    394:394:boolean com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis.hasAppendInstructionInLoop(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration):47 -> a
-    394:394:java.lang.String toCompileTimeString(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):723 -> a
-    395:395:java.lang.String toCompileTimeString(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):727:727 -> a
+    2:2:boolean access$2000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,com.android.tools.r8.ir.code.Value):200:200 -> a
+    3:26:boolean canBeOptimized(com.android.tools.r8.ir.code.Value):284:307 -> a
+    3:26:boolean access$2000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,com.android.tools.r8.ir.code.Value):200 -> a
+    27:49:java.util.Set findAllLocalBuilders():226:248 -> a
+    50:52:java.util.Set collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value):261:263 -> a
+    50:52:java.util.Set findAllLocalBuilders():249 -> a
+    53:61:java.util.Set findAllLocalBuilders():249:257 -> a
+    62:70:void collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):268:276 -> a
+    71:71:java.util.Map createBuilderState(com.android.tools.r8.ir.code.Value):316:316 -> a
+    72:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):350:378 -> a
+    72:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
+    101:101:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):321:321 -> a
+    101:101:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):379 -> a
+    101:101:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
+    102:131:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):380:409 -> a
+    102:131:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
+    132:132:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):321:321 -> a
+    132:132:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):410 -> a
+    132:132:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
+    133:146:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):411:424 -> a
+    133:146:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
+    147:147:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):321:321 -> a
+    147:147:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):427 -> a
+    147:147:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
+    148:156:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):428:436 -> a
+    148:156:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200 -> a
+    157:161:java.lang.String extractConstantArgument(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):446:450 -> a
+    162:162:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    162:162:java.lang.String extractConstantArgument(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):450 -> a
+    163:189:java.lang.String extractConstantArgument(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):451:477 -> a
+    190:197:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState findDominantState(com.android.tools.r8.ir.code.DominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction):534:541 -> a
+    198:217:void logHistogramOfChains(java.util.List,boolean):549:568 -> a
+    218:234:void logHistogramOfChains(java.util.List,boolean):563:579 -> a
+    235:235:void logHistogramOfChains(java.util.List,boolean):574:574 -> a
+    236:237:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):590:591 -> a
+    238:238:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
+    238:238:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):591 -> a
+    239:273:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):592:626 -> a
+    274:277:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):625:628 -> a
+    278:278:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    278:278:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):628 -> a
+    279:280:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):629:630 -> a
+    281:285:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):603:607 -> a
+    286:289:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):605:608 -> a
+    290:290:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    290:290:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):608 -> a
+    291:315:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):610:634 -> a
+    316:316:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    316:316:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):634 -> a
+    317:317:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):634:634 -> a
+    318:344:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):640:666 -> a
+    318:344:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):593 -> a
+    345:390:java.lang.String toCompileTimeString(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):678:723 -> a
+    391:394:boolean com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis.hasAppendInstructionInLoop(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration):43:46 -> a
+    391:394:java.lang.String toCompileTimeString(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):723 -> a
+    395:395:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult.isFailedAnalysisResult():0:0 -> a
+    395:395:boolean com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis.hasAppendInstructionInLoop(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration):47 -> a
+    395:395:java.lang.String toCompileTimeString(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):723 -> a
+    396:396:java.lang.String toCompileTimeString(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):727:727 -> a
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):200:200 -> b
     2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):484:522 -> b
     41:49:void removeTrivialBuilders():731:739 -> b
-    50:50:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> b
+    50:50:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> b
     50:50:void removeTrivialBuilders():739 -> b
     51:59:void removeTrivialBuilders():741:749 -> b
-    60:60:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
+    60:60:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> b
     60:60:void removeTrivialBuilders():749 -> b
     61:83:void removeTrivialBuilders():753:775 -> b
-    84:84:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> b
+    84:84:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> b
     84:84:void removeTrivialBuilders():775 -> b
     85:100:void removeTrivialBuilders():776:791 -> b
     101:101:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     101:101:void removeTrivialBuilders():795 -> b
     102:112:void removeTrivialBuilders():795:805 -> b
-    113:113:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> b
+    113:113:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> b
     113:113:void removeTrivialBuilders():805 -> b
     114:124:void removeTrivialBuilders():806:816 -> b
     125:125:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
     125:125:void removeTrivialBuilders():816 -> b
     126:128:void removeTrivialBuilders():816:818 -> b
     1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):316:316 -> c
-com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.JX:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.eW:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -70991,39 +70080,39 @@
     35:37:void lambda$logResult$0(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):84:84 -> a
     38:40:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):98:98 -> a
     41:44:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):131:134 -> a
-    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):135 -> a
     46:62:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):136:152 -> a
     63:63:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     63:63:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):153 -> a
     64:97:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):154:187 -> a
     98:101:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):186:189 -> a
-    102:102:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    102:102:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     102:102:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):189 -> a
     103:109:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):190:196 -> a
     110:110:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     110:110:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):196 -> a
     111:115:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):199:203 -> a
     116:119:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):202:205 -> a
-    120:120:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    120:120:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     120:120:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):205 -> a
     121:169:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):206:254 -> a
     170:170:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     170:170:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):255 -> a
     171:180:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):256:265 -> a
-    181:181:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1150:1150 -> a
+    181:181:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1174:1174 -> a
     181:181:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):266 -> a
     182:184:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):268:270 -> a
     185:185:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     185:185:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):271 -> a
     186:189:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):272:275 -> a
-    190:190:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1150:1150 -> a
+    190:190:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1174:1174 -> a
     190:190:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):276 -> a
     191:199:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):278:286 -> a
-    200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1150:1150 -> a
+    200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1174:1174 -> a
     200:200:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):287 -> a
     201:201:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):290:290 -> a
-    202:202:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    202:202:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     202:202:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):291 -> a
     203:204:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):294:295 -> a
     205:205:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
@@ -71033,27 +70122,26 @@
     211:211:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):233:233 -> a
     212:212:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):239:239 -> a
     213:213:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):301:301 -> a
-    214:214:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    214:214:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     214:214:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):302 -> a
     215:222:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):303:310 -> a
     223:223:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1584:1584 -> a
     223:223:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):310 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     224:243:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):314:333 -> a
     244:244:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     244:244:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):334 -> a
     245:321:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):335:411 -> a
     322:323:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):393:394 -> a
-    324:324:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    324:324:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     324:324:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):395 -> a
     325:352:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):414:441 -> a
     353:355:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):440:442 -> a
-    356:356:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    356:356:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     356:356:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):443 -> a
     357:363:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.graph.DexString):469:475 -> a
     357:363:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):444 -> a
     364:364:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):446:446 -> a
-    365:365:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    365:365:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     365:365:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):447 -> a
     366:367:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):490:491 -> a
     366:367:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):448 -> a
@@ -71074,11 +70162,11 @@
     9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):243:243 -> b
     10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):459:464 -> b
     16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):506:506 -> b
-    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> b
     17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):507 -> b
     18:37:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):508:527 -> b
     38:40:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):526:528 -> b
-    41:41:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
+    41:41:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> b
     41:41:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):529 -> b
     42:79:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):530:567 -> b
     80:80:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
@@ -71096,13 +70184,13 @@
     2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229 -> i
     3:3:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229:229 -> i
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):231:231 -> j
-com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.IX:
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.dW:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():574:574 -> <clinit>
     1:1:void <init>():577:577 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():580:580 -> a
     2:22:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):589:609 -> a
-com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.Y8:
+com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.O8:
     1:4:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):35:38 -> a
     5:25:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):44:64 -> a
     26:36:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):61:71 -> a
@@ -71120,7 +70208,7 @@
     35:58:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):159:182 -> b
     59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> b
     59:59:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):182 -> b
-com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.v9:
+com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.l9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> d
     com.android.tools.r8.utils.collections.SortedProgramMethodSet candidatesForInstanceOfOptimization -> c
@@ -71202,11 +70290,10 @@
     152:152:void performAllocation():647:647 -> a
     152:152:void allocateRegisters():218 -> a
     153:153:void allocateRegisters():219:219 -> a
-    154:154:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph():616:616 -> a
+    154:154:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph():619:619 -> a
     154:154:void allocateRegisters():219 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     155:166:void allocateRegisters():220:231 -> a
-    167:167:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1039:1039 -> a
+    167:167:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     167:167:void allocateRegisters():231 -> a
     168:170:void allocateRegisters():232:234 -> a
     171:171:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> a
@@ -71231,7 +70318,7 @@
     290:290:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):346 -> a
     291:314:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):475:498 -> a
     291:314:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):346 -> a
-    315:315:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
+    315:315:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
     315:315:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):501 -> a
     315:315:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):346 -> a
     316:318:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):501:503 -> a
@@ -71296,150 +70383,152 @@
     1104:1106:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):776:778 -> a
     1107:1145:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990:1028 -> a
     1146:1147:void lambda$invariantsHold$3(java.util.TreeSet,int):998:999 -> a
-    1148:1154:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1183:1189 -> a
-    1155:1155:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
-    1155:1155:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1190 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1156:1156:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1191:1191 -> a
-    1157:1167:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1188:1198 -> a
-    1168:1171:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1246:1249 -> a
-    1168:1171:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1201 -> a
-    1172:1172:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
-    1172:1172:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1253 -> a
-    1172:1172:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1201 -> a
-    1173:1173:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1252:1252 -> a
-    1173:1173:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1201 -> a
-    1174:1174:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1202:1202 -> a
-    1175:1188:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1200:1213 -> a
-    1189:1189:int getFreeConsecutiveRegisters(int):3046:3046 -> a
-    1189:1189:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1214 -> a
-    1190:1191:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1216:1217 -> a
-    1192:1197:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1051:1056 -> a
-    1192:1197:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1217 -> a
-    1198:1198:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1055:1055 -> a
-    1198:1198:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1217 -> a
-    1199:1199:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1054:1054 -> a
-    1199:1199:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1217 -> a
-    1200:1213:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1219:1232 -> a
-    1214:1238:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1215:1239 -> a
-    1239:1258:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1275:1294 -> a
-    1259:1266:boolean registersAreFreeAndConsecutive(int,boolean):3102:3109 -> a
-    1259:1266:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1294 -> a
-    1267:1292:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1295:1320 -> a
-    1293:1295:boolean registerIsFree(int):3179:3179 -> a
-    1293:1295:boolean registersAreFree(int,boolean):3186 -> a
-    1293:1295:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1320 -> a
-    1296:1296:boolean registerIsFree(int):3180:3180 -> a
-    1296:1296:boolean registersAreFree(int,boolean):3186 -> a
-    1296:1296:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1320 -> a
-    1297:1297:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1320:1320 -> a
-    1298:1328:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1336:1366 -> a
-    1329:1329:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
-    1329:1329:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1367 -> a
-    1330:1346:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1374:1390 -> a
-    1347:1348:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1866:1867 -> a
-    1349:1379:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1872:1902 -> a
-    1349:1379:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1868 -> a
-    1380:1392:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1963:1975 -> a
-    1393:1393:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3373,"2":3374,"3":3375,"4":3376,"5":3377}}
-    3373:3373:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1975 -> a
-    3374:3374:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1975 -> a
-    3375:3375:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1975 -> a
-    3376:3376:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1975 -> a
-    3377:3377:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1975 -> a
-    3368:3372:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1979 -> a
-    3378:3408:int getLargestValidCandidate(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1999:2029 -> a
-    3409:3409:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2236:2236 -> a
-    3410:3410:boolean atLeastOneOfRegistersAreTaken(int,boolean):3199:3199 -> a
-    3410:3410:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2237 -> a
-    3411:3457:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2237:2283 -> a
-    3458:3480:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2352:2374 -> a
-    3458:3480:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2286 -> a
-    3481:3481:int toGapPosition(int):1402:1402 -> a
-    3481:3481:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2374 -> a
-    3481:3481:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2286 -> a
-    3482:3495:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2374:2387 -> a
-    3482:3495:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2286 -> a
-    3496:3496:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2287:2287 -> a
-    3497:3504:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2300:2307 -> a
-    3497:3504:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2288 -> a
-    3505:3533:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2314:2342 -> a
-    3505:3533:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2290 -> a
-    3534:3535:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2295:2296 -> a
-    3536:3538:boolean registerIsFree(int):3179:3179 -> a
-    3536:3538:boolean registersAreFree(int,boolean):3186 -> a
-    3536:3538:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2296 -> a
-    3539:3539:boolean registerIsFree(int):3180:3180 -> a
-    3539:3539:boolean registersAreFree(int,boolean):3186 -> a
-    3539:3539:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2296 -> a
-    3540:3540:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2296:2296 -> a
-    3541:3543:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2396:2398 -> a
-    3544:3544:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
-    3544:3544:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2399 -> a
-    3545:3553:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2400:2408 -> a
-    3554:3554:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2407:2407 -> a
-    3555:3590:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2516:2551 -> a
-    3591:3591:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    3591:3591:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
-    3591:3591:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2551 -> a
-    3592:3598:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2551:2557 -> a
-    3599:3599:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2590:2590 -> a
-    3600:3600:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():305:305 -> a
-    3600:3600:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2592 -> a
-    3601:3601:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():305:305 -> a
-    3601:3601:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2593 -> a
-    3602:3602:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():305:305 -> a
-    3602:3602:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2594 -> a
-    3603:3611:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2595:2603 -> a
-    3612:3612:void com.android.tools.r8.utils.LinkedHashSetUtils.addAll(java.util.LinkedHashSet,java.util.LinkedHashSet):12:12 -> a
-    3612:3612:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2602 -> a
-    3613:3613:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2605:2605 -> a
-    3614:3614:void com.android.tools.r8.utils.LinkedHashSetUtils.addAll(java.util.LinkedHashSet,java.util.LinkedHashSet):12:12 -> a
-    3614:3614:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2605 -> a
-    3615:3618:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2609:2612 -> a
-    3619:3619:void com.android.tools.r8.utils.LinkedHashSetUtils.addAll(java.util.LinkedHashSet,java.util.LinkedHashSet):12:12 -> a
-    3619:3619:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2615 -> a
-    3620:3647:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2616:2643 -> a
-    3648:3654:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2640:2646 -> a
-    3655:3655:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    3655:3655:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2646 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3656:3663:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2646:2653 -> a
-    3664:3664:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    3664:3664:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
-    3664:3664:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653 -> a
-    3665:3702:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653:2690 -> a
-    3703:3704:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2719:2720 -> a
-    3703:3704:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2694 -> a
-    3705:3724:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2691:2710 -> a
-    3725:3747:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2796:2818 -> a
-    3748:3748:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2840:2840 -> a
-    3749:3753:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2945:2949 -> a
-    3749:3753:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2840 -> a
-    3754:3787:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2841:2874 -> a
-    3788:3789:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():737:738 -> a
-    3788:3789:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2876 -> a
-    3790:3790:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2877:2877 -> a
-    3791:3792:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):2825:2826 -> a
-    3791:3792:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2877 -> a
-    3793:3794:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2878:2879 -> a
-    3795:3798:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2831:2834 -> a
-    3795:3798:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2880 -> a
-    3799:3823:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2882:2906 -> a
-    3824:3850:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2914:2940 -> a
-    3824:3850:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2907 -> a
-    3851:3851:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2848:2848 -> a
-    3852:3874:int getFreeConsecutiveRegisters(int,boolean):3050:3072 -> a
-    3875:3878:int getNextFreeRegister(java.util.Iterator):3118:3121 -> a
-    3875:3878:int getFreeConsecutiveRegisters(int,boolean):3073 -> a
-    3879:3882:int getNextFreeRegister(java.util.Iterator):3118:3121 -> a
-    3879:3882:int getFreeConsecutiveRegisters(int,boolean):3077 -> a
-    3883:3897:int getFreeConsecutiveRegisters(int,boolean):3080:3094 -> a
-    3898:3909:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):3056:3067 -> a
-    3910:3922:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3125:3137 -> a
-    3923:3934:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3143:3154 -> a
-    3935:3935:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3249:3249 -> a
+    1148:1155:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1183:1190 -> a
+    1156:1156:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    1156:1156:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1190 -> a
+    1157:1157:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1191:1191 -> a
+    1158:1168:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1188:1198 -> a
+    1169:1176:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1246:1253 -> a
+    1169:1176:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1201 -> a
+    1177:1177:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    1177:1177:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1253 -> a
+    1177:1177:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1201 -> a
+    1178:1178:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1252:1252 -> a
+    1178:1178:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1201 -> a
+    1179:1179:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1202:1202 -> a
+    1180:1193:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1200:1213 -> a
+    1194:1194:int getFreeConsecutiveRegisters(int):3046:3046 -> a
+    1194:1194:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1214 -> a
+    1195:1196:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1216:1217 -> a
+    1197:1202:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1051:1056 -> a
+    1197:1202:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1217 -> a
+    1203:1203:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1055:1055 -> a
+    1203:1203:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1217 -> a
+    1204:1204:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1054:1054 -> a
+    1204:1204:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1217 -> a
+    1205:1218:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1219:1232 -> a
+    1219:1243:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1215:1239 -> a
+    1244:1263:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1275:1294 -> a
+    1264:1271:boolean registersAreFreeAndConsecutive(int,boolean):3102:3109 -> a
+    1264:1271:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1294 -> a
+    1272:1297:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1295:1320 -> a
+    1298:1300:boolean registerIsFree(int):3179:3179 -> a
+    1298:1300:boolean registersAreFree(int,boolean):3186 -> a
+    1298:1300:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1320 -> a
+    1301:1301:boolean registerIsFree(int):3180:3180 -> a
+    1301:1301:boolean registersAreFree(int,boolean):3186 -> a
+    1301:1301:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1320 -> a
+    1302:1302:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1320:1320 -> a
+    1303:1333:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1336:1366 -> a
+    1334:1334:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    1334:1334:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1367 -> a
+    1335:1351:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1374:1390 -> a
+    1352:1353:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1866:1867 -> a
+    1354:1384:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1872:1902 -> a
+    1354:1384:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1868 -> a
+    1385:1397:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1963:1975 -> a
+    1398:1398:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3378,"2":3379,"3":3380,"4":3381,"5":3382}}
+    3378:3378:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1975 -> a
+    3379:3379:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1975 -> a
+    3380:3380:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1975 -> a
+    3381:3381:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1975 -> a
+    3382:3382:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1975 -> a
+    3373:3377:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositionsWithExtraBlockedRegisters,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1975:1979 -> a
+    3383:3413:int getLargestValidCandidate(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1999:2029 -> a
+    3414:3414:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2236:2236 -> a
+    3415:3415:boolean atLeastOneOfRegistersAreTaken(int,boolean):3199:3199 -> a
+    3415:3415:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2237 -> a
+    3416:3462:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2237:2283 -> a
+    3463:3485:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2352:2374 -> a
+    3463:3485:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2286 -> a
+    3486:3486:int toGapPosition(int):1402:1402 -> a
+    3486:3486:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2374 -> a
+    3486:3486:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2286 -> a
+    3487:3500:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2374:2387 -> a
+    3487:3500:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2286 -> a
+    3501:3501:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2287:2287 -> a
+    3502:3509:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2300:2307 -> a
+    3502:3509:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2288 -> a
+    3510:3538:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2314:2342 -> a
+    3510:3538:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2290 -> a
+    3539:3540:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2295:2296 -> a
+    3541:3543:boolean registerIsFree(int):3179:3179 -> a
+    3541:3543:boolean registersAreFree(int,boolean):3186 -> a
+    3541:3543:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2296 -> a
+    3544:3544:boolean registerIsFree(int):3180:3180 -> a
+    3544:3544:boolean registersAreFree(int,boolean):3186 -> a
+    3544:3544:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2296 -> a
+    3545:3545:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2296:2296 -> a
+    3546:3548:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2396:2398 -> a
+    3549:3549:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    3549:3549:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2399 -> a
+    3550:3558:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2400:2408 -> a
+    3559:3559:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2407:2407 -> a
+    3560:3595:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2516:2551 -> a
+    3596:3596:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727:2727 -> a
+    3596:3596:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2551 -> a
+    3597:3597:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    3597:3597:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
+    3597:3597:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2551 -> a
+    3598:3604:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2551:2557 -> a
+    3605:3605:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2590:2590 -> a
+    3606:3606:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():305:305 -> a
+    3606:3606:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2592 -> a
+    3607:3607:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():305:305 -> a
+    3607:3607:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2593 -> a
+    3608:3608:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():305:305 -> a
+    3608:3608:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2594 -> a
+    3609:3617:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2595:2603 -> a
+    3618:3618:void com.android.tools.r8.utils.LinkedHashSetUtils.addAll(java.util.LinkedHashSet,java.util.LinkedHashSet):12:12 -> a
+    3618:3618:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2602 -> a
+    3619:3619:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2605:2605 -> a
+    3620:3620:void com.android.tools.r8.utils.LinkedHashSetUtils.addAll(java.util.LinkedHashSet,java.util.LinkedHashSet):12:12 -> a
+    3620:3620:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2605 -> a
+    3621:3624:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2609:2612 -> a
+    3625:3625:void com.android.tools.r8.utils.LinkedHashSetUtils.addAll(java.util.LinkedHashSet,java.util.LinkedHashSet):12:12 -> a
+    3625:3625:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2615 -> a
+    3626:3653:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2616:2643 -> a
+    3654:3660:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2640:2646 -> a
+    3661:3661:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    3661:3661:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2646 -> a
+    3662:3669:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2646:2653 -> a
+    3670:3670:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727:2727 -> a
+    3670:3670:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653 -> a
+    3671:3671:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    3671:3671:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
+    3671:3671:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653 -> a
+    3672:3709:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653:2690 -> a
+    3710:3711:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2719:2720 -> a
+    3710:3711:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2694 -> a
+    3712:3731:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2691:2710 -> a
+    3732:3754:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2796:2818 -> a
+    3755:3755:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2840:2840 -> a
+    3756:3760:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2945:2949 -> a
+    3756:3760:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2840 -> a
+    3761:3794:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2841:2874 -> a
+    3795:3796:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():737:738 -> a
+    3795:3796:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2876 -> a
+    3797:3797:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2877:2877 -> a
+    3798:3799:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):2825:2826 -> a
+    3798:3799:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2877 -> a
+    3800:3801:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2878:2879 -> a
+    3802:3805:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2831:2834 -> a
+    3802:3805:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2880 -> a
+    3806:3830:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2882:2906 -> a
+    3831:3857:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2914:2940 -> a
+    3831:3857:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2907 -> a
+    3858:3858:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2848:2848 -> a
+    3859:3881:int getFreeConsecutiveRegisters(int,boolean):3050:3072 -> a
+    3882:3885:int getNextFreeRegister(java.util.Iterator):3118:3121 -> a
+    3882:3885:int getFreeConsecutiveRegisters(int,boolean):3073 -> a
+    3886:3889:int getNextFreeRegister(java.util.Iterator):3118:3121 -> a
+    3886:3889:int getFreeConsecutiveRegisters(int,boolean):3077 -> a
+    3890:3904:int getFreeConsecutiveRegisters(int,boolean):3080:3094 -> a
+    3905:3916:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):3056:3067 -> a
+    3917:3929:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3125:3137 -> a
+    3930:3941:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3143:3154 -> a
+    3942:3942:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3249:3249 -> a
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     1:1:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):311:311 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
@@ -71473,220 +70562,219 @@
     84:84:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> c
     84:84:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):888 -> c
     84:84:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    85:90:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):889:894 -> c
-    85:90:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    91:91:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    91:91:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):895 -> c
-    91:91:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    92:113:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):900:921 -> c
-    92:113:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    114:120:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1062:1068 -> c
-    114:120:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):923 -> c
-    114:120:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    121:121:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    121:121:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1068 -> c
-    121:121:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):923 -> c
-    121:121:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    122:123:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1069:1070 -> c
-    122:123:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):923 -> c
-    122:123:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    124:130:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1081:1087 -> c
-    124:130:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):924 -> c
-    124:130:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    131:131:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    131:131:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1087 -> c
-    131:131:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):924 -> c
-    131:131:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    132:137:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1088:1093 -> c
-    132:137:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):924 -> c
-    132:137:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    138:138:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    138:138:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1093 -> c
-    138:138:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):924 -> c
-    138:138:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    139:139:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1094:1094 -> c
+    85:91:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):889:895 -> c
+    85:91:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    92:92:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
+    92:92:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):895 -> c
+    92:92:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    93:114:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):900:921 -> c
+    93:114:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    115:121:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1062:1068 -> c
+    115:121:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):923 -> c
+    115:121:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    122:122:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
+    122:122:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1068 -> c
+    122:122:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):923 -> c
+    122:122:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    123:124:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1069:1070 -> c
+    123:124:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):923 -> c
+    123:124:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    125:131:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1081:1087 -> c
+    125:131:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):924 -> c
+    125:131:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    132:132:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
+    132:132:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1087 -> c
+    132:132:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):924 -> c
+    132:132:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    133:138:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1088:1093 -> c
+    133:138:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):924 -> c
+    133:138:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    139:139:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
+    139:139:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1093 -> c
     139:139:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):924 -> c
     139:139:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    140:205:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1109:1174 -> c
-    140:205:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):929 -> c
-    140:205:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    206:255:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):930:979 -> c
-    206:255:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    256:268:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1616:1628 -> c
-    256:268:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    256:268:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    269:271:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1909:1911 -> c
-    269:271:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1629 -> c
-    269:271:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    269:271:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    272:323:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1639:1690 -> c
-    272:323:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    272:323:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    324:324:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    324:324:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1691 -> c
-    324:324:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    324:324:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    325:329:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1692:1696 -> c
-    325:329:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    325:329:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    330:330:int toInstructionPosition(int):1398:1398 -> c
-    330:330:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1696 -> c
-    330:330:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    330:330:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    331:342:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1701:1712 -> c
-    331:342:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    331:342:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    343:352:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1034:1043 -> c
-    343:352:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1712 -> c
-    343:352:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    343:352:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    353:381:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1792:1820 -> c
-    353:381:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1715 -> c
-    353:381:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    353:381:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    382:408:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1721:1747 -> c
-    382:408:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    382:408:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    409:427:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2042:2060 -> c
-    409:427:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    409:427:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    409:427:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    428:437:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2059:2068 -> c
-    428:437:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    428:437:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    428:437:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    438:438:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    438:438:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2069 -> c
-    438:438:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    438:438:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    438:438:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    439:482:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2070:2113 -> c
-    439:482:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    439:482:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    439:482:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    483:485:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2177:2179 -> c
-    483:485:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2119 -> c
-    483:485:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    483:485:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    483:485:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    486:501:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2121:2136 -> c
-    486:501:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    486:501:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    486:501:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    502:504:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2177:2179 -> c
-    502:504:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2141 -> c
-    502:504:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    502:504:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    502:504:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    505:507:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2177:2179 -> c
-    505:507:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2142 -> c
-    505:507:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    505:507:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    505:507:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    508:513:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2144:2149 -> c
-    508:513:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    508:513:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    508:513:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    514:521:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1263:1270 -> c
-    514:521:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2151 -> c
-    514:521:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    514:521:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    514:521:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    522:522:void increaseCapacity(int):3033:3033 -> c
-    522:522:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1270 -> c
-    522:522:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2151 -> c
-    522:522:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    522:522:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    522:522:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    523:525:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1909:1911 -> c
-    523:525:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2152 -> c
-    523:525:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    523:525:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    523:525:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    526:532:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2153:2159 -> c
-    526:532:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    526:532:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    526:532:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    533:533:void increaseCapacity(int):3033:3033 -> c
-    533:533:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2160 -> c
-    533:533:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    533:533:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    533:533:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    534:534:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2163:2163 -> c
+    140:140:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1094:1094 -> c
+    140:140:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):924 -> c
+    140:140:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    141:206:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1109:1174 -> c
+    141:206:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):929 -> c
+    141:206:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    207:256:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):930:979 -> c
+    207:256:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    257:269:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1616:1628 -> c
+    257:269:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    257:269:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    270:272:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1909:1911 -> c
+    270:272:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1629 -> c
+    270:272:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    270:272:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    273:324:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1639:1690 -> c
+    273:324:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    273:324:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    325:325:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
+    325:325:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1691 -> c
+    325:325:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    325:325:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    326:330:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1692:1696 -> c
+    326:330:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    326:330:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    331:331:int toInstructionPosition(int):1398:1398 -> c
+    331:331:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1696 -> c
+    331:331:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    331:331:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    332:343:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1701:1712 -> c
+    332:343:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    332:343:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    344:353:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1034:1043 -> c
+    344:353:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1712 -> c
+    344:353:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    344:353:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    354:382:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1792:1820 -> c
+    354:382:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1715 -> c
+    354:382:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    354:382:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    383:409:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1721:1747 -> c
+    383:409:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    383:409:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    410:428:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2042:2060 -> c
+    410:428:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    410:428:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    410:428:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    429:438:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2059:2068 -> c
+    429:438:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    429:438:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    429:438:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    439:439:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
+    439:439:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2069 -> c
+    439:439:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    439:439:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    439:439:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    440:483:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2070:2113 -> c
+    440:483:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    440:483:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    440:483:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    484:486:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2177:2179 -> c
+    484:486:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2119 -> c
+    484:486:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    484:486:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    484:486:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    487:502:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2121:2136 -> c
+    487:502:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    487:502:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    487:502:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    503:505:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2177:2179 -> c
+    503:505:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2141 -> c
+    503:505:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    503:505:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    503:505:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    506:508:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2177:2179 -> c
+    506:508:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2142 -> c
+    506:508:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    506:508:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    506:508:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    509:514:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2144:2149 -> c
+    509:514:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    509:514:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    509:514:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    515:522:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1263:1270 -> c
+    515:522:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2151 -> c
+    515:522:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    515:522:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    515:522:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    523:523:void increaseCapacity(int):3033:3033 -> c
+    523:523:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1270 -> c
+    523:523:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2151 -> c
+    523:523:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    523:523:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    523:523:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    524:526:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1909:1911 -> c
+    524:526:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2152 -> c
+    524:526:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    524:526:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    524:526:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    527:533:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2153:2159 -> c
+    527:533:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    527:533:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    527:533:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    534:534:void increaseCapacity(int):3033:3033 -> c
+    534:534:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2160 -> c
     534:534:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
     534:534:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
     534:534:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    535:542:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2187:2194 -> c
-    535:542:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2165 -> c
-    535:542:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    535:542:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    535:542:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    543:544:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2168:2169 -> c
-    543:544:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    543:544:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    543:544:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    545:552:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2187:2194 -> c
-    545:552:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2170 -> c
-    545:552:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
-    545:552:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    545:552:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    553:555:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1748:1750 -> c
-    553:555:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    553:555:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    556:558:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1909:1911 -> c
-    556:558:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1751 -> c
-    556:558:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    556:558:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    559:567:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1752:1760 -> c
-    559:567:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    559:567:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    568:568:void increaseCapacity(int):3033:3033 -> c
-    568:568:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> c
-    568:568:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    568:568:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    569:569:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1764:1764 -> c
+    535:535:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2163:2163 -> c
+    535:535:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    535:535:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    535:535:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    536:543:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2187:2194 -> c
+    536:543:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2165 -> c
+    536:543:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    536:543:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    536:543:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    544:545:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2168:2169 -> c
+    544:545:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    544:545:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    544:545:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    546:553:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2187:2194 -> c
+    546:553:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2170 -> c
+    546:553:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> c
+    546:553:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    546:553:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    554:556:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1748:1750 -> c
+    554:556:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    554:556:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    557:559:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1909:1911 -> c
+    557:559:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1751 -> c
+    557:559:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    557:559:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    560:568:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1752:1760 -> c
+    560:568:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    560:568:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    569:569:void increaseCapacity(int):3033:3033 -> c
+    569:569:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> c
     569:569:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
     569:569:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    570:572:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1909:1911 -> c
-    570:572:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766 -> c
-    570:572:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    570:572:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    573:574:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1775:1776 -> c
-    573:574:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    573:574:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    575:577:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1909:1911 -> c
-    575:577:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1777 -> c
-    575:577:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    575:577:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    578:578:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1778:1778 -> c
-    578:578:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
-    578:578:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
-    579:624:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):663:708 -> c
-    625:633:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):681:689 -> c
-    634:634:int highestUsedRegister():593:593 -> c
-    634:634:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):691 -> c
-    635:638:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):692:695 -> c
-    639:639:int highestUsedRegister():593:593 -> c
-    639:639:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):669 -> c
-    640:646:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670:676 -> c
-    647:686:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):673:712 -> c
-    687:687:int highestUsedRegister():593:593 -> c
-    687:687:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):713 -> c
-    688:688:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):712:712 -> c
-    689:689:int highestUsedRegister():593:593 -> c
-    689:689:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):715 -> c
-    690:690:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):714:714 -> c
-    691:691:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):666:666 -> c
-    692:697:int unadjustedRealRegisterFromAllocated(int):809:814 -> c
-    698:721:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1510:1533 -> c
-    722:729:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1546:1553 -> c
+    570:570:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1764:1764 -> c
+    570:570:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    570:570:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    571:573:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1909:1911 -> c
+    571:573:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766 -> c
+    571:573:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    571:573:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    574:575:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1775:1776 -> c
+    574:575:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    574:575:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    576:578:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1909:1911 -> c
+    576:578:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1777 -> c
+    576:578:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    576:578:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    579:579:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1778:1778 -> c
+    579:579:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> c
+    579:579:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661 -> c
+    580:625:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):663:708 -> c
+    626:634:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):681:689 -> c
+    635:635:int highestUsedRegister():593:593 -> c
+    635:635:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):691 -> c
+    636:639:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):692:695 -> c
+    640:640:int highestUsedRegister():593:593 -> c
+    640:640:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):669 -> c
+    641:647:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670:676 -> c
+    648:687:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):673:712 -> c
+    688:688:int highestUsedRegister():593:593 -> c
+    688:688:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):713 -> c
+    689:689:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):712:712 -> c
+    690:690:int highestUsedRegister():593:593 -> c
+    690:690:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):715 -> c
+    691:691:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):714:714 -> c
+    692:692:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):666:666 -> c
+    693:698:int unadjustedRealRegisterFromAllocated(int):809:814 -> c
+    699:722:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1510:1533 -> c
+    723:730:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1546:1553 -> c
     1:18:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1449:1466 -> d
     19:19:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> d
     19:19:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1466 -> d
     20:23:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1467:1470 -> d
     24:24:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
     24:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1470 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1480:1481 -> d
     27:27:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> d
     27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1481 -> d
@@ -71818,77 +70906,74 @@
     5:5:void setSpilled(boolean):106 -> a
     6:6:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitParent():212:212 -> a
     6:6:void setSpilled(boolean):106 -> a
-    7:7:int getRegister():276:276 -> a
-    7:7:void setSpilled(boolean):106 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:9:void setSpilled(boolean):106:107 -> a
-    10:10:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitParent():212:212 -> a
-    10:10:boolean anySplitOverlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):354 -> a
-    11:11:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
-    11:11:boolean anySplitOverlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):355 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:12:java.util.List getSplitChildren():208:208 -> a
-    12:12:boolean anySplitOverlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):358 -> a
-    13:13:boolean anySplitOverlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):358:358 -> a
-    14:14:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
-    14:14:boolean anySplitOverlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):359 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:17:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):226:228 -> a
-    15:17:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
-    18:18:boolean com.android.tools.r8.ir.regalloc.LiveRange.isInfinite():32:32 -> a
-    18:18:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):228 -> a
-    18:18:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
-    19:19:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):231:231 -> a
-    19:19:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
-    20:20:int toInstructionPosition(int):67:67 -> a
-    20:20:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):231 -> a
-    20:20:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
-    21:21:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):232:232 -> a
+    7:7:void setSpilled(boolean):106:106 -> a
+    8:8:int getRegister():276:276 -> a
+    8:8:void setSpilled(boolean):106 -> a
+    9:10:void setSpilled(boolean):106:107 -> a
+    11:11:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitParent():212:212 -> a
+    11:11:boolean anySplitOverlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):354 -> a
+    12:12:boolean anySplitOverlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):355:355 -> a
+    13:13:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    13:13:boolean anySplitOverlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):355 -> a
+    14:14:java.util.List getSplitChildren():208:208 -> a
+    14:14:boolean anySplitOverlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):358 -> a
+    15:16:boolean anySplitOverlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):358:359 -> a
+    17:17:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    17:17:boolean anySplitOverlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):359 -> a
+    18:20:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):226:228 -> a
+    18:20:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
+    21:21:boolean com.android.tools.r8.ir.regalloc.LiveRange.isInfinite():32:32 -> a
+    21:21:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):228 -> a
     21:21:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
-    22:22:int toInstructionPosition(int):67:67 -> a
-    22:22:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):232 -> a
+    22:22:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):231:231 -> a
     22:22:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
-    23:27:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):237:241 -> a
-    23:27:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
-    28:28:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):222:222 -> a
-    29:30:void addUse(com.android.tools.r8.ir.regalloc.LiveIntervalsUse):249:250 -> a
-    31:31:void updateRegisterConstraint(int):254:254 -> a
-    31:31:void addUse(com.android.tools.r8.ir.regalloc.LiveIntervalsUse):250 -> a
-    32:32:boolean usesRegister(int,boolean):315:315 -> a
-    33:33:com.android.tools.r8.ir.code.ValueType getType():79:79 -> a
-    33:33:boolean usesRegister(int,boolean):318 -> a
-    34:37:boolean usesRegister(int,boolean):318:321 -> a
-    38:39:void clearRegisterAssignment():332:333 -> a
-    40:40:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
-    40:40:void setHint(com.android.tools.r8.ir.regalloc.LiveIntervals,java.util.PriorityQueue):88 -> a
-    41:41:void setHint(com.android.tools.r8.ir.regalloc.LiveIntervals,java.util.PriorityQueue):91:91 -> a
-    42:42:int getRegister():276:276 -> a
-    42:42:void setHint(com.android.tools.r8.ir.regalloc.LiveIntervals,java.util.PriorityQueue):92 -> a
-    43:45:void setHint(com.android.tools.r8.ir.regalloc.LiveIntervals,java.util.PriorityQueue):92:94 -> a
-    46:47:void forEachRegister(java.util.function.IntConsumer):410:411 -> a
-    48:48:com.android.tools.r8.ir.code.ValueType getType():79:79 -> a
-    48:48:void forEachRegister(java.util.function.IntConsumer):412 -> a
-    49:50:void forEachRegister(java.util.function.IntConsumer):412:413 -> a
-    51:70:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):629:648 -> a
-    71:71:int getRegister():276:276 -> a
-    71:71:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):648 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    72:78:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):648:654 -> a
-    79:79:boolean isSpilled():111:111 -> a
-    79:79:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):654 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    80:81:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):669:670 -> a
+    23:23:int toInstructionPosition(int):67:67 -> a
+    23:23:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):231 -> a
+    23:23:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
+    24:24:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):232:232 -> a
+    24:24:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
+    25:25:int toInstructionPosition(int):67:67 -> a
+    25:25:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):232 -> a
+    25:25:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
+    26:30:boolean tryAddRange(com.android.tools.r8.ir.regalloc.LiveRange):237:241 -> a
+    26:30:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):221 -> a
+    31:31:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):222:222 -> a
+    32:33:void addUse(com.android.tools.r8.ir.regalloc.LiveIntervalsUse):249:250 -> a
+    34:34:void updateRegisterConstraint(int):254:254 -> a
+    34:34:void addUse(com.android.tools.r8.ir.regalloc.LiveIntervalsUse):250 -> a
+    35:35:boolean usesRegister(int,boolean):315:315 -> a
+    36:36:com.android.tools.r8.ir.code.ValueType getType():79:79 -> a
+    36:36:boolean usesRegister(int,boolean):318 -> a
+    37:40:boolean usesRegister(int,boolean):318:321 -> a
+    41:42:void clearRegisterAssignment():332:333 -> a
+    43:43:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    43:43:void setHint(com.android.tools.r8.ir.regalloc.LiveIntervals,java.util.PriorityQueue):88 -> a
+    44:44:void setHint(com.android.tools.r8.ir.regalloc.LiveIntervals,java.util.PriorityQueue):91:91 -> a
+    45:45:int getRegister():276:276 -> a
+    45:45:void setHint(com.android.tools.r8.ir.regalloc.LiveIntervals,java.util.PriorityQueue):92 -> a
+    46:48:void setHint(com.android.tools.r8.ir.regalloc.LiveIntervals,java.util.PriorityQueue):92:94 -> a
+    49:50:void forEachRegister(java.util.function.IntConsumer):410:411 -> a
+    51:51:com.android.tools.r8.ir.code.ValueType getType():79:79 -> a
+    51:51:void forEachRegister(java.util.function.IntConsumer):412 -> a
+    52:53:void forEachRegister(java.util.function.IntConsumer):412:413 -> a
+    54:73:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):629:648 -> a
+    74:74:int getRegister():276:276 -> a
+    74:74:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):648 -> a
+    75:81:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):648:654 -> a
     82:82:boolean isSpilled():111:111 -> a
-    82:82:boolean allSplitsAreSpilled():120 -> a
-    82:82:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):670 -> a
-    83:85:boolean allSplitsAreSpilled():120:122 -> a
-    83:85:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):670 -> a
-    86:86:boolean isSpilled():111:111 -> a
-    86:86:boolean allSplitsAreSpilled():122 -> a
-    86:86:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):670 -> a
-    87:87:boolean allSplitsAreSpilled():122:122 -> a
-    87:87:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):670 -> a
-    88:92:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):671:675 -> a
+    82:82:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):654 -> a
+    83:84:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):669:670 -> a
+    85:85:boolean isSpilled():111:111 -> a
+    85:85:boolean allSplitsAreSpilled():120 -> a
+    85:85:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):670 -> a
+    86:88:boolean allSplitsAreSpilled():120:122 -> a
+    86:88:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):670 -> a
+    89:89:boolean isSpilled():111:111 -> a
+    89:89:boolean allSplitsAreSpilled():122 -> a
+    89:89:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):670 -> a
+    90:90:boolean allSplitsAreSpilled():122:122 -> a
+    90:90:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):670 -> a
+    91:95:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):671:675 -> a
     1:1:boolean hasConflictingRegisters(com.android.tools.r8.ir.regalloc.LiveIntervals):328:328 -> b
     2:2:com.android.tools.r8.ir.code.ValueType getType():79:79 -> b
     2:2:boolean hasConflictingRegisters(com.android.tools.r8.ir.regalloc.LiveIntervals):328 -> b
@@ -71910,33 +70995,25 @@
     1:1:int getMaxNonSpilledRegister():308:308 -> f
     2:3:int computeMaxNonSpilledRegister():289:290 -> f
     2:3:int getMaxNonSpilledRegister():311 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean isSpilled():111:111 -> f
     4:4:int computeMaxNonSpilledRegister():291 -> f
     4:4:int getMaxNonSpilledRegister():311 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     5:5:int getRegister():276:276 -> f
     5:5:int computeMaxNonSpilledRegister():292 -> f
     5:5:int getMaxNonSpilledRegister():311 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    6:8:int computeMaxNonSpilledRegister():292:294 -> f
-    6:8:int getMaxNonSpilledRegister():311 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:boolean isSpilled():111:111 -> f
-    9:9:int computeMaxNonSpilledRegister():295 -> f
-    9:9:int getMaxNonSpilledRegister():311 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    10:10:int computeMaxNonSpilledRegister():296:296 -> f
+    6:9:int computeMaxNonSpilledRegister():292:295 -> f
+    6:9:int getMaxNonSpilledRegister():311 -> f
+    10:10:boolean isSpilled():111:111 -> f
+    10:10:int computeMaxNonSpilledRegister():295 -> f
     10:10:int getMaxNonSpilledRegister():311 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:int getRegister():276:276 -> f
-    11:11:int computeMaxNonSpilledRegister():296 -> f
+    11:11:int computeMaxNonSpilledRegister():296:296 -> f
     11:11:int getMaxNonSpilledRegister():311 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    12:15:int computeMaxNonSpilledRegister():296:299 -> f
-    12:15:int getMaxNonSpilledRegister():311 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:21:boolean overlapsPosition(int):337:342 -> f
+    12:12:int getRegister():276:276 -> f
+    12:12:int computeMaxNonSpilledRegister():296 -> f
+    12:12:int getMaxNonSpilledRegister():311 -> f
+    13:16:int computeMaxNonSpilledRegister():296:299 -> f
+    13:16:int getMaxNonSpilledRegister():311 -> f
+    17:22:boolean overlapsPosition(int):337:342 -> f
     1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getNextConsecutive():155:155 -> g
     1:1:java.util.List getRanges():262:262 -> h
     1:1:int getRegister():276:276 -> i
@@ -71986,8 +71063,7 @@
     2:2:boolean isSpilledAndRematerializable():128:128 -> z
     3:4:boolean isRematerializable():115:116 -> z
     3:4:boolean isSpilledAndRematerializable():128 -> z
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.BC:
+com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.KB:
     int position -> b
     int limit -> c
     1:3:void <init>(int,int):12:14 -> <init>
@@ -71999,7 +71075,7 @@
     2:5:int compareTo(java.lang.Object):8 -> compareTo
     1:5:boolean equals(java.lang.Object):32:36 -> equals
     1:1:int hashCode():27:27 -> hashCode
-com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.DC:
+com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.MB:
     com.android.tools.r8.ir.regalloc.LiveRange INFINITE -> d
     int start -> b
     int end -> c
@@ -72019,7 +71095,7 @@
     31:31:java.lang.String toString():28:28 -> toString
     32:32:java.lang.String toString():28:28 -> toString
     33:33:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.MS:
+com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.pR:
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     void allocateRegisters() -> a
     int getRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
@@ -72028,7 +71104,7 @@
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     com.android.tools.r8.utils.InternalOptions options() -> b
     int registersUsed() -> c
-com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.NS:
+com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.qR:
     com.android.tools.r8.ir.analysis.type.TypeElement type -> b
     com.android.tools.r8.ir.code.Instruction definition -> e
     boolean $assertionsDisabled -> f
@@ -72048,7 +71124,7 @@
     2:28:int compareTo(java.lang.Object):13 -> compareTo
     1:5:boolean equals(java.lang.Object):68:72 -> equals
     1:1:int hashCode():63:63 -> hashCode
-com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.OS:
+com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.rR:
     java.util.Map valueMap -> b
     int tempRegister -> f
     java.util.Set moveSet -> a
@@ -72191,9 +71267,8 @@
     61:61:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
     61:61:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):287 -> a
     62:68:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):288:294 -> a
-    69:69:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
+    69:69:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
     69:69:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):294 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     70:71:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):299:300 -> a
     72:80:void removeArgumentRestores(java.util.Set):332:340 -> a
     72:80:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):301 -> a
@@ -72248,32 +71323,32 @@
     14:14:void com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):84:84 -> a
     14:14:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):80 -> a
     15:15:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):99:99 -> a
-    1:1:boolean computeEquals(java.lang.Object):94:94 -> g
     1:1:int computeHashCode():89:89 -> g0
+    1:1:boolean computeEquals(java.lang.Object):94:94 -> h
     int estimatedDexCodeSizeUpperBoundInBytes() -> k0
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider() -> t0
     1:1:java.lang.String com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):99:99 -> toString
     1:1:java.lang.String toString():70 -> toString
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.internal.p1:
     com.android.tools.r8.ir.conversion.SourceCode get(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.ir.synthetic.CallObjectInitCfCodeProvider -> com.android.tools.r8.internal.p6:
+com.android.tools.r8.ir.synthetic.CallObjectInitCfCodeProvider -> com.android.tools.r8.internal.l6:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):23:23 -> <init>
     1:6:com.android.tools.r8.graph.CfCode generateCfCode():28:33 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.Kf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.sf:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):63:63 -> <init>
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APICallbackWrapperCfCodeProvider -> com.android.tools.r8.internal.Af:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APICallbackWrapperCfCodeProvider -> com.android.tools.r8.internal.jf:
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer eventConsumer -> f
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):236:237 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):247:247 -> a
     1:1:void generatePushReceiver(java.util.List):242:242 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConversionCfCodeProvider -> com.android.tools.r8.internal.Bf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConversionCfCodeProvider -> com.android.tools.r8.internal.kf:
     com.android.tools.r8.cf.code.CfInvoke initialInvoke -> c
     com.android.tools.r8.graph.DexMethod[] parameterConversions -> e
     com.android.tools.r8.graph.DexMethod returnConversion -> d
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):352:355 -> <init>
     1:29:com.android.tools.r8.graph.CfCode generateCfCode():360:388 -> b
     30:43:com.android.tools.r8.graph.CfCode generateCfCode():387:400 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.Cf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.lf:
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):562:563 -> <init>
     1:9:com.android.tools.r8.graph.CfCode generateCfCode():568:576 -> b
@@ -72282,13 +71357,7 @@
     22:22:void com.android.tools.r8.cf.code.CfInstanceFieldWrite.<init>(com.android.tools.r8.graph.DexField):16:16 -> b
     22:22:com.android.tools.r8.graph.CfCode generateCfCode():581 -> b
     23:25:com.android.tools.r8.graph.CfCode generateCfCode():581:583 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.Df:
-    com.android.tools.r8.graph.DexString message -> c
-    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):594:595 -> <init>
-    1:11:com.android.tools.r8.graph.CfCode generateCfCode():600:610 -> b
-    12:12:com.android.tools.r8.graph.CfCode generateCfCode():608:608 -> b
-    13:22:com.android.tools.r8.graph.CfCode generateCfCode():605:614 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.Ef:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.mf:
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
     com.android.tools.r8.graph.DexMethod forwardMethod -> d
@@ -72298,9 +71367,8 @@
     8:8:void com.android.tools.r8.cf.code.CfInstanceFieldRead.<init>(com.android.tools.r8.graph.DexField):17:17 -> b
     8:8:com.android.tools.r8.graph.CfCode generateCfCode():99 -> b
     9:15:com.android.tools.r8.graph.CfCode generateCfCode():99:105 -> b
-    16:16:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):118:118 -> b
+    16:16:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):114:114 -> b
     16:16:com.android.tools.r8.graph.CfCode generateCfCode():105 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:com.android.tools.r8.graph.CfCode generateCfCode():106:106 -> b
     18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):67:67 -> b
     18:18:com.android.tools.r8.graph.CfCode generateCfCode():110 -> b
@@ -72312,15 +71380,14 @@
     34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):67:67 -> b
     34:34:com.android.tools.r8.graph.CfCode generateCfCode():124 -> b
     35:45:com.android.tools.r8.graph.CfCode generateCfCode():127:137 -> b
-    46:46:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):118:118 -> b
+    46:46:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):114:114 -> b
     46:46:com.android.tools.r8.graph.CfCode generateCfCode():137 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     47:47:com.android.tools.r8.graph.CfCode generateCfCode():138:138 -> b
     48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):67:67 -> b
     48:48:com.android.tools.r8.graph.CfCode generateCfCode():142 -> b
     49:49:com.android.tools.r8.graph.CfCode generateCfCode():141:141 -> b
     50:62:com.android.tools.r8.graph.CfCode generateCfCode():138:150 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.Ff:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.nf:
     com.android.tools.r8.graph.DexField wrapperField -> f
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,boolean):262:263 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):274:274 -> a
@@ -72328,7 +71395,7 @@
     3:3:void com.android.tools.r8.cf.code.CfInstanceFieldRead.<init>(com.android.tools.r8.graph.DexField):17:17 -> b
     3:3:void generatePushReceiver(java.util.List):269 -> b
     4:4:void generatePushReceiver(java.util.List):269:269 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.Gf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.of:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexField wrapperField -> d
     com.android.tools.r8.graph.DexField reverseWrapperField -> c
@@ -72346,7 +71413,7 @@
     30:44:com.android.tools.r8.graph.CfCode generateCfCode():318:332 -> b
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():330:330 -> b
     46:55:com.android.tools.r8.graph.CfCode generateCfCode():327:336 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$AbstractAPIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.Hf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$AbstractAPIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.pf:
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> d
     boolean itfCall -> e
     com.android.tools.r8.graph.DexMethod forwardMethod -> c
@@ -72354,17 +71421,15 @@
     com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     void generatePushReceiver(java.util.List) -> b
     1:10:com.android.tools.r8.graph.CfCode generateCfCode():179:188 -> b
-    11:11:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):118:118 -> b
+    11:11:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):114:114 -> b
     11:11:com.android.tools.r8.graph.CfCode generateCfCode():188 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():189:189 -> b
     13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):67:67 -> b
     13:13:com.android.tools.r8.graph.CfCode generateCfCode():192 -> b
     14:14:com.android.tools.r8.graph.CfCode generateCfCode():192:192 -> b
     15:34:com.android.tools.r8.graph.CfCode generateCfCode():189:208 -> b
-    35:35:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):118:118 -> b
+    35:35:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):114:114 -> b
     35:35:com.android.tools.r8.graph.CfCode generateCfCode():208 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     36:36:com.android.tools.r8.graph.CfCode generateCfCode():209:209 -> b
     37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):67:67 -> b
     37:37:com.android.tools.r8.graph.CfCode generateCfCode():212 -> b
@@ -72373,7 +71438,7 @@
     40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):67:67 -> b
     40:40:com.android.tools.r8.graph.CfCode generateCfCode():214 -> b
     41:46:com.android.tools.r8.graph.CfCode generateCfCode():216:221 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumArrayConversionCfCodeProvider -> com.android.tools.r8.internal.If:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumArrayConversionCfCodeProvider -> com.android.tools.r8.internal.qf:
     com.android.tools.r8.graph.DexType convertedType -> d
     com.android.tools.r8.graph.DexType enumType -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):411:413 -> <init>
@@ -72387,7 +71452,7 @@
     21:57:com.android.tools.r8.graph.CfCode generateCfCode():440:476 -> b
     58:58:com.android.tools.r8.graph.CfCode generateCfCode():474:474 -> b
     59:79:com.android.tools.r8.graph.CfCode generateCfCode():471:491 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumConversionCfCodeProvider -> com.android.tools.r8.internal.Jf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumConversionCfCodeProvider -> com.android.tools.r8.internal.rf:
     com.android.tools.r8.graph.DexType enumType -> d
     java.lang.Iterable enumFields -> c
     com.android.tools.r8.graph.DexType convertedType -> e
@@ -72398,25 +71463,24 @@
     4:26:com.android.tools.r8.graph.CfCode generateCfCode():519:541 -> b
     27:33:com.android.tools.r8.graph.CfCode generateCfCode():540:546 -> b
     34:43:com.android.tools.r8.graph.CfCode generateCfCode():544:553 -> b
-com.android.tools.r8.ir.synthetic.EmulateDispatchSyntheticCfCodeProvider -> com.android.tools.r8.internal.Yh:
-    com.android.tools.r8.graph.DexType receiverType -> d
-    com.android.tools.r8.graph.DexMethod interfaceMethod -> e
-    java.util.LinkedHashMap extraDispatchCases -> f
+com.android.tools.r8.ir.synthetic.EmulateDispatchSyntheticCfCodeProvider -> com.android.tools.r8.internal.Ih:
+    java.util.LinkedHashMap extraDispatchCases -> e
+    com.android.tools.r8.graph.DexMethod interfaceMethod -> d
     com.android.tools.r8.graph.DexMethod forwardingMethod -> c
-    1:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.LinkedHashMap,com.android.tools.r8.graph.AppView):45:49 -> <init>
-    1:4:com.android.tools.r8.graph.CfCode generateCfCode():54:57 -> b
-    5:5:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> b
-    5:5:com.android.tools.r8.graph.CfCode generateCfCode():62 -> b
-    6:19:com.android.tools.r8.graph.CfCode generateCfCode():63:76 -> b
-    20:20:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> b
-    20:20:com.android.tools.r8.graph.CfCode generateCfCode():76 -> b
-    21:37:com.android.tools.r8.graph.CfCode generateCfCode():76:92 -> b
-    38:38:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> b
-    38:38:com.android.tools.r8.graph.CfCode generateCfCode():92 -> b
-    39:52:com.android.tools.r8.graph.CfCode generateCfCode():92:105 -> b
-    53:56:void addReturn(java.util.List):116:119 -> b
-    1:2:void loadExtraParameters(java.util.List):110:111 -> c
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.Fi:
+    1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.LinkedHashMap,com.android.tools.r8.graph.AppView):44:47 -> <init>
+    1:5:com.android.tools.r8.graph.CfCode generateCfCode():52:56 -> b
+    6:6:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> b
+    6:6:com.android.tools.r8.graph.CfCode generateCfCode():61 -> b
+    7:20:com.android.tools.r8.graph.CfCode generateCfCode():62:75 -> b
+    21:21:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> b
+    21:21:com.android.tools.r8.graph.CfCode generateCfCode():75 -> b
+    22:38:com.android.tools.r8.graph.CfCode generateCfCode():75:91 -> b
+    39:39:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> b
+    39:39:com.android.tools.r8.graph.CfCode generateCfCode():91 -> b
+    40:53:com.android.tools.r8.graph.CfCode generateCfCode():91:104 -> b
+    54:57:void addReturn(java.util.List):115:118 -> b
+    1:2:void loadExtraParameters(java.util.List):109:110 -> c
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.qi:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):46:46 -> <init>
@@ -72425,7 +71489,7 @@
     4:4:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):56 -> a
     5:8:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):57:57 -> a
     12:12:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):61:61 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.Di:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.oi:
     com.android.tools.r8.ir.analysis.value.AbstractValue nullValue -> f
     com.android.tools.r8.graph.DexType returnType -> d
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> e
@@ -72435,7 +71499,7 @@
     3:3:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> b
     3:3:com.android.tools.r8.graph.CfCode generateCfCode():101 -> b
     4:32:com.android.tools.r8.graph.CfCode generateCfCode():101:129 -> b
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.Ei:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.pi:
     com.android.tools.r8.graph.DexType enumType -> d
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData):143:145 -> <init>
@@ -72452,7 +71516,7 @@
     244:246:com.android.tools.r8.graph.CfCode generateCfCode():200:202 -> b
     247:247:com.android.tools.r8.graph.CfCode generateCfCode():201:201 -> b
     248:262:com.android.tools.r8.graph.CfCode generateCfCode():197:211 -> b
-com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.Bj:
+com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.jj:
     com.android.tools.r8.utils.OptionalBool isSetter -> c
     com.android.tools.r8.utils.OptionalBool isInstanceField -> b
     boolean $assertionsDisabled -> e
@@ -72516,7 +71580,7 @@
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder builder():35:35 -> b
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setGetter():57:57 -> c
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setSetter():68:68 -> d
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.Xk:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.Bk:
     java.lang.Boolean isInterface -> g
     boolean isConstructorDelegate -> i
     boolean $assertionsDisabled -> k
@@ -72624,12 +71688,12 @@
     1:2:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setStaticSource(com.android.tools.r8.graph.DexMethod):98:99 -> c
     3:5:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setSuperTarget(com.android.tools.r8.graph.DexMethod,boolean):111:113 -> c
     1:3:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setVirtualTarget(com.android.tools.r8.graph.DexMethod,boolean):118:120 -> d
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Wk:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Ak:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.Zk:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.Dk:
     com.android.tools.r8.graph.DexMethod target -> n
     boolean castResult -> p
     com.android.tools.r8.graph.DexType targetReceiver -> m
@@ -72660,7 +71724,7 @@
     29:29:void com.android.tools.r8.ir.synthetic.SyntheticSourceCode.add(java.util.function.Consumer):77:77 -> i
     29:29:void prepareInstructions():215 -> i
     1:27:boolean checkSignatures():147:173 -> j
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.Yk:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.Ck:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     com.android.tools.r8.graph.DexType targetReceiver -> d
     com.android.tools.r8.graph.DexMethod target -> e
@@ -72676,13 +71740,13 @@
     5:5:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):91:91 -> a
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTargetReceiver(com.android.tools.r8.graph.DexType):61:61 -> b
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTarget(com.android.tools.r8.graph.DexMethod):66:66 -> b
-com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordEqualsCfCodeProvider -> com.android.tools.r8.internal.DQ:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordEqualsCfCodeProvider -> com.android.tools.r8.internal.nP:
     com.android.tools.r8.graph.DexMethod getFieldsAsObjects -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):146:147 -> <init>
     1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> b
     1:1:com.android.tools.r8.graph.CfCode generateCfCode():165 -> b
     2:28:com.android.tools.r8.graph.CfCode generateCfCode():166:192 -> b
-com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.EQ:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.oP:
     com.android.tools.r8.graph.DexField[] fields -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField[]):69:70 -> <init>
     1:2:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):57:58 -> a
@@ -72700,18 +71764,18 @@
     4:12:com.android.tools.r8.graph.CfCode generateCfCode():81 -> b
     13:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider.generateCfCodeWithArray():86:103 -> b
     13:30:com.android.tools.r8.graph.CfCode generateCfCode():82 -> b
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.NY:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.fX:
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> d
     1:2:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):15:16 -> <init>
     java.util.function.Consumer getRegistryCallback(com.android.tools.r8.graph.DexClassAndMethod) -> a
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():21:21 -> t0
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.RY:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.iX:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexType holder -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):18:20 -> <init>
     1:1:com.android.tools.r8.graph.DexType getHolder():24:24 -> a
     2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):30:30 -> a
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.dZ:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.tX:
     int[] paramRegisters -> f
     java.util.function.Predicate doesNotEndBlock -> j
     java.util.function.Predicate endsBlock -> k
@@ -72760,7 +71824,7 @@
     1:3:int getParamRegister(int):98:100 -> h
     4:4:int nextInstructionIndex():115:115 -> h
     void prepareInstructions() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.Arrays -> com.android.tools.r8.internal.o3:
+com.android.tools.r8.it.unimi.dsi.fastutil.Arrays -> com.android.tools.r8.internal.m3:
     1:1:void ensureFromTo(int,int,int):57:57 -> a
     2:2:void ensureFromTo(int,int,int):56:56 -> a
     3:3:void ensureFromTo(int,int,int):55:55 -> a
@@ -72773,12 +71837,12 @@
     64:64:void ensureFromTo(int,int,int):55:55 -> a
     65:65:void ensureFromTo(int,int,int):55:55 -> a
     59:59:void ensureFromTo(int,int,int):55:55 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.tl:
+com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.Xk:
 # {"id":"sourceFile","fileName":"Function.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.qm:
+com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.Tl:
     boolean equals(java.lang.Object,java.lang.Object) -> a
     int hashCode(java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.Gm:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.jm:
     int long2int(long) -> a
     int mix(int) -> a
     1:2:int arraySize(int,float):228:229 -> a
@@ -72829,7 +71893,7 @@
     boolean remove(boolean) -> d
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:5:int hashCode():57:61 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.internal.h5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.internal.e5:
     boolean[] a -> b
     int size -> c
     1:4:void <init>(boolean[],int):104:107 -> <init>
@@ -72868,20 +71932,20 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet.iterator():119:119 -> iterator
     2:2:java.util.Iterator iterator():29 -> iterator
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.internal.g5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.internal.d5:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet this$0 -> c
     int next -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):119:120 -> <init>
     1:3:boolean nextBoolean():129:129 -> g
     1:1:boolean hasNext():124:124 -> hasNext
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.internal.i5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.internal.f5:
     boolean[] EMPTY_ARRAY -> a
     1:1:void <clinit>():95:95 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.internal.k5:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.n5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.internal.h5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.k5:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):536:536 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$EmptyCollection -> com.android.tools.r8.internal.l5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$EmptyCollection -> com.android.tools.r8.internal.i5:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     boolean contains(boolean) -> b
@@ -72890,7 +71954,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.m5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.j5:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection collection -> b
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):369:371 -> <init>
     1:1:boolean add(java.lang.Object):365:365 -> add
@@ -72914,17 +71978,17 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):422:422 -> toArray
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.internal.o5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.internal.l5:
     boolean nextBoolean() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.s5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.p5:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.internal.p5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.internal.m5:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:boolean nextBoolean():57:57 -> g
     1:1:boolean previousBoolean():62:62 -> l
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.q5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.n5:
     boolean element -> b
     int curr -> c
     1:2:void <init>(boolean):110:111 -> <init>
@@ -72934,21 +71998,21 @@
     1:4:boolean previousBoolean():133:133 -> l
     1:1:int nextIndex():140:140 -> nextIndex
     1:1:int previousIndex():145:145 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.internal.r5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.internal.o5:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator i -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):724:725 -> <init>
     1:1:boolean nextBoolean():735:735 -> g
     1:1:boolean hasNext():730:730 -> hasNext
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.y5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.v5:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():76:76 -> <clinit>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSet singleton(boolean):159:159 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet -> com.android.tools.r8.internal.w5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet -> com.android.tools.r8.internal.t5:
     1:1:void <init>():42:42 -> <init>
     1:1:boolean rem(boolean):64:64 -> c
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton -> com.android.tools.r8.internal.x5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton -> com.android.tools.r8.internal.u5:
     boolean element -> b
     1:2:void <init>(boolean):89:90 -> <init>
     1:1:boolean addAll(java.util.Collection):115:115 -> addAll
@@ -73489,18 +72553,18 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):22:22 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet.tailSet(java.lang.Integer):68:68 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):22 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.yq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.Zp:
     int[] key -> c
     int[] value -> d
     int size -> e
     1:3:void <init>():70:72 -> <init>
     4:6:void <init>(int):81:83 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> a
-    2:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.findKey(int):234:236 -> a
-    2:4:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,int):37 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:7:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.findKey(int):234:236 -> a
-    5:7:boolean containsKey(int):261 -> a
+    2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,int):37:37 -> a
+    3:5:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.findKey(int):234:236 -> a
+    3:5:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,int):37 -> a
+    6:8:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.findKey(int):234:236 -> a
+    6:8:boolean containsKey(int):261 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> b
     2:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.findKey(int):234:236 -> b
     2:4:int put(int,int):279 -> b
@@ -73527,8 +72591,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():316:316 -> keySet
     1:1:int size():251:251 -> size
     1:1:java.util.Collection values():37:37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.internal.vq:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.xq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Yp:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1):133:133 -> <init>
@@ -73538,7 +72601,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):212:223 -> remove
     1:1:int size():195:195 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.wq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Xp:
     int curr -> b
     int next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet this$1 -> d
@@ -73547,10 +72610,10 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:6:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.zq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.aq:
     boolean containsKey(int) -> a
     int put(int,int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Iq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap -> com.android.tools.r8.internal.jq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> n
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -73566,12 +72629,11 @@
     boolean containsNullKey -> f
     1:1:void <init>(int,float):147:147 -> <init>
     2:56:void <init>(int,float):102:156 -> <init>
-    57:57:void <init>():176:176 -> <init>
-    1:1:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,int):87:87 -> a
+    1:1:int access$200(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):87:87 -> a
     2:6:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.removeNullEntry():285:289 -> a
     2:6:int access$200(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:16:boolean containsKey(int):734:743 -> a
+    7:7:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,int):87:87 -> a
+    8:17:boolean containsKey(int):734:743 -> a
     1:25:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.insert(int,int):306:330 -> b
     1:25:int put(int,int):337 -> b
     26:28:int put(int,int):338:340 -> b
@@ -73615,14 +72677,14 @@
     1:1:int size():776:776 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.values():1629:1650 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Aq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.bq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1629:1629 -> <init>
     1:1:void clear():1647:1647 -> clear
     1:1:boolean contains(int):1642:1642 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1632:1632 -> iterator
     1:1:int size():1637:1637 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Bq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.cq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1229:1229 -> <init>
@@ -73637,7 +72699,7 @@
     1:1:void set(java.lang.Object):1226:1226 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry):1218:1218 -> set
     2:2:void set(java.lang.Object):1226 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Cq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.dq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1482:1483 -> <init>
     1:1:void add(java.lang.Object):1444:1444 -> add
@@ -73652,7 +72714,7 @@
     1:1:void set(java.lang.Object):1444:1444 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeyIterator.set(java.lang.Integer):1473:1473 -> set
     2:2:void set(java.lang.Object):1444 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Dq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.eq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1498:1498 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1):1498:1498 -> <init>
@@ -73671,7 +72733,7 @@
     1:3:boolean remove(int):1519:1521 -> j
     1:3:int lastInt():1537:1537 -> r
     1:1:int size():1509:1509 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Eq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.fq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,int):820:821 -> <init>
@@ -73692,7 +72754,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry.setValue(java.lang.Integer):877:877 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):815 -> setValue
     1:1:java.lang.String toString():895:895 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Fq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.gq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1276:1276 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1):1276:1276 -> <init>
@@ -73714,7 +72776,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1276:1276 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry):1298:1298 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1276 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Gq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.hq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -73732,7 +72794,7 @@
     1:2:int previousIndex():1130:1131 -> previousIndex
     1:46:void remove():1153:1198 -> remove
     47:47:void remove():1154:1154 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Hq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.iq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1611:1612 -> <init>
     1:1:void add(java.lang.Object):1577:1577 -> add
@@ -73747,12 +72809,12 @@
     1:1:void set(java.lang.Object):1577:1577 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$ValueIterator.set(java.lang.Integer):1592:1592 -> set
     2:2:void set(java.lang.Object):1577 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.internal.Lq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.internal.mq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.Jq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.kq:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.Kq:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Uq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.lq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.vq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet entries -> j
     int[] key -> c
@@ -73767,11 +72829,11 @@
     10:10:void <init>(int,float):94:94 -> <init>
     11:11:void <init>():120:120 -> <init>
     12:13:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,float):156:157 -> <init>
-    1:1:int access$400(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):50:50 -> a
+    1:1:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):50:50 -> a
     2:5:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.removeNullEntry():228:231 -> a
     2:5:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):50 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:15:boolean containsKey(int):387:396 -> a
+    6:6:int access$400(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):50:50 -> a
+    7:16:boolean containsKey(int):387:396 -> a
     1:16:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.insert(int,int):248:263 -> b
     1:16:int put(int,int):270 -> b
     17:19:int put(int,int):271:273 -> b
@@ -73816,14 +72878,14 @@
     1:1:int size():428:428 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.values():866:887 -> values
     1:22:java.util.Collection values():50 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.Mq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.nq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):866:866 -> <init>
     1:1:void clear():884:884 -> clear
     1:1:boolean contains(int):879:879 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     1:1:int size():874:874 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Nq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.oq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):664:664 -> <init>
@@ -73831,13 +72893,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator.next():669:669 -> next
     1:1:java.lang.Object next():664 -> next
     1:2:void remove():674:675 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Oq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.pq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):787:788 -> <init>
     1:1:int nextInt():793:793 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator.next():799:799 -> next
     1:1:java.lang.Object next():786 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Pq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.qq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):803:803 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):803:803 -> <init>
@@ -73846,7 +72908,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     1:3:boolean remove(int):821:823 -> j
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Qq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.rq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):472:473 -> <init>
@@ -73867,7 +72929,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry.setValue(java.lang.Integer):529:529 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):467 -> setValue
     1:1:java.lang.String toString():547:547 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Rq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.sq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):689:689 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):689:689 -> <init>
@@ -73876,7 +72938,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():691:691 -> iterator
     1:30:boolean remove(java.lang.Object):724:753 -> remove
     1:1:int size():762:762 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Sq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.tq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNullKey -> e
@@ -73895,27 +72957,27 @@
     13:22:void remove():644 -> remove
     23:24:void remove():647:648 -> remove
     25:25:void remove():641:641 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Tq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.uq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):848:849 -> <init>
     1:1:int nextInt():854:854 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator.next():860:860 -> next
     1:1:java.lang.Object next():847 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Vq:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap -> com.android.tools.r8.internal.Zq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.wq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap -> com.android.tools.r8.internal.zq:
     java.lang.Object[] value -> d
     int[] key -> c
     int size -> e
     1:3:void <init>():70:72 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap):37:37 -> a
-    2:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap.findKey(int):235:237 -> a
-    2:4:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,int):37 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:7:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap.findKey(int):235:237 -> a
-    5:7:boolean containsKey(int):265 -> a
-    8:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap.findKey(int):235:237 -> a
-    8:10:java.lang.Object put(int,java.lang.Object):283 -> a
-    11:28:java.lang.Object put(int,java.lang.Object):285:302 -> a
+    2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,int):37:37 -> a
+    3:5:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap.findKey(int):235:237 -> a
+    3:5:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,int):37 -> a
+    6:8:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap.findKey(int):235:237 -> a
+    6:8:boolean containsKey(int):265 -> a
+    9:11:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap.findKey(int):235:237 -> a
+    9:11:java.lang.Object put(int,java.lang.Object):283 -> a
+    12:29:java.lang.Object put(int,java.lang.Object):285:302 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap):37:37 -> b
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap.int2ObjectEntrySet():231:231 -> b
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():37 -> b
@@ -73936,8 +72998,7 @@
     4:10:java.lang.Object remove(int):309:315 -> remove
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():326:326 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$1 -> com.android.tools.r8.internal.Wq:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet -> com.android.tools.r8.internal.Yq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet -> com.android.tools.r8.internal.yq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$1):133:133 -> <init>
@@ -73947,7 +73008,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Xq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet$1 -> com.android.tools.r8.internal.xq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -73956,15 +73017,15 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunction -> com.android.tools.r8.internal.ar:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunction -> com.android.tools.r8.internal.Aq:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap -> com.android.tools.r8.internal.dr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap -> com.android.tools.r8.internal.Dq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.br:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.Bq:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet -> com.android.tools.r8.internal.cr:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.mr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet -> com.android.tools.r8.internal.Cq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.Mq:
     java.lang.Object[] value -> d
     int[] key -> c
     int maxFill -> h
@@ -73978,14 +73039,14 @@
     1:9:void <init>(int,float):91:99 -> <init>
     10:10:void <init>(int,float):93:93 -> <init>
     11:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,float):155:156 -> <init>
-    1:1:java.lang.Object access$400(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,int):49:49 -> a
+    1:1:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):49:49 -> a
     2:6:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.removeNullEntry():228:232 -> a
     2:6:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):49 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:22:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.insert(int,java.lang.Object):249:264 -> a
-    7:22:java.lang.Object put(int,java.lang.Object):271 -> a
-    23:25:java.lang.Object put(int,java.lang.Object):272:274 -> a
-    26:35:boolean containsKey(int):344:353 -> a
+    7:7:java.lang.Object access$400(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,int):49:49 -> a
+    8:23:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.insert(int,java.lang.Object):249:264 -> a
+    8:23:java.lang.Object put(int,java.lang.Object):271 -> a
+    24:26:java.lang.Object put(int,java.lang.Object):272:274 -> a
+    27:36:boolean containsKey(int):344:353 -> a
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.int2ObjectEntrySet():707:708 -> b
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():49 -> b
     1:5:void clear():377:381 -> clear
@@ -74026,14 +73087,14 @@
     7:17:java.lang.Object remove(int):310:320 -> remove
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():794:815 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.er:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.Eq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryIterator -> com.android.tools.r8.internal.fr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Fq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):600:600 -> <init>
@@ -74041,13 +73102,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryIterator.next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator -> com.android.tools.r8.internal.gr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Gq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):721:722 -> <init>
     1:1:int nextInt():727:727 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.hr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.Hq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):737:737 -> <init>
@@ -74056,7 +73117,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:3:boolean remove(int):755:757 -> j
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.ir:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.Iq:
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,int):430:431 -> <init>
@@ -74068,7 +73129,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.jr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Jq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):625:625 -> <init>
@@ -74077,7 +73138,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapIterator -> com.android.tools.r8.internal.kr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapIterator -> com.android.tools.r8.internal.Kq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNullKey -> e
     int c -> d
@@ -74096,11 +73157,11 @@
     15:24:void remove():580 -> remove
     25:26:void remove():583:584 -> remove
     27:27:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$ValueIterator -> com.android.tools.r8.internal.lr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Lq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap -> com.android.tools.r8.internal.Fr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap -> com.android.tools.r8.internal.er:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     boolean modified -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry tree -> c
@@ -74218,8 +73279,7 @@
     263:264:java.lang.Object remove(int):472:473 -> remove
     1:1:int size():951:951 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1348:1369 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$1 -> com.android.tools.r8.internal.nr:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.pr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.Oq:
     java.util.Comparator comparator -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1127:1128 -> <init>
@@ -74242,20 +73302,20 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1127:1127 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1202:1202 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1127 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2$1 -> com.android.tools.r8.internal.or:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2$1 -> com.android.tools.r8.internal.Nq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2):1128:1128 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1128:1128 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1130:1130 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1128 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3 -> com.android.tools.r8.internal.qr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3 -> com.android.tools.r8.internal.Pq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1348:1348 -> <init>
     1:1:void clear():1366:1366 -> clear
     1:1:boolean contains(java.lang.Object):1356:1356 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1351:1351 -> iterator
     1:1:int size():1361:1361 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.rr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.Qq:
     int info -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry left -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry right -> e
@@ -74276,7 +73336,7 @@
     1:1:int hashCode():919:919 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):889:890 -> setValue
     1:1:java.lang.String toString():924:924 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.sr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.Rq:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1097:1097 -> <init>
     1:1:void add(java.lang.Object):1096:1096 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1121:1121 -> add
@@ -74288,7 +73348,7 @@
     1:1:void set(java.lang.Object):1096:1096 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1116:1116 -> set
     2:2:void set(java.lang.Object):1096 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.tr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.Sq:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1219:1219 -> <init>
     1:1:void add(java.lang.Object):1218:1218 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeyIterator.add(java.lang.Integer):1267:1267 -> add
@@ -74302,12 +73362,12 @@
     1:1:void set(java.lang.Object):1218:1218 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeyIterator.set(java.lang.Integer):1261:1261 -> set
     2:2:void set(java.lang.Object):1218 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.ur:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.Tq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1274:1274 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$1):1274:1274 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1276:1276 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.Cr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.br:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     boolean bottom -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> i
@@ -74363,7 +73423,7 @@
     1:4:java.lang.Object remove(int):1622:1625 -> remove
     1:5:int size():1630:1634 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1566:1583 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.vr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.Uq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1465:1465 -> <init>
     1:1:void clear():1517:1517 -> clear
@@ -74396,19 +73456,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465:1465 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1542:1542 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.wr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.Vq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1566:1566 -> <init>
     1:1:void clear():1580:1580 -> clear
     1:1:boolean contains(java.lang.Object):1572:1572 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1568:1568 -> iterator
     1:1:int size():1576:1576 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.xr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Wq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1548:1548 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$1):1548:1548 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1550:1550 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.yr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Xq:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1773:1773 -> <init>
     1:1:void add(java.lang.Object):1772:1772 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1797:1797 -> add
@@ -74420,16 +73480,15 @@
     1:1:void set(java.lang.Object):1772:1772 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1792:1792 -> set
     2:2:void set(java.lang.Object):1772 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.zr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Yq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1742:1743 -> <init>
     1:1:void updateNext():1767:1767 -> n
     2:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry.next():868:870 -> n
     2:4:void updateNext():1767 -> n
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:6:void updateNext():1767:1768 -> n
     1:2:void updatePrevious():1762:1763 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Ar:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Zq:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1813:1813 -> <init>
     1:1:void add(java.lang.Object):1811:1811 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1861:1861 -> add
@@ -74443,14 +73502,14 @@
     1:1:void set(java.lang.Object):1811:1811 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator.set(java.lang.Integer):1855:1855 -> set
     2:2:void set(java.lang.Object):1811 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Br:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.ar:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1875:1875 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$1):1875:1875 -> <init>
     1:1:void add(java.lang.Object):1893:1893 -> add
     1:1:java.lang.Object next():1878:1878 -> next
     1:1:java.lang.Object previous():1883:1883 -> previous
     1:1:void set(java.lang.Object):1888:1888 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Dr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.cr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry curr -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry prev -> b
@@ -74465,27 +73524,26 @@
     1:1:void updateNext():1030:1030 -> n
     2:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry.next():868:870 -> n
     2:4:void updateNext():1030 -> n
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:void updateNext():1030:1030 -> n
     1:1:int nextIndex():1054:1054 -> nextIndex
     1:1:void updatePrevious():1042:1042 -> o
     1:1:int previousIndex():1058:1058 -> previousIndex
     1:12:void remove():1062:1062 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Er:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.dr:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1312:1312 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$1):1312:1312 -> <init>
     1:1:void add(java.lang.Object):1330:1330 -> add
     1:1:java.lang.Object next():1315:1315 -> next
     1:1:java.lang.Object previous():1320:1320 -> previous
     1:1:void set(java.lang.Object):1325:1325 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap -> com.android.tools.r8.internal.Gr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap -> com.android.tools.r8.internal.fr:
     int firstIntKey() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet() -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int) -> c
     int lastIntKey() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.Zr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.yr:
     java.util.Comparator storedComparator -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry -> e
@@ -74534,45 +73592,45 @@
     34:34:java.lang.Object put(int,java.lang.Object):283 -> a
     35:35:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.incBalance():888:888 -> a
     35:35:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):354 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     35:35:java.lang.Object put(int,java.lang.Object):283 -> a
-    36:36:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.decBalance():893:893 -> a
-    36:36:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):355 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    36:36:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):355:355 -> a
     36:36:java.lang.Object put(int,java.lang.Object):283 -> a
-    37:37:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):356:356 -> a
+    37:37:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.decBalance():893:893 -> a
+    37:37:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):355 -> a
     37:37:java.lang.Object put(int,java.lang.Object):283 -> a
-    38:38:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
-    38:38:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):358 -> a
-    38:38:java.lang.Object put(int,java.lang.Object):283 -> a
-    39:39:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):359:359 -> a
-    39:39:java.lang.Object put(int,java.lang.Object):283 -> a
-    40:40:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
-    40:40:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):360 -> a
-    40:40:java.lang.Object put(int,java.lang.Object):283 -> a
-    41:54:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):362:375 -> a
-    41:54:java.lang.Object put(int,java.lang.Object):283 -> a
-    55:55:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
-    55:55:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):376 -> a
-    55:55:java.lang.Object put(int,java.lang.Object):283 -> a
-    56:76:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):377:397 -> a
-    56:76:java.lang.Object put(int,java.lang.Object):283 -> a
-    77:77:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
-    77:77:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):398 -> a
-    77:77:java.lang.Object put(int,java.lang.Object):283 -> a
-    78:91:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):400:413 -> a
-    78:91:java.lang.Object put(int,java.lang.Object):283 -> a
-    92:92:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
-    92:92:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):414 -> a
-    92:92:java.lang.Object put(int,java.lang.Object):283 -> a
-    93:116:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):415:438 -> a
-    93:116:java.lang.Object put(int,java.lang.Object):283 -> a
-    117:118:java.lang.Object put(int,java.lang.Object):284:285 -> a
-    119:119:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):348:348 -> a
-    119:119:java.lang.Object put(int,java.lang.Object):283 -> a
-    120:120:boolean containsKey(int):980:980 -> a
-    121:123:int firstIntKey():1001:1001 -> a
-    124:124:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1421:1421 -> a
+    38:40:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):356:358 -> a
+    38:40:java.lang.Object put(int,java.lang.Object):283 -> a
+    41:41:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
+    41:41:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):358 -> a
+    41:41:java.lang.Object put(int,java.lang.Object):283 -> a
+    42:43:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):359:360 -> a
+    42:43:java.lang.Object put(int,java.lang.Object):283 -> a
+    44:44:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
+    44:44:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):360 -> a
+    44:44:java.lang.Object put(int,java.lang.Object):283 -> a
+    45:58:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):362:375 -> a
+    45:58:java.lang.Object put(int,java.lang.Object):283 -> a
+    59:59:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
+    59:59:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):376 -> a
+    59:59:java.lang.Object put(int,java.lang.Object):283 -> a
+    60:81:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):377:398 -> a
+    60:81:java.lang.Object put(int,java.lang.Object):283 -> a
+    82:82:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
+    82:82:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):398 -> a
+    82:82:java.lang.Object put(int,java.lang.Object):283 -> a
+    83:96:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):400:413 -> a
+    83:96:java.lang.Object put(int,java.lang.Object):283 -> a
+    97:97:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
+    97:97:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):414 -> a
+    97:97:java.lang.Object put(int,java.lang.Object):283 -> a
+    98:121:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):415:438 -> a
+    98:121:java.lang.Object put(int,java.lang.Object):283 -> a
+    122:123:java.lang.Object put(int,java.lang.Object):284:285 -> a
+    124:124:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.add(int):348:348 -> a
+    124:124:java.lang.Object put(int,java.lang.Object):283 -> a
+    125:125:boolean containsKey(int):980:980 -> a
+    126:128:int firstIntKey():1001:1001 -> a
+    129:129:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1421:1421 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1416:1416 -> b
     1:1:int compare(int,int):232:232 -> c
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1.compare(int,int):104:104 -> c
@@ -74629,42 +73687,40 @@
     90:90:java.lang.Object remove(int):558:558 -> remove
     91:91:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.incBalance():888:888 -> remove
     91:91:java.lang.Object remove(int):559 -> remove
-    92:92:java.lang.Object remove(int):562:562 -> remove
-    93:93:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> remove
-    93:93:java.lang.Object remove(int):564 -> remove
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    94:98:java.lang.Object remove(int):567:571 -> remove
-    99:99:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> remove
-    99:99:java.lang.Object remove(int):572 -> remove
-    100:146:java.lang.Object remove(int):573:619 -> remove
-    147:147:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.decBalance():893:893 -> remove
-    147:147:java.lang.Object remove(int):620 -> remove
-    148:148:java.lang.Object remove(int):623:623 -> remove
-    149:149:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> remove
-    149:149:java.lang.Object remove(int):625 -> remove
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    150:154:java.lang.Object remove(int):628:632 -> remove
-    155:155:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> remove
-    155:155:java.lang.Object remove(int):633 -> remove
-    156:198:java.lang.Object remove(int):634:676 -> remove
-    199:200:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):474:475 -> remove
-    199:200:java.lang.Object remove(int):556 -> remove
-    201:204:java.lang.Object remove(int):681:684 -> remove
-    205:205:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.right():777:777 -> remove
-    205:205:java.lang.Object remove(int):494 -> remove
-    206:206:java.lang.Object remove(int):494:494 -> remove
-    207:207:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.left():767:767 -> remove
-    207:207:java.lang.Object remove(int):497 -> remove
-    208:208:java.lang.Object remove(int):497:497 -> remove
+    92:94:java.lang.Object remove(int):562:564 -> remove
+    95:95:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> remove
+    95:95:java.lang.Object remove(int):564 -> remove
+    96:100:java.lang.Object remove(int):567:571 -> remove
+    101:101:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> remove
+    101:101:java.lang.Object remove(int):572 -> remove
+    102:148:java.lang.Object remove(int):573:619 -> remove
+    149:149:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.decBalance():893:893 -> remove
+    149:149:java.lang.Object remove(int):620 -> remove
+    150:152:java.lang.Object remove(int):623:625 -> remove
+    153:153:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> remove
+    153:153:java.lang.Object remove(int):625 -> remove
+    154:158:java.lang.Object remove(int):628:632 -> remove
+    159:159:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> remove
+    159:159:java.lang.Object remove(int):633 -> remove
+    160:202:java.lang.Object remove(int):634:676 -> remove
+    203:204:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):474:475 -> remove
+    203:204:java.lang.Object remove(int):556 -> remove
+    205:208:java.lang.Object remove(int):681:684 -> remove
+    209:209:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.right():777:777 -> remove
+    209:209:java.lang.Object remove(int):494 -> remove
+    210:210:java.lang.Object remove(int):494:494 -> remove
+    211:211:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.left():767:767 -> remove
+    211:211:java.lang.Object remove(int):497 -> remove
+    212:212:java.lang.Object remove(int):497:497 -> remove
     1:1:int size():985:985 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1384:1401 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.Hr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.gr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):102:102 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):102:102 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1.compare(java.lang.Integer,java.lang.Integer):108:108 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):102 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.Jr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.ir:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> c
     java.util.Comparator comparator -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1161:1162 -> <init>
@@ -74687,7 +73743,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1161:1161 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1236:1236 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1161 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.Ir:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.hr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2):1162:1162 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1162:1162 -> compare
@@ -74695,16 +73751,15 @@
     2:2:int compare(java.lang.Object,java.lang.Object):1162 -> compare
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1.compare(int,int):104:104 -> compare
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1164 -> compare
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int compare(java.lang.Object,java.lang.Object):1162 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.Kr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.jr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1384:1384 -> <init>
     1:1:void clear():1398:1398 -> clear
     1:1:boolean contains(java.lang.Object):1390:1390 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1386:1386 -> iterator
     1:1:int size():1394:1394 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.Lr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.kr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left -> d
     int info -> f
@@ -74725,7 +73780,7 @@
     1:1:int hashCode():953:953 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):923:924 -> setValue
     1:1:java.lang.String toString():958:958 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.Mr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.lr:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1131:1131 -> <init>
     1:1:void add(java.lang.Object):1130:1130 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1155:1155 -> add
@@ -74737,7 +73792,7 @@
     1:1:void set(java.lang.Object):1130:1130 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1150:1150 -> set
     2:2:void set(java.lang.Object):1130 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.Nr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.mr:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1253:1253 -> <init>
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator.add(java.lang.Integer):1301:1301 -> add
@@ -74751,12 +73806,12 @@
     1:1:void set(java.lang.Object):1252:1252 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator.set(java.lang.Integer):1295:1295 -> set
     2:2:void set(java.lang.Object):1252 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.Or:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.nr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1308:1308 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1308:1308 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1311:1311 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.Wr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.vr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
@@ -74831,7 +73886,7 @@
     1:4:java.lang.Object remove(int):1657:1660 -> remove
     1:5:int size():1665:1669 -> size
     1:21:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1598:1618 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.Pr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.or:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1497:1497 -> <init>
     1:1:void clear():1549:1549 -> clear
@@ -74864,19 +73919,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1497:1497 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1574:1574 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1497 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.Qr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.pr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1598:1598 -> <init>
     1:1:void clear():1615:1615 -> clear
     1:1:boolean contains(java.lang.Object):1605:1605 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1600:1600 -> iterator
     1:1:int size():1610:1610 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Rr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.qr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1580:1580 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1580:1580 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1582:1582 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Sr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.rr:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1808:1808 -> <init>
     1:1:void add(java.lang.Object):1807:1807 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1832:1832 -> add
@@ -74888,16 +73943,15 @@
     1:1:void set(java.lang.Object):1807:1807 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1827:1827 -> set
     2:2:void set(java.lang.Object):1807 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Tr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.sr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1778 -> <init>
     1:1:void updateNext():1802:1802 -> n
     2:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.next():902:904 -> n
     2:4:void updateNext():1802 -> n
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:6:void updateNext():1802:1803 -> n
     1:2:void updatePrevious():1797:1798 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Ur:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.tr:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1848:1848 -> <init>
     1:1:void add(java.lang.Object):1846:1846 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1896:1896 -> add
@@ -74911,14 +73965,14 @@
     1:1:void set(java.lang.Object):1846:1846 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator.set(java.lang.Integer):1890:1890 -> set
     2:2:void set(java.lang.Object):1846 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Vr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.ur:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1910:1910 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1910:1910 -> <init>
     1:1:void add(java.lang.Object):1928:1928 -> add
     1:1:java.lang.Object next():1913:1913 -> next
     1:1:java.lang.Object previous():1918:1918 -> previous
     1:1:void set(java.lang.Object):1923:1923 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.Xr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.wr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry curr -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next -> c
@@ -74933,34 +73987,33 @@
     1:1:void updateNext():1064:1064 -> n
     2:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.next():902:904 -> n
     2:4:void updateNext():1064 -> n
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:void updateNext():1064:1064 -> n
     1:1:int nextIndex():1088:1088 -> nextIndex
     1:1:void updatePrevious():1076:1076 -> o
     1:1:int previousIndex():1092:1092 -> previousIndex
     1:12:void remove():1096:1096 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.Yr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.xr:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1348:1348 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1348:1348 -> <init>
     1:1:void add(java.lang.Object):1366:1366 -> add
     1:1:java.lang.Object next():1351:1351 -> next
     1:1:java.lang.Object previous():1356:1356 -> previous
     1:1:void set(java.lang.Object):1361:1361 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.ds:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.Br:
     java.lang.Object[] value -> d
     int[] key -> c
     int size -> e
     1:3:void <init>():70:72 -> <init>
     4:6:void <init>(int):81:83 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):37:37 -> a
-    2:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.findKey(int):235:237 -> a
-    2:4:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap,int):37 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:7:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.findKey(int):235:237 -> a
-    5:7:boolean containsKey(int):265 -> a
-    8:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.findKey(int):235:237 -> a
-    8:10:java.lang.Object put(int,java.lang.Object):283 -> a
-    11:28:java.lang.Object put(int,java.lang.Object):285:302 -> a
+    2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap,int):37:37 -> a
+    3:5:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.findKey(int):235:237 -> a
+    3:5:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap,int):37 -> a
+    6:8:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.findKey(int):235:237 -> a
+    6:8:boolean containsKey(int):265 -> a
+    9:11:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.findKey(int):235:237 -> a
+    9:11:java.lang.Object put(int,java.lang.Object):283 -> a
+    12:29:java.lang.Object put(int,java.lang.Object):285:302 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):37:37 -> b
     1:1:int[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):37:37 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.int2ReferenceEntrySet():231:231 -> c
@@ -74980,8 +74033,7 @@
     4:10:java.lang.Object remove(int):309:315 -> remove
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():326:326 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.internal.as:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.cs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.Ar:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1):133:133 -> <init>
@@ -74991,7 +74043,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.bs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.zr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -75000,10 +74052,10 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.es:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.Cr:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.ns:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.Lr:
     java.lang.Object[] value -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> n
     int size -> l
@@ -75019,16 +74071,16 @@
     boolean containsNullKey -> f
     1:1:void <init>(int,float):146:146 -> <init>
     2:56:void <init>(int,float):101:155 -> <init>
-    1:1:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,int):86:86 -> a
+    1:1:java.lang.Object access$200(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):86:86 -> a
     2:7:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.removeNullEntry():285:290 -> a
     2:7:java.lang.Object access$200(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):86 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:32:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.insert(int,java.lang.Object):307:331 -> a
-    8:32:java.lang.Object put(int,java.lang.Object):338 -> a
-    33:35:java.lang.Object put(int,java.lang.Object):339:341 -> a
-    36:45:boolean containsKey(int):684:693 -> a
-    46:48:int firstIntKey():905:905 -> a
-    49:49:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):947:947 -> a
+    8:8:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,int):86:86 -> a
+    9:33:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.insert(int,java.lang.Object):307:331 -> a
+    9:33:java.lang.Object put(int,java.lang.Object):338 -> a
+    34:36:java.lang.Object put(int,java.lang.Object):339:341 -> a
+    37:46:boolean containsKey(int):684:693 -> a
+    47:49:int firstIntKey():905:905 -> a
+    50:50:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):947:947 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):927:927 -> b
     1:24:void fixPointers(int,int):872:895 -> c
     25:25:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):937:937 -> c
@@ -75072,14 +74124,14 @@
     8:18:java.lang.Object remove(int):378:388 -> remove
     1:1:int size():727:727 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1532:1553 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.fs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Dr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1532:1532 -> <init>
     1:1:void clear():1550:1550 -> clear
     1:1:boolean contains(java.lang.Object):1545:1545 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1535:1535 -> iterator
     1:1:int size():1540:1540 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.gs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Er:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1158:1158 -> <init>
@@ -75094,7 +74146,7 @@
     1:1:void set(java.lang.Object):1155:1155 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1147:1147 -> set
     2:2:void set(java.lang.Object):1155 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.hs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Fr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1409:1410 -> <init>
     1:1:void add(java.lang.Object):1371:1371 -> add
@@ -75109,7 +74161,7 @@
     1:1:void set(java.lang.Object):1371:1371 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeyIterator.set(java.lang.Integer):1400:1400 -> set
     2:2:void set(java.lang.Object):1371 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.is:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Gr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1425:1425 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1):1425:1425 -> <init>
@@ -75128,7 +74180,7 @@
     1:3:boolean remove(int):1446:1448 -> j
     1:3:int lastInt():1464:1464 -> r
     1:1:int size():1436:1436 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.js:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Hr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,int):771:772 -> <init>
@@ -75140,7 +74192,7 @@
     1:1:int hashCode():817:817 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):790:791 -> setValue
     1:1:java.lang.String toString():822:822 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.ks:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Ir:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1205:1205 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1):1205:1205 -> <init>
@@ -75162,7 +74214,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1205:1205 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1227:1227 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1205 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.ls:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Jr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -75180,22 +74232,22 @@
     1:2:int previousIndex():1057:1058 -> previousIndex
     1:48:void remove():1080:1127 -> remove
     49:49:void remove():1081:1081 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.ms:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Kr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1520:1521 -> <init>
     1:1:void add(java.lang.Object):1517:1517 -> add
     1:1:java.lang.Object next():1526:1526 -> next
     1:1:java.lang.Object previous():1507:1507 -> previous
     1:1:void set(java.lang.Object):1512:1512 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.qs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.Or:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.os:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.Mr:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.ps:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.ss:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Nr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.Qr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap EMPTY_MAP -> a
     1:1:void <clinit>():124:124 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.rs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.Pr:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.<init>():41:41 -> <init>
     1:1:void <init>():46 -> <init>
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.containsKey(int) -> a
@@ -75218,7 +74270,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():86:86 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap.values():86:86 -> values
     2:2:java.util.Collection values():43 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.Bs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.Zr:
     java.lang.Object[] value -> d
     float f -> j
     int[] key -> c
@@ -75234,14 +74286,14 @@
     10:10:void <init>(int,float):93:93 -> <init>
     11:11:void <init>():119:119 -> <init>
     12:13:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> <init>
-    1:1:java.lang.Object access$400(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):49:49 -> a
+    1:1:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):49:49 -> a
     2:6:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.removeNullEntry():228:232 -> a
     2:6:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):49 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:22:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.insert(int,java.lang.Object):249:264 -> a
-    7:22:java.lang.Object put(int,java.lang.Object):271 -> a
-    23:25:java.lang.Object put(int,java.lang.Object):272:274 -> a
-    26:35:boolean containsKey(int):344:353 -> a
+    7:7:java.lang.Object access$400(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):49:49 -> a
+    8:23:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.insert(int,java.lang.Object):249:264 -> a
+    8:23:java.lang.Object put(int,java.lang.Object):271 -> a
+    24:26:java.lang.Object put(int,java.lang.Object):272:274 -> a
+    27:36:boolean containsKey(int):344:353 -> a
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.int2ReferenceEntrySet():707:708 -> c
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():49 -> c
     1:5:void clear():377:381 -> clear
@@ -75281,14 +74333,14 @@
     7:17:java.lang.Object remove(int):310:320 -> remove
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.ts:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.Rr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.us:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Sr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):600:600 -> <init>
@@ -75296,13 +74348,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator.next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.vs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Tr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):721:722 -> <init>
     1:1:int nextInt():727:727 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.ws:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.Ur:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):737:737 -> <init>
@@ -75311,7 +74363,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:3:boolean remove(int):755:757 -> j
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.xs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.Vr:
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -75323,7 +74375,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.ys:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Wr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -75332,7 +74384,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.zs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.Xr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNullKey -> e
@@ -75351,11 +74403,11 @@
     15:24:void remove():580 -> remove
     25:26:void remove():583:584 -> remove
     27:27:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.As:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Yr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.Us:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.rs:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry[] nodePath -> l
@@ -75472,8 +74524,7 @@
     263:264:java.lang.Object remove(int):472:473 -> remove
     1:1:int size():951:951 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1348:1369 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.Cs:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.Es:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.bs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> c
     java.util.Comparator comparator -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1127:1128 -> <init>
@@ -75496,20 +74547,20 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1127:1127 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1202:1202 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1127 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.Ds:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.as:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2):1128:1128 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1128:1128 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1130:1130 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1128 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.Fs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.cs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1348:1348 -> <init>
     1:1:void clear():1366:1366 -> clear
     1:1:boolean contains(java.lang.Object):1356:1356 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1351:1351 -> iterator
     1:1:int size():1361:1361 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.Gs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.ds:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry left -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry right -> e
     int info -> f
@@ -75530,7 +74581,7 @@
     1:1:int hashCode():919:919 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):889:890 -> setValue
     1:1:java.lang.String toString():924:924 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.Hs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.es:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1097:1097 -> <init>
     1:1:void add(java.lang.Object):1096:1096 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1121:1121 -> add
@@ -75542,7 +74593,7 @@
     1:1:void set(java.lang.Object):1096:1096 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1116:1116 -> set
     2:2:void set(java.lang.Object):1096 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.Is:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.fs:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1219:1219 -> <init>
     1:1:void add(java.lang.Object):1218:1218 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator.add(java.lang.Integer):1267:1267 -> add
@@ -75556,12 +74607,12 @@
     1:1:void set(java.lang.Object):1218:1218 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator.set(java.lang.Integer):1261:1261 -> set
     2:2:void set(java.lang.Object):1218 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.Js:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.gs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1274:1274 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1274:1274 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1276:1276 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.Rs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.os:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> j
@@ -75617,7 +74668,7 @@
     1:4:java.lang.Object remove(int):1622:1625 -> remove
     1:5:int size():1630:1634 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1566:1583 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.Ks:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.hs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1465:1465 -> <init>
     1:1:void clear():1517:1517 -> clear
@@ -75650,19 +74701,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465:1465 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1542:1542 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.Ls:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.is:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1566:1566 -> <init>
     1:1:void clear():1580:1580 -> clear
     1:1:boolean contains(java.lang.Object):1572:1572 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1568:1568 -> iterator
     1:1:int size():1576:1576 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Ms:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.js:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1548:1548 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1548:1548 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1550:1550 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Ns:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.ks:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1773:1773 -> <init>
     1:1:void add(java.lang.Object):1772:1772 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1797:1797 -> add
@@ -75674,16 +74725,15 @@
     1:1:void set(java.lang.Object):1772:1772 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1792:1792 -> set
     2:2:void set(java.lang.Object):1772 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Os:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.ls:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1742:1743 -> <init>
     1:1:void updateNext():1767:1767 -> n
     2:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.next():868:870 -> n
     2:4:void updateNext():1767 -> n
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:6:void updateNext():1767:1768 -> n
     1:2:void updatePrevious():1762:1763 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Ps:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.ms:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1813:1813 -> <init>
     1:1:void add(java.lang.Object):1811:1811 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1861:1861 -> add
@@ -75697,14 +74747,14 @@
     1:1:void set(java.lang.Object):1811:1811 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator.set(java.lang.Integer):1855:1855 -> set
     2:2:void set(java.lang.Object):1811 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Qs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.ns:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1875:1875 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1875:1875 -> <init>
     1:1:void add(java.lang.Object):1893:1893 -> add
     1:1:java.lang.Object next():1878:1878 -> next
     1:1:java.lang.Object previous():1883:1883 -> previous
     1:1:void set(java.lang.Object):1888:1888 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Ss:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.ps:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry prev -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry curr -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry next -> c
@@ -75719,20 +74769,19 @@
     1:1:void updateNext():1030:1030 -> n
     2:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.next():868:870 -> n
     2:4:void updateNext():1030 -> n
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:void updateNext():1030:1030 -> n
     1:1:int nextIndex():1054:1054 -> nextIndex
     1:1:void updatePrevious():1042:1042 -> o
     1:1:int previousIndex():1058:1058 -> previousIndex
     1:12:void remove():1062:1062 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Ts:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.qs:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1312:1312 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1312:1312 -> <init>
     1:1:void add(java.lang.Object):1330:1330 -> add
     1:1:java.lang.Object next():1315:1315 -> next
     1:1:java.lang.Object previous():1320:1320 -> previous
     1:1:void set(java.lang.Object):1325:1325 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.Ws:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.ts:
     int firstIntKey() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer) -> a
@@ -75742,11 +74791,11 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> c
     int lastIntKey() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Vs:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.Ys:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.ss:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.vs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap EMPTY_MAP -> a
     1:1:void <clinit>():185:185 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.Xs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.us:
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):95:95 -> a
     2:2:int firstIntKey():112:112 -> a
@@ -75771,7 +74820,7 @@
     2:2:java.lang.Integer lastKey():177:177 -> lastKey
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):57:57 -> subMap
     1:1:java.util.SortedMap tailMap(java.lang.Object):57:57 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.dt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.zs:
     int[] a -> b
     int size -> c
     1:2:void <init>(int[],boolean):70:71 -> <init>
@@ -75938,7 +74987,7 @@
     6:6:void grow(int):250:250 -> o
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.ct:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.ys:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -75952,7 +75001,7 @@
     1:1:int nextIndex():516:516 -> nextIndex
     1:1:int previousIndex():520:520 -> previousIndex
     1:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.ft:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.Bs:
     int[] a -> b
     int size -> c
     1:2:void <init>():55:56 -> <init>
@@ -75995,24 +75044,24 @@
     1:2:boolean remove(int):153 -> j
     3:6:boolean remove(int):155:158 -> j
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.et:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.As:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet this$0 -> c
     int next -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:int nextInt():129:129 -> j
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.gt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.Cs:
     int[] EMPTY_ARRAY -> a
     1:1:void <clinit>():100:100 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.ht:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.Ds:
     int previousInt() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.jt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.Fs:
     boolean add(int) -> a
     boolean contains(int) -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.mt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.Is:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):536:536 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.kt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.Gs:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):96:96 -> a
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
@@ -76023,7 +75072,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.lt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.Hs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> b
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):369:371 -> <init>
     1:1:boolean add(java.lang.Object):365:365 -> add
@@ -76048,23 +75097,23 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):422:422 -> toArray
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.nt:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.pt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.Js:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.Ls:
     int nextInt() -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.st:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.Os:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.qt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.Ms:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:int previousInt():62:62 -> d
     1:1:int nextInt():57:57 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.rt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Ns:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):807:808 -> <init>
     1:1:boolean hasNext():813:813 -> hasNext
     1:1:int nextInt():818:818 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.tt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.Ps:
     boolean add(int) -> a
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
@@ -76072,11 +75121,11 @@
     int set(int,int) -> c
     int removeInt(int) -> g
     int getInt(int) -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.ut:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.wt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.Qs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.Ss:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList EMPTY_LIST -> a
     1:1:void <clinit>():323:323 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.vt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.Rs:
     1:1:void <init>():65:65 -> <init>
     1:1:boolean add(java.lang.Integer):156:156 -> a
     2:3:void getElements(int,int[],int,int):263:264 -> a
@@ -76116,7 +75165,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList.subList(int,int):246:246 -> subList
     1:1:java.util.List subList(int,int):62 -> subList
     1:1:java.lang.String toString():311:311 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.Et:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.Zs:
     int[] key -> b
     float f -> h
     int maxFill -> f
@@ -76173,8 +75222,7 @@
     9:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.shiftKeys(int):339:343 -> l
     9:13:boolean removeEntry(int):349 -> l
     1:1:int size():412:412 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.internal.Ct:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.Dt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.Ys:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNull -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet this$0 -> g
@@ -76193,25 +75241,25 @@
     14:22:void remove():532 -> remove
     23:24:void remove():535:536 -> remove
     25:25:void remove():528:528 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.Ft:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.Ht:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.at:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.ct:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():76:76 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.Gt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.bt:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean rem(int):64:64 -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.It:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.dt:
     int firstInt() -> Y
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int) -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int) -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int) -> d
     int lastInt() -> r
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.Kt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.ft:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():168:168 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.Jt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.et:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():155:155 -> clone
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet.first():139:139 -> first
@@ -76262,7 +75310,6 @@
     1:7:void putAll(java.util.Map):70:76 -> putAll
     8:8:long com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry.getLongKey():439:439 -> putAll
     8:8:void putAll(java.util.Map):76 -> putAll
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:15:void putAll(java.util.Map):76:82 -> putAll
     16:18:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Long,java.lang.Object):135:137 -> putAll
     16:18:void putAll(java.util.Map):82 -> putAll
@@ -76282,7 +75329,6 @@
     7:12:java.lang.String toString():309:314 -> toString
     13:13:long com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry.getLongKey():439:439 -> toString
     13:13:java.lang.String toString():314 -> toString
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:20:java.lang.String toString():314:320 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongBidirectionalIterator -> com.android.tools.r8.internal.a0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.<init>():34:34 -> <init>
@@ -76321,7 +75367,6 @@
     4:4:int compareTo(java.util.List):466:466 -> a
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.listIterator():192:192 -> a
     5:5:int compareTo(java.util.List):466 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:11:int compareTo(java.util.List):469:474 -> a
     12:12:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.listIterator():192:192 -> a
     12:12:int compareTo(java.util.List):476 -> a
@@ -76357,14 +75402,13 @@
     9:9:boolean equals(java.lang.Object):438:438 -> equals
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.listIterator():192:192 -> equals
     10:10:boolean equals(java.lang.Object):441 -> equals
-    11:11:boolean equals(java.lang.Object):441:441 -> equals
-    12:12:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():57:57 -> equals
-    12:12:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():33 -> equals
-    12:12:boolean equals(java.lang.Object):443 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    13:13:boolean equals(java.lang.Object):443:443 -> equals
-    14:14:boolean com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.valEquals(java.lang.Object,java.lang.Object):407:407 -> equals
+    11:13:boolean equals(java.lang.Object):441:443 -> equals
+    14:14:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():57:57 -> equals
+    14:14:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():33 -> equals
     14:14:boolean equals(java.lang.Object):443 -> equals
+    15:15:boolean equals(java.lang.Object):443:443 -> equals
+    16:16:boolean com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.valEquals(java.lang.Object,java.lang.Object):407:407 -> equals
+    16:16:boolean equals(java.lang.Object):443 -> equals
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.get(int):605:605 -> get
     1:1:java.lang.Object get(int):32 -> get
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.listIterator():192:192 -> hashCode
@@ -76509,9 +75553,9 @@
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet.size():745:745 -> hashCode
     2:2:int hashCode():57 -> hashCode
     3:8:int hashCode():58:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.TC:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.UC:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.dD:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.bC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.cC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.lC:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     java.lang.Object[] value -> c
     int size -> h
@@ -76523,17 +75567,17 @@
     int mask -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet keys -> j
     1:9:void <init>(int,float):91:99 -> <init>
-    1:1:java.lang.Object access$400(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):49:49 -> a
+    1:1:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):49:49 -> a
     2:6:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.removeNullEntry():228:232 -> a
     2:6:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):49 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:22:int com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.insert(long,java.lang.Object):249:264 -> a
-    7:22:java.lang.Object put(long,java.lang.Object):271 -> a
-    23:24:java.lang.Object put(long,java.lang.Object):273:274 -> a
-    25:25:java.lang.Object remove(long):309:309 -> a
-    26:30:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.removeNullEntry():228:232 -> a
-    26:30:java.lang.Object remove(long):309 -> a
-    31:38:java.lang.Object remove(long):313:320 -> a
+    7:7:java.lang.Object access$400(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):49:49 -> a
+    8:23:int com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.insert(long,java.lang.Object):249:264 -> a
+    8:23:java.lang.Object put(long,java.lang.Object):271 -> a
+    24:25:java.lang.Object put(long,java.lang.Object):273:274 -> a
+    26:26:java.lang.Object remove(long):309:309 -> a
+    27:31:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.removeNullEntry():228:232 -> a
+    27:31:java.lang.Object remove(long):309 -> a
+    32:39:java.lang.Object remove(long):313:320 -> a
     1:10:boolean containsKey(long):344:353 -> b
     1:11:java.lang.Object get(long):327:337 -> c
     1:5:void clear():377:381 -> clear
@@ -76570,14 +75614,14 @@
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.VC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.dC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.WC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.eC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry entry -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> i
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):600:600 -> <init>
@@ -76585,13 +75629,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator.next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.XC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.fC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     1:1:long nextLong():727:727 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.YC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.gC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):737:737 -> <init>
@@ -76599,7 +75643,7 @@
     1:1:boolean contains(long):750:750 -> b
     1:1:void clear():762:762 -> clear
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.ZC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.hC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -76610,7 +75654,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.aD:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.iC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -76619,7 +75663,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.bD:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.jC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList wrapped -> f
@@ -76638,11 +75682,11 @@
     15:24:void remove():580 -> remove
     25:26:void remove():583:584 -> remove
     27:27:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.cD:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.kC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.fD:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.nC:
     long[] a -> b
     int size -> c
     1:3:void <init>(int):81:83 -> <init>
@@ -76730,7 +75774,7 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator listIterator(int):493:494 -> k
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.eD:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.mC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -76744,18 +75788,18 @@
     1:1:int nextIndex():516:516 -> nextIndex
     1:1:int previousIndex():520:520 -> previousIndex
     1:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.gD:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.oC:
     long previousLong() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.hD:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.jD:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.pC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.rC:
     long nextLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.kD:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.sC:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long getLong(int) -> b
     long set(int,long) -> b
     long removeLong(int) -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.qD:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.yC:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.internal.I0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -76793,15 +75837,14 @@
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):41 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):0 -> put
       # {"id":"com.android.tools.r8.synthesized"}
-    1:6:void putAll(java.util.Map):82:87 -> putAll
-    7:7:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getKey():128:128 -> putAll
-    7:7:void putAll(java.util.Map):88 -> putAll
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> putAll
+    1:7:void putAll(java.util.Map):82:88 -> putAll
+    8:8:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getKey():128:128 -> putAll
     8:8:void putAll(java.util.Map):88 -> putAll
-    9:15:void putAll(java.util.Map):88:94 -> putAll
-    16:17:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:124 -> putAll
-    16:17:void putAll(java.util.Map):94 -> putAll
+    9:9:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> putAll
+    9:9:void putAll(java.util.Map):88 -> putAll
+    10:16:void putAll(java.util.Map):88:94 -> putAll
+    17:18:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:124 -> putAll
+    17:18:void putAll(java.util.Map):94 -> putAll
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.remove(java.lang.Object):41:41 -> remove
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.remove(java.lang.Object):0 -> remove
       # {"id":"com.android.tools.r8.synthesized"}
@@ -76811,14 +75854,13 @@
     3:3:java.lang.String toString():329:329 -> toString
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet.iterator():136:136 -> toString
     4:4:java.lang.String toString():329 -> toString
-    5:12:java.lang.String toString():330:337 -> toString
-    13:13:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getKey():128:128 -> toString
-    13:13:java.lang.String toString():338 -> toString
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:16:java.lang.String toString():338:340 -> toString
-    17:17:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
-    17:17:java.lang.String toString():341 -> toString
-    18:21:java.lang.String toString():341:344 -> toString
+    5:13:java.lang.String toString():330:338 -> toString
+    14:14:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getKey():128:128 -> toString
+    14:14:java.lang.String toString():338 -> toString
+    15:17:java.lang.String toString():338:340 -> toString
+    18:18:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
+    18:18:java.lang.String toString():341 -> toString
+    19:22:java.lang.String toString():341:344 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry -> com.android.tools.r8.internal.H0:
     java.lang.Object key -> b
     boolean value -> c
@@ -76980,7 +76022,6 @@
     5:5:java.lang.String toString():281:281 -> toString
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet.iterator():1228:1228 -> toString
     6:6:java.lang.String toString():281 -> toString
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:java.lang.String toString():282:282 -> toString
     8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.size():761:761 -> toString
     8:8:java.lang.String toString():282 -> toString
@@ -77065,7 +76106,6 @@
     3:3:int compareTo(java.util.List):460:460 -> a
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList.listIterator():193:193 -> a
     4:4:int compareTo(java.util.List):460 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:10:int compareTo(java.util.List):463:468 -> a
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList.listIterator():193:193 -> a
     11:11:int compareTo(java.util.List):470 -> a
@@ -77483,7 +76523,7 @@
     1:7:int hashCode():57:63 -> hashCode
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.internal.n1:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.zI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.wH:
     java.lang.Object[] key -> b
     boolean[] value -> c
     int size -> d
@@ -77511,8 +76551,7 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.internal.wI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.yI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.vH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1):133:133 -> <init>
@@ -77522,7 +76561,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.xI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.uH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -77531,7 +76570,7 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.DI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.zH:
     java.lang.Object[] key -> c
     int[] value -> d
     int size -> e
@@ -77562,8 +76601,7 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.internal.AI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.CI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.yH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1):133:133 -> <init>
@@ -77573,7 +76611,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.BI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.xH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -77582,9 +76620,9 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.EI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.AH:
     int getInt(java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.NI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.JH:
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
     java.lang.Object[] key -> c
@@ -77601,14 +76639,14 @@
     1:1:void <init>(int,float):147:147 -> <init>
     2:56:void <init>(int,float):102:156 -> <init>
     57:57:void <init>():176:176 -> <init>
-    1:1:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,int):87:87 -> a
+    1:1:int access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):87:87 -> a
     2:7:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.removeNullEntry():285:290 -> a
     2:7:int access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:32:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.insert(java.lang.Object,int):307:331 -> a
-    8:32:int put(java.lang.Object,int):338 -> a
-    33:35:int put(java.lang.Object,int):339:341 -> a
-    36:46:int getInt(java.lang.Object):721:731 -> a
+    8:8:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,int):87:87 -> a
+    9:33:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.insert(java.lang.Object,int):307:331 -> a
+    9:33:int put(java.lang.Object,int):338 -> a
+    34:36:int put(java.lang.Object,int):339:341 -> a
+    37:47:int getInt(java.lang.Object):721:731 -> a
     1:1:int removeInt(java.lang.Object):431:431 -> c
     2:7:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.removeNullEntry():285:290 -> c
     2:7:int removeInt(java.lang.Object):431 -> c
@@ -77657,14 +76695,14 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.FI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.BH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
     1:1:boolean contains(int):1609:1609 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.GI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.CH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -77679,14 +76717,14 @@
     1:1:void set(java.lang.Object):1219:1219 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):1211:1211 -> set
     2:2:void set(java.lang.Object):1219 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.HI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.DH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.II:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.EH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1465:1465 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1465:1465 -> <init>
@@ -77708,7 +76746,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1465 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet.tailSet(java.lang.Object):1515:1515 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.JI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.FH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -77727,7 +76765,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry.setValue(java.lang.Integer):869:869 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):819 -> setValue
     1:1:java.lang.String toString():887:887 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.KI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.GH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1269:1269 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1269:1269 -> <init>
@@ -77749,7 +76787,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1269:1269 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):1291:1291 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1269 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.LI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.HH:
     int curr -> d
     int index -> e
     int prev -> b
@@ -77767,7 +76805,7 @@
     1:2:int previousIndex():1122:1123 -> previousIndex
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.MI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.IH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -77782,11 +76820,11 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator.set(java.lang.Integer):1559:1559 -> set
     2:2:void set(java.lang.Object):1544 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.QI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.MH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.OI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.PI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.ZI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.KH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.LH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.VH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> c
@@ -77798,15 +76836,14 @@
     int mask -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet entries -> j
     1:9:void <init>(int,float):91:99 -> <init>
-    10:10:void <init>():119:119 -> <init>
-    1:1:int access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):49:49 -> a
+    1:1:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):49:49 -> a
     2:6:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.removeNullEntry():227:231 -> a
     2:6:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):49 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:22:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.insert(java.lang.Object,int):248:263 -> a
-    7:22:int put(java.lang.Object,int):270 -> a
-    23:25:int put(java.lang.Object,int):271:273 -> a
-    26:36:int getInt(java.lang.Object):371:381 -> a
+    7:7:int access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):49:49 -> a
+    8:23:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.insert(java.lang.Object,int):248:263 -> a
+    8:23:int put(java.lang.Object,int):270 -> a
+    24:26:int put(java.lang.Object,int):271:273 -> a
+    27:37:int getInt(java.lang.Object):371:381 -> a
     1:1:int removeInt(java.lang.Object):353:353 -> c
     2:6:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.removeNullEntry():227:231 -> c
     2:6:int removeInt(java.lang.Object):353 -> c
@@ -77848,14 +76885,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.RI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.NH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):848:848 -> <init>
     1:1:void clear():866:866 -> clear
     1:1:boolean contains(int):861:861 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.SI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.OH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry entry -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> i
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):654:654 -> <init>
@@ -77863,11 +76900,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.TI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.PH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.UI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.QH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):785:785 -> <init>
@@ -77876,7 +76913,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.VI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.RH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):473:474 -> <init>
@@ -77895,7 +76932,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry.setValue(java.lang.Integer):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.WI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.SH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):679:679 -> <init>
@@ -77904,7 +76941,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.XI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.TH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> f
     boolean mustReturnNullKey -> e
     int c -> d
@@ -77923,16 +76960,16 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.YI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.UH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.aJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.bJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.cJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.lJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.WH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.XH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.YH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.hI:
     long[] value -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     java.lang.Object[] key -> b
@@ -77945,13 +76982,13 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet entries -> i
     1:9:void <init>(int,float):91:99 -> <init>
     10:10:void <init>():119:119 -> <init>
-    1:1:long access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):49:49 -> a
+    1:1:long access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):49:49 -> a
     2:6:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.removeNullEntry():227:231 -> a
     2:6:long access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):49 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:22:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.insert(java.lang.Object,long):248:263 -> a
-    7:22:long put(java.lang.Object,long):270 -> a
-    23:24:long put(java.lang.Object,long):272:273 -> a
+    7:7:long access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):49:49 -> a
+    8:23:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.insert(java.lang.Object,long):248:263 -> a
+    8:23:long put(java.lang.Object,long):270 -> a
+    24:25:long put(java.lang.Object,long):272:273 -> a
     1:1:long removeLong(java.lang.Object):353:353 -> c
     2:6:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.removeNullEntry():227:231 -> c
     2:6:long removeLong(java.lang.Object):353 -> c
@@ -77992,17 +77029,16 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.dJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.ZH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):848:848 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> a
     1:1:boolean contains(long):861:861 -> b
     2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.containsValue(long):404:408 -> b
     2:6:boolean contains(long):861 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:void clear():866:866 -> clear
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.eJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.aI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):654:654 -> <init>
@@ -78010,11 +77046,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.fJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.bI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.gJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.cI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):785:785 -> <init>
@@ -78023,7 +77059,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.hJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.dI:
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):473:474 -> <init>
@@ -78042,7 +77078,7 @@
     5:5:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry.setValue(java.lang.Long):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.iJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.eI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):679:679 -> <init>
@@ -78051,7 +77087,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.jJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.fI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> f
     boolean mustReturnNullKey -> e
     int c -> d
@@ -78070,13 +77106,13 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.kJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.gI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.uJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.qI:
     java.lang.Object[] key -> b
     int size -> l
     java.lang.Object[] value -> c
@@ -78093,11 +77129,10 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> n
     1:1:void <init>(int,float,com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):149:149 -> <init>
     2:59:void <init>(int,float,com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):102:159 -> <init>
-    60:60:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):184:184 -> <init>
-    1:1:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):85:85 -> a
+    1:1:java.lang.Object access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):85:85 -> a
     2:8:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.removeNullEntry():315:321 -> a
     2:8:java.lang.Object access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):85 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    9:9:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):85:85 -> a
     1:24:void fixPointers(int,int):894:917 -> c
     1:6:void clear():751:756 -> clear
     1:12:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.clone():1701:1712 -> clone
@@ -78149,14 +77184,14 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.values():1529:1550 -> values
     1:22:java.util.Collection values():85 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.mJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.iI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1529:1529 -> <init>
     1:1:void clear():1547:1547 -> clear
     1:1:boolean contains(java.lang.Object):1542:1542 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1532:1532 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.nJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.jI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1181:1181 -> <init>
@@ -78171,14 +77206,14 @@
     1:1:void set(java.lang.Object):1178:1178 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1170:1170 -> set
     2:2:void set(java.lang.Object):1178 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.oJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.kI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1412:1413 -> <init>
     1:1:void add(java.lang.Object):1409:1409 -> add
     1:1:java.lang.Object next():1418:1418 -> next
     1:1:java.lang.Object previous():1399:1399 -> previous
     1:1:void set(java.lang.Object):1404:1404 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.pJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.lI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1422:1422 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1422:1422 -> <init>
@@ -78200,7 +77235,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1422 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet.tailSet(java.lang.Object):1472:1472 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1422 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.qJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.mI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):805:806 -> <init>
@@ -78210,7 +77245,7 @@
     1:1:int hashCode():839:839 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):824:825 -> setValue
     1:1:java.lang.String toString():844:844 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.rJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.nI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1228:1228 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1228:1228 -> <init>
@@ -78232,7 +77267,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1228:1228 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1250:1250 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1228 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.sJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.oI:
     int curr -> d
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
@@ -78250,17 +77285,17 @@
     1:2:int previousIndex():1079:1080 -> previousIndex
     1:49:void remove():1102:1150 -> remove
     50:50:void remove():1103:1103 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.tJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.pI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1517:1518 -> <init>
     1:1:void add(java.lang.Object):1514:1514 -> add
     1:1:java.lang.Object next():1523:1523 -> next
     1:1:java.lang.Object previous():1504:1504 -> previous
     1:1:void set(java.lang.Object):1509:1509 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.wJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.vJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.xJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.GJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.sI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.rI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.tI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.CI:
     java.lang.Object[] value -> d
     int size -> l
     java.lang.Object[] key -> c
@@ -78277,10 +77312,10 @@
     1:1:void <init>(int,float):145:145 -> <init>
     2:56:void <init>(int,float):100:154 -> <init>
     57:57:void <init>(int,float):147:147 -> <init>
-    1:1:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):85:85 -> a
+    1:1:java.lang.Object access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):85:85 -> a
     2:8:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.removeNullEntry():284:290 -> a
     2:8:java.lang.Object access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):85 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    9:9:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):85:85 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):938:938 -> b
     1:24:void fixPointers(int,int):863:886 -> c
     25:25:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):928:928 -> c
@@ -78335,14 +77370,14 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.values():1498:1519 -> values
     1:22:java.util.Collection values():85 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.yJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.uI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1498:1498 -> <init>
     1:1:void clear():1516:1516 -> clear
     1:1:boolean contains(java.lang.Object):1511:1511 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1501:1501 -> iterator
     1:1:int size():1506:1506 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.zJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.vI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1150:1150 -> <init>
@@ -78357,14 +77392,14 @@
     1:1:void set(java.lang.Object):1147:1147 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1139:1139 -> set
     2:2:void set(java.lang.Object):1147 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.AJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.wI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1381:1382 -> <init>
     1:1:void add(java.lang.Object):1378:1378 -> add
     1:1:java.lang.Object next():1387:1387 -> next
     1:1:java.lang.Object previous():1368:1368 -> previous
     1:1:void set(java.lang.Object):1373:1373 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.BJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.xI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1391:1391 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1391:1391 -> <init>
@@ -78386,7 +77421,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1391 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet.tailSet(java.lang.Object):1441:1441 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1391 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.CJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.yI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):774:775 -> <init>
@@ -78396,7 +77431,7 @@
     1:1:int hashCode():808:808 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):793:794 -> setValue
     1:1:java.lang.String toString():813:813 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.DJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.zI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1197:1197 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1197:1197 -> <init>
@@ -78418,7 +77453,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1197:1197 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1219:1219 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1197 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.EJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.AI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -78436,16 +77471,16 @@
     1:2:int previousIndex():1048:1049 -> previousIndex
     1:49:void remove():1071:1119 -> remove
     50:50:void remove():1072:1072 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.FJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.BI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1486:1487 -> <init>
     1:1:void add(java.lang.Object):1483:1483 -> add
     1:1:java.lang.Object next():1492:1492 -> next
     1:1:java.lang.Object previous():1473:1473 -> previous
     1:1:void set(java.lang.Object):1478:1478 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.IJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.HJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.aK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.EI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.DI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.WI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry[] nodePath -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
@@ -78556,7 +77591,7 @@
     1:1:int size():939:939 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.values():1311:1332 -> values
     1:22:java.util.Collection values():43 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.KJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.GI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> c
     java.util.Comparator comparator -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1116:1117 -> <init>
@@ -78579,20 +77614,20 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1116:1116 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1189:1189 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1116 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1 -> com.android.tools.r8.internal.JJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1 -> com.android.tools.r8.internal.FI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1117:1117 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1117:1117 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1119:1119 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1117 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.LJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.HI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1311:1311 -> <init>
     1:1:void clear():1329:1329 -> clear
     1:1:boolean contains(java.lang.Object):1319:1319 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1314:1314 -> iterator
     1:1:int size():1324:1324 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.MJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.II:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry left -> d
     int info -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry right -> e
@@ -78613,7 +77648,7 @@
     1:1:int hashCode():906:906 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):876:877 -> setValue
     1:1:java.lang.String toString():911:911 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.NJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.JI:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1086:1086 -> <init>
     1:1:void add(java.lang.Object):1085:1085 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1110:1110 -> add
@@ -78625,18 +77660,18 @@
     1:1:void set(java.lang.Object):1085:1085 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1105:1105 -> set
     2:2:void set(java.lang.Object):1085 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.OJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.KI:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1206:1206 -> <init>
     1:1:void add(java.lang.Object):1230:1230 -> add
     1:1:java.lang.Object next():1215:1215 -> next
     1:1:java.lang.Object previous():1220:1220 -> previous
     1:1:void set(java.lang.Object):1225:1225 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.PJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.LI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1237:1237 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1237:1237 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1239:1239 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.XJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.TI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
@@ -78734,7 +77769,7 @@
     1:5:int size():1591:1595 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap.values():1527:1544 -> values
     1:18:java.util.Collection values():1366 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.QJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.MI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1428:1428 -> <init>
     1:1:void clear():1478:1478 -> clear
@@ -78767,19 +77802,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1428:1428 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1503:1503 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1428 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.RJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.NI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1527:1527 -> <init>
     1:1:void clear():1541:1541 -> clear
     1:1:boolean contains(java.lang.Object):1533:1533 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1529:1529 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.SJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.OI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1509:1509 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1509:1509 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1511:1511 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.TJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.PI:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1734:1734 -> <init>
     1:1:void add(java.lang.Object):1733:1733 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1758:1758 -> add
@@ -78791,13 +77826,12 @@
     1:1:void set(java.lang.Object):1733:1733 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1753:1753 -> set
     2:2:void set(java.lang.Object):1733 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.UJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.QI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1703:1704 -> <init>
     1:1:void updateNext():1728:1728 -> n
     2:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.next():855:857 -> n
     2:4:void updateNext():1728 -> n
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:6:void updateNext():1728:1729 -> n
     7:7:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> n
     7:7:void updateNext():1729 -> n
@@ -78806,20 +77840,20 @@
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> o
     3:3:void updatePrevious():1724 -> o
     4:4:void updatePrevious():1724:1724 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.VJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.RI:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1774:1774 -> <init>
     1:1:void add(java.lang.Object):1798:1798 -> add
     1:1:java.lang.Object next():1783:1783 -> next
     1:1:java.lang.Object previous():1788:1788 -> previous
     1:1:void set(java.lang.Object):1793:1793 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.WJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.SI:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1812:1812 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1812:1812 -> <init>
     1:1:void add(java.lang.Object):1830:1830 -> add
     1:1:java.lang.Object next():1815:1815 -> next
     1:1:java.lang.Object previous():1820:1820 -> previous
     1:1:void set(java.lang.Object):1825:1825 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.YJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.UI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry prev -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry curr -> d
@@ -78834,21 +77868,20 @@
     1:1:void updateNext():1019:1019 -> n
     2:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.next():855:857 -> n
     2:4:void updateNext():1019 -> n
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:void updateNext():1019:1019 -> n
     1:1:int nextIndex():1043:1043 -> nextIndex
     1:1:void updatePrevious():1031:1031 -> o
     1:1:int previousIndex():1047:1047 -> previousIndex
     1:12:void remove():1051:1051 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.ZJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.VI:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1275:1275 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1275:1275 -> <init>
     1:1:void add(java.lang.Object):1293:1293 -> add
     1:1:java.lang.Object next():1278:1278 -> next
     1:1:java.lang.Object previous():1283:1283 -> previous
     1:1:void set(java.lang.Object):1288:1288 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.bK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.dK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.XI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.ZI:
     java.lang.Object[] a -> b
     int size -> c
     1:3:void <init>(int):96:98 -> <init>
@@ -78926,7 +77959,7 @@
     723:723:java.lang.Object set(int,java.lang.Object):357:357 -> set
     720:720:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.cK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.YI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -78940,7 +77973,7 @@
     1:1:int previousIndex():524:524 -> previousIndex
     1:10:void remove():538:538 -> remove
     1:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.fK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.bJ:
     java.lang.Object[] a -> b
     int size -> c
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
@@ -78979,22 +78012,22 @@
     1:2:boolean remove(java.lang.Object):154 -> remove
     3:7:boolean remove(java.lang.Object):156:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.eK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.aJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet this$0 -> c
     int next -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.gK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.cJ:
 # {"id":"sourceFile","fileName":"ObjectArrays.java"}
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():88:88 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.iK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.jK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.internal.mK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.eJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.fJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.internal.iJ:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):383:383 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.kK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.gJ:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():38:38 -> iterator
@@ -79003,7 +78036,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.internal.lK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.internal.hJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection collection -> b
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):276:278 -> <init>
     1:1:boolean add(java.lang.Object):283:283 -> add
@@ -79025,16 +78058,16 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):329:329 -> toArray
     2:2:java.lang.Object[] toArray():334:334 -> toArray
     1:1:java.lang.String toString():359:359 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.oK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.sK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.kJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.oJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.pK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.lJ:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:java.lang.Object next():57:57 -> next
     1:1:java.lang.Object previous():62:62 -> previous
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$SingletonIterator -> com.android.tools.r8.internal.qK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$SingletonIterator -> com.android.tools.r8.internal.mJ:
     java.lang.Object element -> b
     int curr -> c
     1:2:void <init>(java.lang.Object):127:128 -> <init>
@@ -79044,24 +78077,24 @@
     1:1:int nextIndex():157:157 -> nextIndex
     1:4:java.lang.Object previous():150:150 -> previous
     1:1:int previousIndex():162:162 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.rK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.nJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator i -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):739:740 -> <init>
     1:1:boolean hasNext():745:745 -> hasNext
     1:1:java.lang.Object next():750:750 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.tK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.pJ:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.uK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.wK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.zK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.qJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.sJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.vJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.xK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.tJ:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean remove(java.lang.Object):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton -> com.android.tools.r8.internal.yK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton -> com.android.tools.r8.internal.uJ:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):96:97 -> <init>
     1:1:boolean addAll(java.util.Collection):122:122 -> addAll
@@ -79079,11 +78112,11 @@
     1:1:boolean remove(java.lang.Object):107:107 -> remove
     1:1:boolean removeAll(java.util.Collection):127:127 -> removeAll
     1:1:boolean retainAll(java.util.Collection):132:132 -> retainAll
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.AK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.CK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.wJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.yJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():114:114 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.BK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.xJ:
     1:1:void <init>():43:43 -> <init>
     1:1:java.lang.Object clone():101:101 -> clone
     1:1:java.lang.Object first():86:86 -> first
@@ -79094,17 +78127,17 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):40 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet.tailSet(java.lang.Object):81:81 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):40 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.internal.dR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.internal.KP:
     boolean getBoolean(java.lang.Object) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.gR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.NP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet() -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.eR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.fR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.jR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.LP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.MP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.QP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap EMPTY_MAP -> a
     1:1:void <clinit>():135:135 -> <clinit>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap singleton(java.lang.Object,boolean):260:260 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap -> com.android.tools.r8.internal.hR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap -> com.android.tools.r8.internal.OP:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$EmptyFunction.<init>():41:41 -> <init>
     1:1:void <init>():46 -> <init>
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$EmptyFunction.getBoolean(java.lang.Object) -> b
@@ -79128,7 +78161,7 @@
     1:1:java.lang.String toString():127:127 -> toString
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap.values():97:97 -> values
     1:1:java.util.Collection values():43 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton -> com.android.tools.r8.internal.iR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton -> com.android.tools.r8.internal.PP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> f
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.key -> b
@@ -79172,7 +78205,7 @@
     241:241:java.lang.String toString():240:240 -> toString
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton.values():215:216 -> values
     1:2:java.util.Collection values():157 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.sR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.ZP:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> k
     java.lang.Object[] key -> b
     boolean[] value -> c
@@ -79277,17 +78310,16 @@
       # {"id":"com.android.tools.r8.synthesized"}
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.values():803:824 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.kR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.RP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):803:803 -> <init>
     1:1:boolean contains(boolean):816:816 -> b
     2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.containsValue(boolean):359:363 -> b
     2:6:boolean contains(boolean):816 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:void clear():821:821 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():806:806 -> iterator
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.lR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.SP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):609:609 -> <init>
@@ -79295,11 +78327,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator.next():614:614 -> next
     1:1:java.lang.Object next():609 -> next
     1:2:void remove():619:620 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.mR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.TP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):730:731 -> <init>
     1:1:java.lang.Object next():736:736 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.nR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.UP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):740:740 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):740:740 -> <init>
@@ -79308,7 +78340,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():743:743 -> iterator
     1:3:boolean remove(java.lang.Object):758:760 -> remove
     1:1:int size():748:748 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.oR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.VP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,int):428:429 -> <init>
@@ -79327,7 +78359,7 @@
     5:5:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry.setValue(java.lang.Boolean):473:473 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):423 -> setValue
     1:1:java.lang.String toString():491:491 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.pR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.WP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):634:634 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):634:634 -> <init>
@@ -79336,7 +78368,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():636:636 -> iterator
     1:29:boolean remove(java.lang.Object):668:696 -> remove
     1:1:int size():705:705 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.qR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.XP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
@@ -79355,25 +78387,25 @@
     14:23:void remove():589 -> remove
     24:25:void remove():592:593 -> remove
     26:26:void remove():585:585 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.rR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.YP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):785:786 -> <init>
     1:1:boolean nextBoolean():791:791 -> g
     1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator.next():797:797 -> next
     1:1:java.lang.Object next():784 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.wR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.cQ:
     java.lang.Object[] key -> c
     int[] value -> d
     int size -> e
     1:3:void <init>():70:72 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> a
-    2:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.findKey(java.lang.Object):235:237 -> a
-    2:4:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,java.lang.Object):37 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:7:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.findKey(java.lang.Object):235:237 -> a
-    5:7:int put(java.lang.Object,int):283 -> a
-    8:25:int put(java.lang.Object,int):285:302 -> a
-    26:29:int getInt(java.lang.Object):244:247 -> a
+    2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,java.lang.Object):37:37 -> a
+    3:5:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.findKey(java.lang.Object):235:237 -> a
+    3:5:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,java.lang.Object):37 -> a
+    6:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.findKey(java.lang.Object):235:237 -> a
+    6:8:int put(java.lang.Object,int):283 -> a
+    9:26:int put(java.lang.Object,int):285:302 -> a
+    27:30:int getInt(java.lang.Object):244:247 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> b
     1:1:java.lang.Object[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> c
     2:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.findKey(java.lang.Object):235:237 -> c
@@ -79396,8 +78428,7 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.internal.tR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.vR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.bQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1):133:133 -> <init>
@@ -79407,7 +78438,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.uR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.aQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -79416,9 +78447,9 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.xR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.dQ:
     int getInt(java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.GR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.mQ:
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
     java.lang.Object[] key -> c
@@ -79436,14 +78467,14 @@
     2:56:void <init>(int,float):102:156 -> <init>
     57:57:void <init>(int,float):149:149 -> <init>
     58:58:void <init>():176:176 -> <init>
-    1:1:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,int):87:87 -> a
+    1:1:int access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):87:87 -> a
     2:7:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.removeNullEntry():285:290 -> a
     2:7:int access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:32:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.insert(java.lang.Object,int):307:331 -> a
-    8:32:int put(java.lang.Object,int):338 -> a
-    33:35:int put(java.lang.Object,int):339:341 -> a
-    36:46:int getInt(java.lang.Object):721:731 -> a
+    8:8:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,int):87:87 -> a
+    9:33:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.insert(java.lang.Object,int):307:331 -> a
+    9:33:int put(java.lang.Object,int):338 -> a
+    34:36:int put(java.lang.Object,int):339:341 -> a
+    37:47:int getInt(java.lang.Object):721:731 -> a
     1:1:int removeInt(java.lang.Object):431:431 -> c
     2:7:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.removeNullEntry():285:290 -> c
     2:7:int removeInt(java.lang.Object):431 -> c
@@ -79492,14 +78523,14 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.yR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.eQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
     1:1:boolean contains(int):1609:1609 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.zR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.fQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -79514,14 +78545,14 @@
     1:1:void set(java.lang.Object):1219:1219 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):1211:1211 -> set
     2:2:void set(java.lang.Object):1219 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.AR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.gQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.BR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.hQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1465:1465 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1465:1465 -> <init>
@@ -79541,7 +78572,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1465 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet.tailSet(java.lang.Object):1515:1515 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.CR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.iQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -79560,7 +78591,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry.setValue(java.lang.Integer):869:869 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):819 -> setValue
     1:1:java.lang.String toString():887:887 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.DR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.jQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1269:1269 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1269:1269 -> <init>
@@ -79582,7 +78613,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1269:1269 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):1291:1291 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1269 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.ER:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.kQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -79600,7 +78631,7 @@
     1:2:int previousIndex():1122:1123 -> previousIndex
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.FR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.lQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -79615,11 +78646,11 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator.set(java.lang.Integer):1559:1559 -> set
     2:2:void set(java.lang.Object):1544 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.JR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.pQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.HR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.IR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.TR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.nQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.oQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.yQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> c
@@ -79634,14 +78665,14 @@
     10:10:void <init>(int,float):93:93 -> <init>
     11:11:void <init>(int):110:110 -> <init>
     12:12:void <init>():119:119 -> <init>
-    1:1:int access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):49:49 -> a
+    1:1:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):49:49 -> a
     2:6:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.removeNullEntry():227:231 -> a
     2:6:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):49 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:22:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.insert(java.lang.Object,int):248:263 -> a
-    7:22:int put(java.lang.Object,int):270 -> a
-    23:25:int put(java.lang.Object,int):271:273 -> a
-    26:36:int getInt(java.lang.Object):371:381 -> a
+    7:7:int access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):49:49 -> a
+    8:23:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.insert(java.lang.Object,int):248:263 -> a
+    8:23:int put(java.lang.Object,int):270 -> a
+    24:26:int put(java.lang.Object,int):271:273 -> a
+    27:37:int getInt(java.lang.Object):371:381 -> a
     1:1:int removeInt(java.lang.Object):353:353 -> c
     2:6:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.removeNullEntry():227:231 -> c
     2:6:int removeInt(java.lang.Object):353 -> c
@@ -79683,14 +78714,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.KR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.qQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):848:848 -> <init>
     1:1:void clear():866:866 -> clear
     1:1:boolean contains(int):861:861 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.MR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.rQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):654:654 -> <init>
@@ -79698,11 +78729,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.NR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.sQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.OR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.tQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):785:785 -> <init>
@@ -79711,7 +78742,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.PR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.uQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):473:474 -> <init>
@@ -79730,7 +78761,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry.setValue(java.lang.Integer):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.QR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.vQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):679:679 -> <init>
@@ -79739,7 +78770,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.RR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.wQ:
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
     int c -> d
@@ -79758,16 +78789,16 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.SR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.xQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.UR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.VR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.WR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.fS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.zQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.AQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.BQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.KQ:
     long[] value -> c
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet entries -> i
@@ -79780,13 +78811,13 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> j
     1:9:void <init>(int,float):91:99 -> <init>
     10:10:void <init>(int,float):93:93 -> <init>
-    1:1:long access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):49:49 -> a
+    1:1:long access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):49:49 -> a
     2:6:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.removeNullEntry():227:231 -> a
     2:6:long access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):49 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:22:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.insert(java.lang.Object,long):248:263 -> a
-    7:22:long put(java.lang.Object,long):270 -> a
-    23:24:long put(java.lang.Object,long):272:273 -> a
+    7:7:long access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):49:49 -> a
+    8:23:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.insert(java.lang.Object,long):248:263 -> a
+    8:23:long put(java.lang.Object,long):270 -> a
+    24:25:long put(java.lang.Object,long):272:273 -> a
     1:1:long removeLong(java.lang.Object):353:353 -> c
     2:6:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.removeNullEntry():227:231 -> c
     2:6:long removeLong(java.lang.Object):353 -> c
@@ -79826,17 +78857,16 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.XR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.CQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):848:848 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> a
     1:1:boolean contains(long):861:861 -> b
     2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.containsValue(long):404:408 -> b
     2:6:boolean contains(long):861 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:void clear():866:866 -> clear
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.YR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.DQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):654:654 -> <init>
@@ -79844,11 +78874,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.ZR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.EQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.aS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.FQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):785:785 -> <init>
@@ -79857,7 +78887,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.bS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.GQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):473:474 -> <init>
@@ -79875,7 +78905,7 @@
     5:5:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry.setValue(java.lang.Long):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.cS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.HQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):679:679 -> <init>
@@ -79884,7 +78914,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.dS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.IQ:
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
     int c -> d
@@ -79903,13 +78933,13 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.eS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.JQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.hS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.MQ:
     java.lang.Object[] a -> b
     int size -> c
     1:3:void <init>(int):96:98 -> <init>
@@ -79987,7 +79017,7 @@
     723:723:java.lang.Object set(int,java.lang.Object):357:357 -> set
     720:720:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.gS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.LQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -80001,7 +79031,7 @@
     1:1:int previousIndex():524:524 -> previousIndex
     1:10:void remove():538:538 -> remove
     1:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.jS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.OQ:
     java.lang.Object[] a -> b
     int size -> c
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
@@ -80040,17 +79070,17 @@
     1:2:boolean remove(java.lang.Object):154 -> remove
     3:7:boolean remove(java.lang.Object):156:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.iS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.NQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet this$0 -> c
     int next -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.kS:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.nS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.PQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.SQ:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):383:383 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.lS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.QQ:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():38:38 -> iterator
@@ -80058,7 +79088,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.mS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.RQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> b
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):276:278 -> <init>
     1:1:boolean add(java.lang.Object):283:283 -> add
@@ -80080,9 +79110,9 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):329:329 -> toArray
     2:2:java.lang.Object[] toArray():334:334 -> toArray
     1:1:java.lang.String toString():359:359 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.oS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.TQ:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.rS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.VQ:
     java.lang.Object[] key -> b
     float f -> h
     int maxFill -> f
@@ -80127,8 +79157,7 @@
     2:5:boolean remove(java.lang.Object):332 -> remove
     6:13:boolean remove(java.lang.Object):336:343 -> remove
     1:1:int size():380:380 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.internal.pS:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.qS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.UQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet this$0 -> g
     boolean mustReturnNull -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
@@ -80147,16 +79176,16 @@
     14:22:void remove():500 -> remove
     23:24:void remove():503:504 -> remove
     25:25:void remove():496:496 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.sS:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.vS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.WQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.ZQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.tS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.XQ:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean remove(java.lang.Object):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton -> com.android.tools.r8.internal.uS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton -> com.android.tools.r8.internal.YQ:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):96:97 -> <init>
     1:1:boolean addAll(java.util.Collection):122:122 -> addAll
@@ -80174,8 +79203,8 @@
     1:1:boolean remove(java.lang.Object):107:107 -> remove
     1:1:boolean removeAll(java.util.Collection):127:127 -> removeAll
     1:1:boolean retainAll(java.util.Collection):132:132 -> retainAll
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.wS:
-com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.z6:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.aR:
+com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.v6:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> i
@@ -80187,149 +79216,140 @@
     com.android.tools.r8.dex.Marker marker -> f
     1:18:void <clinit>():78:95 -> <clinit>
     1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):98:107 -> <init>
-    1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():102:102 -> a
-    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):483 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):482:482 -> a
-    3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():102:102 -> a
-    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):485 -> a
-    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):484:491 -> a
-    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):489:489 -> a
-    13:14:void write(com.android.tools.r8.ClassFileConsumer):111:112 -> a
-    15:19:void write(com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.utils.AndroidApp):116:120 -> a
-    20:23:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):137:140 -> a
-    24:29:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):139:144 -> a
-    30:33:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):125:128 -> a
-    30:33:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
-    34:34:boolean com.android.tools.r8.dex.Marker.isCfBackend():228:228 -> a
-    34:34:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128 -> a
-    34:34:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
-    35:35:boolean com.android.tools.r8.dex.Marker.isDexBackend():232:232 -> a
-    35:35:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128 -> a
-    35:35:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
-    36:37:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128:129 -> a
-    36:37:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
-    38:38:boolean com.android.tools.r8.dex.Marker.isCfBackend():228:228 -> a
-    38:38:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):130 -> a
-    38:38:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
-    39:39:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):130:130 -> a
-    39:39:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
-    40:47:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144:151 -> a
-    48:48:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):209:209 -> a
-    48:48:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):151 -> a
-    49:61:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):153:165 -> a
-    62:62:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    62:62:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):169 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    63:65:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):171:173 -> a
-    66:70:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):170:174 -> a
-    71:71:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):167:167 -> a
-    72:73:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):155:156 -> a
-    74:74:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    74:74:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):160 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    75:76:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):161:162 -> a
-    77:96:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):158:177 -> a
-    97:97:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):187:187 -> a
-    98:98:void com.android.tools.r8.org.objectweb.asm.ClassWriter.<init>(int):229:229 -> a
-    98:98:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):187 -> a
-    99:109:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):188:198 -> a
-    110:116:java.lang.String com.android.tools.r8.jar.CfApplicationWriter.getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):359:365 -> a
-    110:116:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):198 -> a
-    117:117:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):199:199 -> a
-    118:125:com.android.tools.r8.cf.CfVersion com.android.tools.r8.jar.CfApplicationWriter.getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):335:342 -> a
-    118:125:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):200 -> a
-    126:144:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):201:219 -> a
-    145:151:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):276:282 -> a
-    145:151:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):219 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    152:163:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):221:232 -> a
-    164:174:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.jar.CfApplicationWriter.getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):369:379 -> a
-    164:174:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):232 -> a
-    175:196:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):234:255 -> a
-    197:203:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:482 -> a
-    197:203:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):255 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    204:240:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):256:292 -> a
-    241:245:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
-    241:245:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):292 -> a
-    246:246:void lambda$writeClass$0(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):275:275 -> a
-    247:247:void lambda$writeClass$2(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):293:293 -> a
-    248:248:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):297:297 -> a
-    249:255:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):306:312 -> a
-    256:259:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):310:313 -> a
-    260:260:com.android.tools.r8.graph.DexType[] lambda$compareMethodsThroughLens$3(com.android.tools.r8.graph.DexMethod):311:311 -> a
-    261:264:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):317:320 -> a
-    265:265:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    265:265:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    266:266:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
-    267:267:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":611,"2":612,"3":613}}
-    611:611:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
-    612:612:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
-    613:613:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
-    588:589:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):321:322 -> a
-    590:594:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1934:1938 -> a
-    590:594:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):323 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    595:595:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
-    595:595:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1939 -> a
-    595:595:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):323 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    596:601:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):322:327 -> a
-    602:606:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1934:1938 -> a
-    602:606:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):327 -> a
-    607:607:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
-    607:607:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1939 -> a
-    607:607:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):327 -> a
-    608:610:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):328:330 -> a
-    614:621:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):348:355 -> a
-    622:628:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):404:410 -> a
-    629:635:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:482 -> a
-    629:635:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):410 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    636:639:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):397:400 -> a
-    636:639:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):411 -> a
-    640:641:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):412:413 -> a
-    642:650:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):423:431 -> a
-    651:651:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():262:262 -> a
-    651:651:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):432 -> a
-    652:655:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):435:438 -> a
-    656:662:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:884 -> a
-    656:662:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):438 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    663:663:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):439:439 -> a
-    664:672:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):383:391 -> a
-    664:672:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):439 -> a
-    673:681:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):440:448 -> a
-    682:695:void com.android.tools.r8.jar.CfApplicationWriter.writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):458:471 -> a
-    682:695:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):448 -> a
-    696:698:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):449:451 -> a
-    699:702:void com.android.tools.r8.jar.CfApplicationWriter.writeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):594:597 -> a
-    699:702:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):452 -> a
-    703:703:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$4(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):490:490 -> a
-    704:713:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):500:509 -> a
-    714:719:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):508:513 -> a
-    720:721:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):519:520 -> a
-    722:780:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):525:583 -> a
-    781:784:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):528:531 -> a
-    785:812:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):530:557 -> a
-    813:823:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):554:564 -> a
-    824:842:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):561:579 -> a
-    843:843:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):577:577 -> a
-    844:844:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):573:573 -> a
-    845:848:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):567:570 -> a
+    1:2:void write(com.android.tools.r8.ClassFileConsumer):111:112 -> a
+    3:7:void write(com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.utils.AndroidApp):116:120 -> a
+    8:11:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):137:140 -> a
+    12:17:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):139:144 -> a
+    18:21:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):125:128 -> a
+    18:21:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    22:22:boolean com.android.tools.r8.dex.Marker.isCfBackend():228:228 -> a
+    22:22:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128 -> a
+    22:22:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    23:23:boolean com.android.tools.r8.dex.Marker.isDexBackend():232:232 -> a
+    23:23:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128 -> a
+    23:23:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    24:25:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128:129 -> a
+    24:25:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    26:26:boolean com.android.tools.r8.dex.Marker.isCfBackend():228:228 -> a
+    26:26:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):130 -> a
+    26:26:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    27:27:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):130:130 -> a
+    27:27:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    28:35:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144:151 -> a
+    36:36:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):222:222 -> a
+    36:36:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):151 -> a
+    37:53:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):153:169 -> a
+    54:54:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    54:54:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):169 -> a
+    55:57:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):171:173 -> a
+    58:62:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):170:174 -> a
+    63:63:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):167:167 -> a
+    64:69:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):155:160 -> a
+    70:70:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    70:70:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):160 -> a
+    71:72:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):161:162 -> a
+    73:92:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):158:177 -> a
+    93:93:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):187:187 -> a
+    94:94:void com.android.tools.r8.org.objectweb.asm.ClassWriter.<init>(int):229:229 -> a
+    94:94:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):187 -> a
+    95:105:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):188:198 -> a
+    106:112:java.lang.String com.android.tools.r8.jar.CfApplicationWriter.getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):359:365 -> a
+    106:112:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):198 -> a
+    113:113:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):199:199 -> a
+    114:121:com.android.tools.r8.cf.CfVersion com.android.tools.r8.jar.CfApplicationWriter.getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):335:342 -> a
+    114:121:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):200 -> a
+    122:140:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):201:219 -> a
+    141:147:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):276:282 -> a
+    141:147:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):219 -> a
+    148:159:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):221:232 -> a
+    160:170:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.jar.CfApplicationWriter.getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):369:379 -> a
+    160:170:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):232 -> a
+    171:192:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):234:255 -> a
+    193:199:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:482 -> a
+    193:199:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):255 -> a
+    200:236:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):256:292 -> a
+    237:241:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
+    237:241:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):292 -> a
+    242:242:void lambda$writeClass$0(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):275:275 -> a
+    243:243:void lambda$writeClass$2(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):293:293 -> a
+    244:244:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):297:297 -> a
+    245:251:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):306:312 -> a
+    252:255:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):310:313 -> a
+    256:256:com.android.tools.r8.graph.DexType[] lambda$compareMethodsThroughLens$3(com.android.tools.r8.graph.DexMethod):311:311 -> a
+    257:260:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):317:320 -> a
+    261:261:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    261:261:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320 -> a
+    262:262:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    263:263:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":608,"2":609,"3":610}}
+    608:608:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    609:609:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    610:610:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    584:586:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):321:323 -> a
+    587:591:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1956:1960 -> a
+    587:591:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):323 -> a
+    592:592:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
+    592:592:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1961 -> a
+    592:592:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):323 -> a
+    593:598:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):322:327 -> a
+    599:603:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1956:1960 -> a
+    599:603:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):327 -> a
+    604:604:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
+    604:604:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1961 -> a
+    604:604:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):327 -> a
+    605:607:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):328:330 -> a
+    611:618:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):348:355 -> a
+    619:625:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):404:410 -> a
+    626:632:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:482 -> a
+    626:632:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):410 -> a
+    633:636:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):397:400 -> a
+    633:636:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):411 -> a
+    637:638:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):412:413 -> a
+    639:647:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):423:431 -> a
+    648:648:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():262:262 -> a
+    648:648:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):432 -> a
+    649:652:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):435:438 -> a
+    653:659:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:884 -> a
+    653:659:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):438 -> a
+    660:660:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):439:439 -> a
+    661:669:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):383:391 -> a
+    661:669:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):439 -> a
+    670:678:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):440:448 -> a
+    679:692:void com.android.tools.r8.jar.CfApplicationWriter.writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):458:471 -> a
+    679:692:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):448 -> a
+    693:695:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):449:451 -> a
+    696:699:void com.android.tools.r8.jar.CfApplicationWriter.writeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):594:597 -> a
+    696:699:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):452 -> a
+    700:700:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):483:483 -> a
+    701:701:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():102:102 -> a
+    701:701:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):483 -> a
+    702:702:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):482:482 -> a
+    703:703:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():102:102 -> a
+    703:703:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):485 -> a
+    704:711:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):484:491 -> a
+    712:712:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):489:489 -> a
+    713:713:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$4(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):490:490 -> a
+    714:723:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):500:509 -> a
+    724:729:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):508:513 -> a
+    730:731:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):519:520 -> a
+    732:790:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):525:583 -> a
+    791:794:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):528:531 -> a
+    795:822:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):530:557 -> a
+    823:833:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):554:564 -> a
+    834:852:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):561:579 -> a
+    853:853:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):577:577 -> a
+    854:854:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):573:573 -> a
+    855:858:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):567:570 -> a
     1:1:void lambda$writeClass$1(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):278:278 -> b
     2:2:com.android.tools.r8.graph.DexString returnTypeThroughLens(com.android.tools.r8.graph.DexMethod):301:301 -> b
-com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.y6:
+com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.u6:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
-com.android.tools.r8.jetbrains.kotlin.DeprecationLevel$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.jf:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Ne:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.kB:
+com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.tA:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
 com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.jetbrains.kotlin.a:
     1:38:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0:37 -> a
@@ -80354,10 +79374,10 @@
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.jetbrains.kotlin.b:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.JH:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.GG:
 # {"id":"sourceFile","fileName":"NoWhenBranchMatchedException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.SL:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.OK:
 # {"id":"sourceFile","fileName":"Tuples.kt"}
     java.lang.Object first -> b
     java.lang.Object second -> c
@@ -80389,19 +79409,19 @@
     1:1:boolean isInitialized():82:82 -> toString
     1:1:java.lang.String toString():84 -> toString
     2:2:java.lang.String toString():84:84 -> toString
-com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.w10:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.MZ:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE INSTANCE -> a
     1:1:void <init>():71:71 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.A10:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.QZ:
 # {"id":"sourceFile","fileName":"UninitializedPropertyAccessException.kt"}
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.C10:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.SZ:
 # {"id":"sourceFile","fileName":"Unit.kt"}
     com.android.tools.r8.jetbrains.kotlin.Unit INSTANCE -> a
     1:1:void <init>():22:22 -> <init>
     1:1:java.lang.String toString():23:23 -> toString
-com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.X10:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.n00:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> b
     java.lang.Object _value -> c
@@ -80410,7 +79430,7 @@
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl.isInitialized():88:88 -> toString
     1:1:java.lang.String toString():90 -> toString
     2:2:java.lang.String toString():90:90 -> toString
-com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.P40:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.a30:
 # {"id":"sourceFile","fileName":"AssertionsJVM.kt"}
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -80465,7 +79485,6 @@
     1:1:boolean hasNext():75:75 -> hasNext
     2:2:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection.size():14:14 -> hasNext
     2:2:boolean hasNext():75 -> hasNext
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:int getIndex():73:73 -> l
     1:3:java.lang.Object next():78:78 -> next
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$ListIteratorImpl -> com.android.tools.r8.internal.W:
@@ -80486,7 +79505,7 @@
     1:3:java.lang.Object get(int):46:48 -> get
     4:4:void com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.checkElementIndex$kotlin_stdlib(int,int):108:108 -> get
     4:4:java.lang.Object get(int):46 -> get
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.internal.p3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.internal.n3:
     1:169:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(int[]):0:168 -> a
     1:169:java.util.List asList(int[]):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -80527,9 +79546,9 @@
     6:6:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.toList(int[]):9972:9972 -> b
     6:6:java.util.List toList(int[]):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.internal.q3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.internal.o3:
 # {"id":"sourceFile","fileName":"Arrays.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.r3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.p3:
 # {"id":"sourceFile","fileName":"_ArraysJvm.kt"}
     int[] $this_asList -> c
     1:1:void <init>(int[]):168:168 -> <init>
@@ -80556,9 +79575,9 @@
     3:2136:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):0:2133 -> lastIndexOf
     3:2136:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):174 -> lastIndexOf
     3:2136:int lastIndexOf(java.lang.Object):168 -> lastIndexOf
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.s3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.q3:
 # {"id":"sourceFile","fileName":"_Arrays.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.nc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.Sb:
     1:142:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt.addAll(java.util.Collection,java.lang.Object[]):0:141 -> a
     1:142:boolean addAll(java.util.Collection,java.lang.Object[]):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -80686,22 +79705,22 @@
     1327:1327:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.withIndex(java.lang.Iterable):1628:1628 -> b
     1327:1327:java.lang.Iterable withIndex(java.lang.Iterable):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.oc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.Tb:
 # {"id":"sourceFile","fileName":"Collections.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.pc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.Ub:
 # {"id":"sourceFile","fileName":"IteratorsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.qc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.Vb:
 # {"id":"sourceFile","fileName":"MutableCollectionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__ReversedViewsKt -> com.android.tools.r8.internal.rc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__ReversedViewsKt -> com.android.tools.r8.internal.Wb:
 # {"id":"sourceFile","fileName":"ReversedViews.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.tc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.Yb:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.sc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.Xb:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
     java.lang.Iterable $this_withIndex -> b
     1:1:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1.invoke():1628:1628 -> a
     1:1:java.lang.Object invoke():1628 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.Th:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.Dh:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator INSTANCE -> b
     1:1:void <init>():15:15 -> <init>
@@ -80715,7 +79734,7 @@
     1:1:void set(java.lang.Object):15:15 -> set
     2:2:void com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator.set(java.lang.Void):0:0 -> set
     2:2:void set(java.lang.Object):15 -> set
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.Uh:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.Eh:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyList INSTANCE -> b
     1:1:void <init>():24:24 -> <init>
@@ -80750,7 +79769,7 @@
     2:2:java.lang.Object set(int,java.lang.Object):24 -> set
     1:1:java.util.List subList(int,int):49:49 -> subList
     1:1:java.lang.String toString():29:29 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.Vh:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.Fh:
 # {"id":"sourceFile","fileName":"Maps.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap INSTANCE -> b
     1:1:void <init>():14:14 -> <init>
@@ -80767,7 +79786,7 @@
     1:1:java.lang.Object remove(java.lang.Object):14 -> remove
     1:1:java.lang.String toString():19:19 -> toString
     1:1:java.util.Collection values():14:14 -> values
-com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.Xh:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.Hh:
 # {"id":"sourceFile","fileName":"Sets.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptySet INSTANCE -> b
     1:1:void <init>():14:14 -> <init>
@@ -80781,7 +79800,7 @@
     1:1:boolean equals(java.lang.Object):17:17 -> equals
     1:1:java.util.Iterator iterator():26:26 -> iterator
     1:1:java.lang.String toString():19:19 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.ap:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.Eo:
 # {"id":"sourceFile","fileName":"IndexedValue.kt"}
     java.lang.Object value -> b
     int index -> a
@@ -80794,12 +79813,12 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.bp:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.Fo:
 # {"id":"sourceFile","fileName":"Iterables.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 iteratorFactory -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):24:24 -> <init>
     1:1:java.util.Iterator iterator():25:25 -> iterator
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.cp:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.Go:
 # {"id":"sourceFile","fileName":"Iterators.kt"}
     java.util.Iterator iterator -> b
     int index -> c
@@ -80807,7 +79826,7 @@
     1:1:boolean hasNext():40:40 -> hasNext
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator.next():41:41 -> next
     1:1:java.lang.Object next():38 -> next
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt -> com.android.tools.r8.internal.YD:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt -> com.android.tools.r8.internal.fD:
     int mapCapacity(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:4:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):547:550 -> a
@@ -80828,11 +79847,11 @@
     36:36:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):548:548 -> a
     36:36:java.util.Map toMap(java.lang.Iterable):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt -> com.android.tools.r8.internal.ZD:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt -> com.android.tools.r8.internal.gD:
 # {"id":"sourceFile","fileName":"MapsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.aE:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.hD:
 # {"id":"sourceFile","fileName":"_Maps.kt"}
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.JN:
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.AM:
 # {"id":"sourceFile","fileName":"progressionUtil.kt"}
     1:1:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.mod(int,int):10:10 -> a
     1:1:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21 -> a
@@ -80841,60 +79860,60 @@
     2:2:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21 -> a
     2:2:int getProgressionLastElement(int,int,int):47 -> a
     3:3:int getProgressionLastElement(int,int,int):48:48 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.jw:
+com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.Cv:
 # {"id":"sourceFile","fileName":"JvmClassMapping.kt"}
     1:4:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:61 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.hl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.Lk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.jl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.Nk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke(java.lang.Object) -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function10 -> com.android.tools.r8.internal.il:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function10 -> com.android.tools.r8.internal.Mk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function11 -> com.android.tools.r8.internal.kl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function11 -> com.android.tools.r8.internal.Ok:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function12 -> com.android.tools.r8.internal.ll:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function12 -> com.android.tools.r8.internal.Pk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function13 -> com.android.tools.r8.internal.ml:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function13 -> com.android.tools.r8.internal.Qk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function14 -> com.android.tools.r8.internal.nl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function14 -> com.android.tools.r8.internal.Rk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function15 -> com.android.tools.r8.internal.ol:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function15 -> com.android.tools.r8.internal.Sk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function16 -> com.android.tools.r8.internal.pl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function16 -> com.android.tools.r8.internal.Tk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function17 -> com.android.tools.r8.internal.ql:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function17 -> com.android.tools.r8.internal.Uk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function18 -> com.android.tools.r8.internal.rl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function18 -> com.android.tools.r8.internal.Vk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function19 -> com.android.tools.r8.internal.sl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function19 -> com.android.tools.r8.internal.Wk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.xl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.bl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function20 -> com.android.tools.r8.internal.ul:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function20 -> com.android.tools.r8.internal.Yk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function21 -> com.android.tools.r8.internal.vl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function21 -> com.android.tools.r8.internal.Zk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function22 -> com.android.tools.r8.internal.wl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function22 -> com.android.tools.r8.internal.al:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function3 -> com.android.tools.r8.internal.yl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function3 -> com.android.tools.r8.internal.cl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function4 -> com.android.tools.r8.internal.zl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function4 -> com.android.tools.r8.internal.dl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function5 -> com.android.tools.r8.internal.Al:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function5 -> com.android.tools.r8.internal.el:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function6 -> com.android.tools.r8.internal.Bl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function6 -> com.android.tools.r8.internal.fl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function7 -> com.android.tools.r8.internal.Cl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function7 -> com.android.tools.r8.internal.gl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function8 -> com.android.tools.r8.internal.Dl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function8 -> com.android.tools.r8.internal.hl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.El:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.il:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.J9:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.z9:
 # {"id":"sourceFile","fileName":"ClassBasedDeclarationContainer.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.Va:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.Fa:
 # {"id":"sourceFile","fileName":"ClassReference.kt"}
     java.util.Map FUNCTION_CLASSES -> b
     java.lang.Class jClass -> a
@@ -80925,7 +79944,7 @@
     2:2:java.lang.String toString():97:97 -> toString
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.stringPlus(java.lang.String,java.lang.Object):20:20 -> toString
     3:3:java.lang.String toString():97 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.jc:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.Ob:
 # {"id":"sourceFile","fileName":"CollectionToArray.kt"}
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():127:127 -> <clinit>
@@ -80939,8 +79958,7 @@
     251:316:java.lang.Object[] toArray(java.util.Collection):21:86 -> a
     317:399:java.lang.Object[] toArray(java.util.Collection):22:104 -> a
     400:400:java.lang.Object[] toArray(java.util.Collection):23:23 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.internal.Ue:
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.wu:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.Qt:
     1:1:void throwUninitializedPropertyAccessException(java.lang.String):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5,"4":6,"5":7,"6":8}}
     3:3:void throwUninitializedPropertyAccessException(java.lang.String):58:58 -> a
@@ -80973,11 +79991,11 @@
     2:13:void checkNotNullParameter(java.lang.Object,java.lang.String):131 -> b
     14:14:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullNPE(java.lang.String):140:140 -> b
     14:14:void checkNotNullParameter(java.lang.Object,java.lang.String):131 -> b
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.PA:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.Yz:
 # {"id":"sourceFile","fileName":"Lambda.kt"}
     1:1:void <init>(int):10:10 -> <init>
     1:1:java.lang.String toString():11:11 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.zS:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.dR:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory factory -> a
     1:9:void <clinit>():26:34 -> <clinit>
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):59:59 -> a
@@ -80987,11 +80005,11 @@
     4:5:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionBase):44:45 -> a
     4:5:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):39 -> a
     4:5:java.lang.String renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):78 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.AS:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.eR:
     1:1:void <init>():14:14 -> <init>
-com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.nx:
+com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.Ew:
 # {"id":"sourceFile","fileName":"KClass.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.gY:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.yW:
     1:71:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):0:70 -> a
     1:71:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):68 -> a
     1:71:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
@@ -81019,15 +80037,15 @@
     4:4:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substringAfterLast$default(java.lang.String,char,java.lang.String,int,java.lang.Object):483 -> b
     4:4:java.lang.String substringAfterLast$default(java.lang.String,char,java.lang.String,int,java.lang.Object):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.hY:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.zW:
 # {"id":"sourceFile","fileName":"Indent.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.iY:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.AW:
 # {"id":"sourceFile","fileName":"RegexExtensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.jY:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.BW:
 # {"id":"sourceFile","fileName":"StringBuilder.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsKt -> com.android.tools.r8.internal.kY:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsKt -> com.android.tools.r8.internal.CW:
 # {"id":"sourceFile","fileName":"StringNumberConversions.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.lY:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.DW:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):0:0 -> a
     1:1:boolean contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1158 -> a
@@ -81066,12 +80084,13 @@
     688:688:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object):1086 -> a
     688:688:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):1159 -> a
     688:688:boolean contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1158 -> a
-    689:689:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):418:418 -> a
-    690:692:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.regionMatches(java.lang.String,int,java.lang.String,int,int,boolean):654:656 -> a
-    690:692:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):420 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsKt -> com.android.tools.r8.internal.mY:
+    689:690:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):0:0 -> a
+    1108:1108:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):418:418 -> a
+    1109:1111:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.regionMatches(java.lang.String,int,java.lang.String,int,int,boolean):654:656 -> a
+    1109:1111:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):420 -> a
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsKt -> com.android.tools.r8.internal.EW:
 # {"id":"sourceFile","fileName":"_Strings.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.Dk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.ik:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     int bitWidth -> b
     int value -> c
@@ -81082,31 +80101,31 @@
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):43:43 -> <init>
     1:1:boolean invoke(int):52:52 -> a
     1:1:int plus$kotlinx_metadata(int):46:46 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Property -> com.android.tools.r8.internal.Ak:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Property -> com.android.tools.r8.internal.fk:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag HAS_GETTER -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag HAS_SETTER -> b
     1:79:void <clinit>():343:421 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.Bk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.gk:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_NULLABLE -> a
     1:7:void <clinit>():455:461 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.Ck:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.hk:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_REIFIED -> a
     1:1:void <clinit>():472:472 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.Dk$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.ik$a:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag DECLARES_DEFAULT_VALUE -> a
     1:13:void <clinit>():486:498 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt -> com.android.tools.r8.internal.Lk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt -> com.android.tools.r8.internal.pk:
 # {"id":"sourceFile","fileName":"Flags.kt"}
     1:1:int flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):28:28 -> a
     2:2:int flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):25:25 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.Wo:
+com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.Ao:
 # {"id":"sourceFile","fileName":"InconsistentKotlinMetadataException.kt"}
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.ox:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.Fw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.Map arguments -> b
     java.lang.String className -> a
@@ -81119,10 +80138,10 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.qx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.Hw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.px:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.Gw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation annotation -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):65:65 -> <init>
@@ -81133,7 +80152,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.qx$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.Hw$a:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.List elements -> a
     1:1:void <init>(java.util.List):66:66 -> <init>
@@ -81144,7 +80163,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.rx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.Iw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     boolean value -> a
     1:1:void <init>(boolean):44:44 -> <init>
@@ -81154,7 +80173,6 @@
     2:2:boolean equals(java.lang.Object):0:0 -> equals
     3:3:java.lang.Boolean com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue.getValue():44:44 -> equals
     3:3:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.Boolean com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue.getValue():44:44 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -81167,16 +80185,16 @@
     2:2:java.lang.Boolean com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue.getValue():44:44 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.sx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.Jw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):37:37 -> <init>
     1:1:java.lang.Byte getValue():37:37 -> a
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue.getValue():37:37 -> equals
     1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue.getValue():37:37 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2:2:boolean equals(java.lang.Object):0:0 -> equals
+    3:3:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue.getValue():37:37 -> equals
+    3:3:boolean equals(java.lang.Object):0 -> equals
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue.getValue():37:37 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
@@ -81188,7 +80206,7 @@
     2:2:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue.getValue():37:37 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.tx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.Kw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     char value -> a
     1:1:void <init>(char):38:38 -> <init>
@@ -81198,7 +80216,6 @@
     2:2:boolean equals(java.lang.Object):0:0 -> equals
     3:3:java.lang.Character com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue.getValue():38:38 -> equals
     3:3:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.Character com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue.getValue():38:38 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -81211,17 +80228,17 @@
     2:2:java.lang.Character com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue.getValue():38:38 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.ux:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.Lw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     double value -> a
     1:1:void <init>(double):43:43 -> <init>
     1:1:java.lang.Double getValue():43:43 -> a
     1:1:java.lang.Double com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue.getValue():43:43 -> equals
     1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.Double com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue.getValue():43:43 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean equals(java.lang.Object):0:0 -> equals
+    2:2:boolean equals(java.lang.Object):0:0 -> equals
+    3:3:java.lang.Double com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue.getValue():43:43 -> equals
+    3:3:boolean equals(java.lang.Object):0 -> equals
+    4:4:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.Double com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue.getValue():43:43 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
@@ -81233,7 +80250,7 @@
     2:2:java.lang.Double com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue.getValue():43:43 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.vx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.Mw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String enumClassName -> a
     java.lang.String enumEntryName -> b
@@ -81246,17 +80263,17 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.wx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.Nw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     float value -> a
     1:1:void <init>(float):42:42 -> <init>
     1:1:java.lang.Float getValue():42:42 -> a
     1:1:java.lang.Float com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue.getValue():42:42 -> equals
     1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.Float com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue.getValue():42:42 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean equals(java.lang.Object):0:0 -> equals
+    2:2:boolean equals(java.lang.Object):0:0 -> equals
+    3:3:java.lang.Float com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue.getValue():42:42 -> equals
+    3:3:boolean equals(java.lang.Object):0 -> equals
+    4:4:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.Float com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue.getValue():42:42 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
@@ -81268,7 +80285,7 @@
     2:2:java.lang.Float com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue.getValue():42:42 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.xx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.Ow:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):40:40 -> <init>
@@ -81278,7 +80295,6 @@
     2:2:boolean equals(java.lang.Object):0:0 -> equals
     3:3:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue.getValue():40:40 -> equals
     3:3:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue.getValue():40:40 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -81291,7 +80307,7 @@
     2:2:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue.getValue():40:40 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.yx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.Pw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String className -> a
     int arrayDimensionCount -> b
@@ -81304,10 +80320,10 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LiteralValue -> com.android.tools.r8.internal.zx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LiteralValue -> com.android.tools.r8.internal.Qw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     1:1:void <init>():30:30 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.Ax:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.Rw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):41:41 -> <init>
@@ -81317,7 +80333,6 @@
     2:2:boolean equals(java.lang.Object):0:0 -> equals
     3:3:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue.getValue():41:41 -> equals
     3:3:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue.getValue():41:41 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -81330,7 +80345,7 @@
     2:2:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue.getValue():41:41 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.Bx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.Sw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):39:39 -> <init>
@@ -81340,7 +80355,6 @@
     2:2:boolean equals(java.lang.Object):0:0 -> equals
     3:3:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue.getValue():39:39 -> equals
     3:3:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue.getValue():39:39 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -81353,17 +80367,17 @@
     2:2:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue.getValue():39:39 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.Cx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.Tw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):59:59 -> <init>
     1:1:java.lang.String getValue():59:59 -> a
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue.getValue():59:59 -> equals
     1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue.getValue():59:59 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean equals(java.lang.Object):0:0 -> equals
+    2:2:boolean equals(java.lang.Object):0:0 -> equals
+    3:3:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue.getValue():59:59 -> equals
+    3:3:boolean equals(java.lang.Object):0 -> equals
+    4:4:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue.getValue():59:59 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
@@ -81375,16 +80389,16 @@
     2:2:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue.getValue():59:59 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.Dx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.Uw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):48:48 -> <init>
     1:1:byte getValue-w2LRezQ():48:48 -> a
     1:1:byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue.getValue-w2LRezQ():48:48 -> equals
     1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue.getValue-w2LRezQ():48:48 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2:2:boolean equals(java.lang.Object):0:0 -> equals
+    3:3:byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue.getValue-w2LRezQ():48:48 -> equals
+    3:3:boolean equals(java.lang.Object):0 -> equals
     1:1:byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue.getValue-w2LRezQ():48:48 -> hashCode
     1:1:int hashCode():0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
@@ -81397,16 +80411,16 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.UByte.toString-impl(byte):343:343 -> toString
     3:3:java.lang.String toString():0 -> toString
     4:4:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.Ex:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.Vw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):54:54 -> <init>
     1:1:int getValue-pVg5ArA():54:54 -> a
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue.getValue-pVg5ArA():54:54 -> equals
     1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue.getValue-pVg5ArA():54:54 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2:2:boolean equals(java.lang.Object):0:0 -> equals
+    3:3:int com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue.getValue-pVg5ArA():54:54 -> equals
+    3:3:boolean equals(java.lang.Object):0 -> equals
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue.getValue-pVg5ArA():54:54 -> hashCode
     1:1:int hashCode():0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
@@ -81419,16 +80433,16 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.UInt.toString-impl(int):365:365 -> toString
     3:3:java.lang.String toString():0 -> toString
     4:4:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.Fx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.Ww:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):57:57 -> <init>
     1:1:long getValue-s-VKNKU():57:57 -> a
     1:1:long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue.getValue-s-VKNKU():57:57 -> equals
     1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue.getValue-s-VKNKU():57:57 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2:2:boolean equals(java.lang.Object):0:0 -> equals
+    3:3:long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue.getValue-s-VKNKU():57:57 -> equals
+    3:3:boolean equals(java.lang.Object):0 -> equals
     1:1:long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue.getValue-s-VKNKU():57:57 -> hashCode
     1:1:int hashCode():0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
@@ -81448,16 +80462,16 @@
     12:12:java.lang.String com.android.tools.r8.jetbrains.kotlin.ULong.toString-impl(long):368 -> toString
     12:12:java.lang.String toString():0 -> toString
     13:13:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.Gx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.Xw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):51:51 -> <init>
     1:1:short getValue-Mh2AYeg():51:51 -> a
     1:1:short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue.getValue-Mh2AYeg():51:51 -> equals
     1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue.getValue-Mh2AYeg():51:51 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2:2:boolean equals(java.lang.Object):0:0 -> equals
+    3:3:short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue.getValue-Mh2AYeg():51:51 -> equals
+    3:3:boolean equals(java.lang.Object):0 -> equals
     1:1:short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue.getValue-Mh2AYeg():51:51 -> hashCode
     1:1:int hashCode():0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
@@ -81470,7 +80484,7 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.UShort.toString-impl(short):344:344 -> toString
     3:3:java.lang.String toString():0 -> toString
     4:4:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.Hx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.Yw:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> q
     java.util.List versionRequirements -> p
@@ -81557,19 +80571,19 @@
     1:1:java.util.List getTypeParameters():49:49 -> p
     1:1:java.util.List getVersionRequirements():109:109 -> q
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():161:161 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.Jx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.ax:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.Kx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.bx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):57:57 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):57:57 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor.getDelegate():59:59 -> e
     1:1:void visitEnd():170 -> e
     2:2:void visitEnd():170:170 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.Mx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.dx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     1:1:void <init>():972:972 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.Lx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.cx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):978:978 -> <init>
@@ -81580,7 +80594,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.Mx$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.dx$a:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):993:993 -> <init>
@@ -81591,7 +80605,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.Mx$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.dx$b:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int id -> a
     1:1:void <init>(int):985:985 -> <init>
@@ -81602,7 +80616,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.Nx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.ex:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Object value -> a
     1:1:void <init>(java.lang.Object):1042:1042 -> <init>
@@ -81613,7 +80627,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.Ox:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.fx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> e
     java.util.List versionRequirements -> d
@@ -81633,9 +80647,9 @@
     1:1:int getFlags():307:307 -> c
     1:1:java.util.List getValueParameters():311:311 -> d
     1:1:java.util.List getVersionRequirements():316:316 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.Qx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.hx:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.Rx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.ix:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):263:263 -> <init>
@@ -81644,7 +80658,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String) -> a
     1:1:void visitEnd():291:291 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.Sx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.jx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List effects -> b
     1:5:void <init>():832:836 -> <init>
@@ -81652,19 +80666,19 @@
     2:205:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):847:847 -> a
     206:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):848:848 -> a
     1:1:java.util.List getEffects():836:836 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.Tx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.kx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):732:732 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):732:732 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):741:741 -> a
     2:2:void visitEnd():747:747 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.Ux:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.lx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List getProperties() -> a
     java.util.List getTypeAliases() -> b
     java.util.List getFunctions() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.Vx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.mx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor):11:11 -> <init>
@@ -81672,7 +80686,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String) -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor getDelegate():11:11 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.Wx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.nx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List constructorArguments -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType type -> b
@@ -81688,7 +80702,7 @@
     1:1:java.util.List getConstructorArguments():870:870 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind getInvocationKind():864:864 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType getType():863:863 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.Xx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.ox:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer parameterIndex -> c
     java.util.List andArguments -> f
@@ -81711,7 +80725,7 @@
     1:1:java.util.List getOrArguments():933:933 -> g
     1:1:java.lang.Integer getParameterIndex():911:911 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType isInstanceType():921:921 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.Yx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.px:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):791:791 -> <init>
@@ -81722,7 +80736,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():825:825 -> a
     1:1:void visitEnd():838:838 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.Zx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.qx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_MOST_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_LEAST_ONCE -> d
@@ -81734,7 +80748,7 @@
     5:5:void <clinit>():884:884 -> <clinit>
     1:1:void <init>(java.lang.String,int):881:881 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind[] values() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.ay:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.rx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_CONSTANT -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_NOT_NULL -> d
@@ -81746,7 +80760,7 @@
     5:5:void <clinit>():872:872 -> <clinit>
     1:1:void <init>(java.lang.String,int):869:869 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType[] values() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.by:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.sx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):760:760 -> <init>
@@ -81754,7 +80768,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():773:773 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():766:766 -> b
     1:1:void visitEnd():779:779 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.dy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.ux:
 # {"id":"sourceFile","fileName":"extensions.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KClass klass -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):31:31 -> <init>
@@ -81766,9 +80780,9 @@
     2:30:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaClass(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):0:28 -> toString
     2:30:java.lang.String toString():39 -> toString
     31:31:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.ey:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.vx:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.fy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.wx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> a
     java.lang.String typeFlexibilityId -> b
@@ -81781,7 +80795,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.gy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.xx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List valueParameters -> f
     java.util.List typeParameters -> d
@@ -81820,13 +80834,13 @@
     1:1:java.util.List getTypeParameters():356:356 -> i
     1:1:java.util.List getValueParameters():366:366 -> j
     1:1:java.util.List getVersionRequirements():376:376 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.iy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.zx:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.jy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.Ax:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):301:301 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):301:301 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):301:301 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):301:301 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):312:312 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):320:320 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):329:329 -> a
@@ -81835,21 +80849,21 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):337:337 -> b
     2:2:void visitEnd():363:363 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():343:343 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.ky:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.Bx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction function -> b
     1:1:void <init>():282:282 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):289:289 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.setFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):286:286 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):289 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.ly:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.Cx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):240:240 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):240:240 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):248:248 -> a
     2:2:void visitEnd():254:254 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.my:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.Dx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List functions -> b
     java.util.List extensions -> e
@@ -81889,16 +80903,16 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):220 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):220:220 -> b
     1:1:java.util.List getFunctions():198:198 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.oy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.Fx:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.py:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.Gx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):179:179 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):179:179 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.getDelegate():181:181 -> e
     1:1:void visitEnd():195 -> e
     2:2:void visitEnd():195:195 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.qy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.Hx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter setterParameter -> h
@@ -81937,13 +80951,13 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter getSetterParameter():453:453 -> i
     1:1:java.util.List getTypeParameters():443:443 -> j
     1:1:java.util.List getVersionRequirements():463:463 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.sy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.Jx:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.ty:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.Kx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):373:373 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):373:373 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):373:373 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):373:373 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):384:384 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):392:392 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):401:401 -> a
@@ -81951,7 +80965,7 @@
     5:5:void visitEnd():429:429 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):409:409 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():415:415 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.uy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.Lx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier classifier -> c
@@ -81997,7 +81011,7 @@
     1:1:int getFlags():668:668 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound getFlexibleTypeUpperBound():707:707 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getOuterType():700:700 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.vy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.Mx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType expandedType -> f
@@ -82051,7 +81065,7 @@
     1:1:java.lang.String getName():510:510 -> e
     1:1:java.util.List getTypeParameters():515:515 -> f
     1:1:java.util.List getVersionRequirements():536:536 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.xy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.Ox:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):439:439 -> <init>
@@ -82063,9 +81077,9 @@
     4:4:void visitEnd():496:496 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):458:458 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():482:482 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.zy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.Qx:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.Ay:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.Rx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List upperBounds -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> e
@@ -82088,9 +81102,9 @@
     1:1:java.lang.String getName():633:633 -> d
     1:1:java.util.List getUpperBounds():640:640 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():635:635 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Cy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Tx:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.Dy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.Ux:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):544:544 -> <init>
@@ -82098,7 +81112,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):551:551 -> a
     2:2:void visitEnd():565:565 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.Ey:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.Vx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> a
@@ -82115,11 +81129,11 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.Fy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.Wx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):580:580 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):580:580 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):580:580 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):580:580 -> <init>
     1:1:void visitClass(java.lang.String):587:587 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):617:617 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int):639:639 -> a
@@ -82130,7 +81144,7 @@
     2:2:void visitStarProjection():624:624 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):654:654 -> b
     1:1:void visitTypeParameter(int):606:606 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.Gy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.Xx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> d
@@ -82152,7 +81166,7 @@
     1:1:java.lang.String getName():584:584 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():590:590 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getVarargElementType():595:595 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.Iy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.Zx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):506:506 -> <init>
@@ -82161,14 +81175,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):513:513 -> a
     2:2:void visitEnd():535:535 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):521:521 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.Jy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.ay:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance INVARIANT -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance OUT -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance IN -> c
     1:11:void <clinit>():850:860 -> <clinit>
     1:1:void <init>(java.lang.String,int):846:846 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.Ky:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.by:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int minor -> b
     int patch -> c
@@ -82178,7 +81192,7 @@
     1:1:int getMinor():1030:1030 -> b
     1:1:int getPatch():1030:1030 -> c
     1:1:java.lang.String toString():1031:1031 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.Ly:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.cy:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer errorCode -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
@@ -82216,7 +81230,7 @@
     21:21:void visitVersion(int,int,int):811 -> a
     1:1:java.lang.Integer getErrorCode():791:791 -> b
     1:1:java.lang.String getMessage():796:796 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.My:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.dy:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel HIDDEN -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel ERROR -> c
@@ -82227,7 +81241,7 @@
     4:4:void <clinit>():893 -> <clinit>
     5:5:void <clinit>():893:893 -> <clinit>
     1:1:void <init>(java.lang.String,int):890:890 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.Ny:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.ey:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind COMPILER_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind API_VERSION -> d
@@ -82238,7 +81252,7 @@
     4:4:void <clinit>():902 -> <clinit>
     5:5:void <clinit>():902:902 -> <clinit>
     1:1:void <init>(java.lang.String,int):899:899 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.Oy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.fy:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):691:691 -> <init>
@@ -82246,10 +81260,10 @@
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String) -> a
     void visitVersion(int,int,int) -> a
     1:1:void visitEnd():720:720 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt -> com.android.tools.r8.internal.MH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt -> com.android.tools.r8.internal.JG:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     1:1:java.lang.Object addTo(java.lang.Object,java.util.Collection):1045:1045 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.sb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.Ya:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder t -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):413:413 -> <init>
@@ -82293,70 +81307,70 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):288:288 -> h
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> h
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():468 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.ib:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.Oa:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):431:431 -> a
     2:433:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):0:431 -> a
     2:433:java.lang.Object invoke(java.lang.Object):431 -> a
     434:434:java.lang.Object invoke(java.lang.Object):431:431 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.internal.jb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.internal.Pa:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> c
     1:1:java.lang.Object invoke(java.lang.Object):471:471 -> a
     2:474:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:472 -> a
     2:474:java.lang.Object invoke(java.lang.Object):471 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.kb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.Qa:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):434:434 -> a
     2:436:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:434 -> a
     2:436:java.lang.Object invoke(java.lang.Object):434 -> a
     437:437:java.lang.Object invoke(java.lang.Object):434:434 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitInlineClassUnderlyingType$1 -> com.android.tools.r8.internal.lb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitInlineClassUnderlyingType$1 -> com.android.tools.r8.internal.Ra:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):465:465 -> a
     2:467:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitInlineClassUnderlyingType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:465 -> a
     2:467:java.lang.Object invoke(java.lang.Object):465 -> a
     468:468:java.lang.Object invoke(java.lang.Object):465:465 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.mb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.Sa:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):437:437 -> a
     2:439:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:437 -> a
     2:439:java.lang.Object invoke(java.lang.Object):437 -> a
     440:440:java.lang.Object invoke(java.lang.Object):437:437 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.nb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.Ta:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):428:428 -> a
     2:430:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:428 -> a
     2:430:java.lang.Object invoke(java.lang.Object):428 -> a
     431:431:java.lang.Object invoke(java.lang.Object):428:428 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.ob:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.Ua:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):440:440 -> a
     2:442:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:440 -> a
     2:442:java.lang.Object invoke(java.lang.Object):440 -> a
     443:443:java.lang.Object invoke(java.lang.Object):440:440 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.pb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.Va:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):425:425 -> a
     2:427:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:425 -> a
     2:427:java.lang.Object invoke(java.lang.Object):425 -> a
     428:428:java.lang.Object invoke(java.lang.Object):425:425 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.qb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.Wa:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):468:468 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1.invoke(int):468:468 -> a
     2:2:java.lang.Object invoke(java.lang.Object):468 -> a
     3:3:java.lang.Object invoke(java.lang.Object):468:468 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.hB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.qA:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):532:534 -> <init>
@@ -82367,14 +81381,14 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):537 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():534:534 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():533:533 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.gB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.pA:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):537:537 -> a
     2:539:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:537 -> a
     2:539:java.lang.Object invoke(java.lang.Object):537 -> a
     540:540:java.lang.Object invoke(java.lang.Object):537:537 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.QL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.MK:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder t -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):482:482 -> <init>
@@ -82392,35 +81406,35 @@
     1:2:void visitEnd():501:502 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():484:484 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder getT():483:483 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.internal.ML:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.internal.IK:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     1:1:java.lang.Object invoke(java.lang.Object):496:496 -> a
     2:499:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:497 -> a
     2:499:java.lang.Object invoke(java.lang.Object):496 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.NL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.JK:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):487:487 -> a
     2:489:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:487 -> a
     2:489:java.lang.Object invoke(java.lang.Object):487 -> a
     490:490:java.lang.Object invoke(java.lang.Object):487:487 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.OL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.KK:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):490:490 -> a
     2:492:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:490 -> a
     2:492:java.lang.Object invoke(java.lang.Object):490 -> a
     493:493:java.lang.Object invoke(java.lang.Object):490:490 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.PL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.LK:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):493:493 -> a
     2:495:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:493 -> a
     2:495:java.lang.Object invoke(java.lang.Object):493 -> a
     496:496:java.lang.Object invoke(java.lang.Object):493:493 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.vQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.fP:
 # {"id":"sourceFile","fileName":"readers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable types -> b
     java.util.List contextExtensions -> e
@@ -82440,7 +81454,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable getTypes():23:23 -> c
     2:2:java.lang.Integer getTypeParameterId(int):39:39 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable getVersionRequirements$kotlinx_metadata():24:24 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.xQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.hP:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
     1:53:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):18:70 -> a
     54:54:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):69:69 -> a
@@ -82479,10 +81493,10 @@
     213:213:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):74:74 -> a
     213:213:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):57 -> a
     214:214:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):58:58 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt$WhenMappings -> com.android.tools.r8.internal.wQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt$WhenMappings -> com.android.tools.r8.internal.gP:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
     int[] $EnumSwitchMapping$0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.yQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.iP:
 # {"id":"sourceFile","fileName":"readers.kt"}
     1:1:void accept$default(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List,int,java.lang.Object):52:52 -> a
     2:59:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List):0:57 -> a
@@ -82806,7 +81820,7 @@
     1:1:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):507:507 -> b
     2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getDefaultPropertyAccessorFlags(int):510:510 -> b
     2:2:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):507 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.M30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.X10:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable versionRequirements -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable strings -> a
@@ -82816,7 +81830,7 @@
     2:2:int get(java.lang.String):26:26 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable getVersionRequirements():23:23 -> b
     2:2:int getClassName(java.lang.String):29:29 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt -> com.android.tools.r8.internal.N30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt -> com.android.tools.r8.internal.Y10:
 # {"id":"sourceFile","fileName":"writeUtils.kt"}
     1:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):17:22 -> a
     7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.build():3058:3059 -> a
@@ -82841,10 +81855,10 @@
     92:92:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
     92:92:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):99 -> a
     93:96:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):101:104 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.N40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.Y20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor writeProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):189:189 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.R30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.c20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder t -> b
@@ -82862,7 +81876,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():136 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder getT():130:130 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.internal.O30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.internal.Z10:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
@@ -82870,7 +81884,7 @@
     1:1:java.lang.Object invoke(java.lang.Object):139:139 -> a
     2:142:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:140 -> a
     2:142:java.lang.Object invoke(java.lang.Object):139 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.P30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.a20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):133:133 -> a
@@ -82889,14 +81903,14 @@
     141:141:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():18809:18809 -> a
     141:141:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):133 -> a
     141:141:java.lang.Object invoke(java.lang.Object):133 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.Q30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.b20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):136:136 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1.invoke(int):136:136 -> a
     2:2:java.lang.Object invoke(java.lang.Object):136 -> a
     3:3:java.lang.Object invoke(java.lang.Object):136:136 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.T30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.e20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder t -> b
@@ -82908,14 +81922,14 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):341 -> a
     3:3:void visitEnd():344:344 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder getT():338:338 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.S30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.d20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):341:341 -> a
     2:343:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):0:341 -> a
     2:343:java.lang.Object invoke(java.lang.Object):341 -> a
     344:344:java.lang.Object invoke(java.lang.Object):341:341 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.X30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.i20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder t -> b
@@ -82937,10 +81951,10 @@
     15:15:void visitEnd():369:369 -> c
     16:21:void visitEnd():368:373 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder getT():352:352 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$WhenMappings -> com.android.tools.r8.internal.U30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$WhenMappings -> com.android.tools.r8.internal.f20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     int[] $EnumSwitchMapping$1 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.V30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.g20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):358:358 -> a
@@ -82959,14 +81973,14 @@
     366:366:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25929:25929 -> a
     366:366:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):358 -> a
     366:366:java.lang.Object invoke(java.lang.Object):358 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.W30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.h20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):355:355 -> a
     2:357:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:355 -> a
     2:357:java.lang.Object invoke(java.lang.Object):355 -> a
     358:358:java.lang.Object invoke(java.lang.Object):355:355 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.b40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.m20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder t -> b
@@ -82988,28 +82002,28 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument():406 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder getT():379:379 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.Y30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.j20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):403:403 -> a
     2:405:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:403 -> a
     2:405:java.lang.Object invoke(java.lang.Object):403 -> a
     406:406:java.lang.Object invoke(java.lang.Object):403:403 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.Z30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.k20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):400:400 -> a
     2:402:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:400 -> a
     2:402:java.lang.Object invoke(java.lang.Object):400 -> a
     403:403:java.lang.Object invoke(java.lang.Object):400:400 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.a40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.l20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):406:406 -> a
     2:408:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:406 -> a
     2:408:java.lang.Object invoke(java.lang.Object):406 -> a
     409:409:java.lang.Object invoke(java.lang.Object):406:406 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.j40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.u20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     int $flags -> e
@@ -83044,7 +82058,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():168 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():153:153 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.c40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.n20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):171:171 -> a
@@ -83063,7 +82077,7 @@
     179:179:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23900:23900 -> a
     179:179:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):171 -> a
     179:179:java.lang.Object invoke(java.lang.Object):171 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.d40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.o20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> c
@@ -83071,42 +82085,42 @@
     1:1:java.lang.Object invoke(java.lang.Object):174:174 -> a
     2:177:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:175 -> a
     2:177:java.lang.Object invoke(java.lang.Object):174 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.e40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.p20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):159:159 -> a
     2:161:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:159 -> a
     2:161:java.lang.Object invoke(java.lang.Object):159 -> a
     162:162:java.lang.Object invoke(java.lang.Object):159:159 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.f40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.q20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):165:165 -> a
     2:167:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:165 -> a
     2:167:java.lang.Object invoke(java.lang.Object):165 -> a
     168:168:java.lang.Object invoke(java.lang.Object):165:165 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.g40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.r20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):156:156 -> a
     2:158:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:156 -> a
     2:158:java.lang.Object invoke(java.lang.Object):156 -> a
     159:159:java.lang.Object invoke(java.lang.Object):156:156 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.h40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.s20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):162:162 -> a
     2:164:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:162 -> a
     2:164:java.lang.Object invoke(java.lang.Object):162 -> a
     165:165:java.lang.Object invoke(java.lang.Object):162:162 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.i40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.t20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):168:168 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1.invoke(int):168:168 -> a
     2:2:java.lang.Object invoke(java.lang.Object):168 -> a
     3:3:java.lang.Object invoke(java.lang.Object):168:168 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.q40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.B20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
@@ -83139,7 +82153,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():205 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder getT():190:190 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.k40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.v20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -83147,21 +82161,21 @@
     1:1:java.lang.Object invoke(java.lang.Object):208:208 -> a
     2:211:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:209 -> a
     2:211:java.lang.Object invoke(java.lang.Object):208 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.l40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.w20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):196:196 -> a
     2:198:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:196 -> a
     2:198:java.lang.Object invoke(java.lang.Object):196 -> a
     199:199:java.lang.Object invoke(java.lang.Object):196:196 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.m40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.x20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):202:202 -> a
     2:204:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:202 -> a
     2:204:java.lang.Object invoke(java.lang.Object):202 -> a
     205:205:java.lang.Object invoke(java.lang.Object):202:202 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.n40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.y20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):199:199 -> a
@@ -83180,21 +82194,21 @@
     207:207:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():18809:18809 -> a
     207:207:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):199 -> a
     207:207:java.lang.Object invoke(java.lang.Object):199 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.o40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.z20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):193:193 -> a
     2:195:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:193 -> a
     2:195:java.lang.Object invoke(java.lang.Object):193 -> a
     196:196:java.lang.Object invoke(java.lang.Object):193:193 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.p40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.A20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):205:205 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1.invoke(int):205:205 -> a
     2:2:java.lang.Object invoke(java.lang.Object):205 -> a
     3:3:java.lang.Object invoke(java.lang.Object):205:205 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.w40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.H20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder t -> b
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> e
@@ -83224,14 +82238,14 @@
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):101 -> b
     1:1:void visitTypeParameter(int):94:94 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.r40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.C20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):98:98 -> a
     2:100:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:98 -> a
     2:100:java.lang.Object invoke(java.lang.Object):98 -> a
     101:101:java.lang.Object invoke(java.lang.Object):98:98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.s40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.D20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance $variance -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> b
@@ -83241,7 +82255,7 @@
     92:92:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):83:83 -> a
     92:92:java.lang.Object invoke(java.lang.Object):82 -> a
     93:93:java.lang.Object invoke(java.lang.Object):82:82 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.internal.t40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.internal.E20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -83249,7 +82263,7 @@
     1:1:java.lang.Object invoke(java.lang.Object):112:112 -> a
     2:115:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:113 -> a
     2:115:java.lang.Object invoke(java.lang.Object):112 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.u40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.F20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     java.lang.String $typeFlexibilityId -> b
@@ -83258,14 +82272,14 @@
     2:110:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:108 -> a
     2:110:java.lang.Object invoke(java.lang.Object):104 -> a
     111:111:java.lang.Object invoke(java.lang.Object):104:104 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.v40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.G20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):101:101 -> a
     2:103:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:101 -> a
     2:103:java.lang.Object invoke(java.lang.Object):101 -> a
     104:104:java.lang.Object invoke(java.lang.Object):101:101 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.C40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.N20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder t -> b
     int $flags -> d
@@ -83293,14 +82307,14 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():270 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder getT():254:254 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.x40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.I20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):263:263 -> a
     2:265:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:263 -> a
     2:265:java.lang.Object invoke(java.lang.Object):263 -> a
     266:266:java.lang.Object invoke(java.lang.Object):263:263 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1 -> com.android.tools.r8.internal.y40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1 -> com.android.tools.r8.internal.J20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -83311,28 +82325,28 @@
     277:277:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.writeTypeAliasExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):0:0 -> a
     277:277:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):274 -> a
     277:277:java.lang.Object invoke(java.lang.Object):273 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.z40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.K20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):257:257 -> a
     2:259:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:257 -> a
     2:259:java.lang.Object invoke(java.lang.Object):257 -> a
     260:260:java.lang.Object invoke(java.lang.Object):257:257 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.A40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.L20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):260:260 -> a
     2:262:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:260 -> a
     2:262:java.lang.Object invoke(java.lang.Object):260 -> a
     263:263:java.lang.Object invoke(java.lang.Object):260:260 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.B40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.M20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):270:270 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1.invoke(int):270:270 -> a
     2:2:java.lang.Object invoke(java.lang.Object):270 -> a
     3:3:java.lang.Object invoke(java.lang.Object):270:270 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.F40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.Q20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder t -> b
     int $flags -> f
@@ -83349,7 +82363,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):40 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):43:43 -> a
     5:16:void visitEnd():48:59 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.D40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.O20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
@@ -83357,14 +82371,14 @@
     1:1:java.lang.Object invoke(java.lang.Object):43:43 -> a
     2:46:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:44 -> a
     2:46:java.lang.Object invoke(java.lang.Object):43 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.E40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.P20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):40:40 -> a
     2:42:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:40 -> a
     2:42:java.lang.Object invoke(java.lang.Object):40 -> a
     43:43:java.lang.Object invoke(java.lang.Object):40:40 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.J40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.U20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder t -> b
     int $flags -> d
@@ -83383,7 +82397,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):64:64 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):234 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.G40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.R20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> c
@@ -83394,21 +82408,21 @@
     241:241:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.writeValueParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):0:0 -> a
     241:241:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):238 -> a
     241:241:java.lang.Object invoke(java.lang.Object):237 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.H40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.S20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):231:231 -> a
     2:233:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:231 -> a
     2:233:java.lang.Object invoke(java.lang.Object):231 -> a
     234:234:java.lang.Object invoke(java.lang.Object):231:231 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.I40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.T20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):234:234 -> a
     2:236:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:234 -> a
     2:236:java.lang.Object invoke(java.lang.Object):234 -> a
     237:237:java.lang.Object invoke(java.lang.Object):234:234 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.M40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.X20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder t -> b
@@ -83431,62 +82445,61 @@
     33:36:void visitEnd():329:332 -> a
     37:37:void visitEnd():330:330 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder getT():289:289 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.K40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.V20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):322:322 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1.invoke(int):323:323 -> a
     2:2:java.lang.Object invoke(java.lang.Object):322 -> a
     3:3:java.lang.Object invoke(java.lang.Object):322:322 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.L40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.W20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):322:322 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2.invoke(int):324:324 -> a
     2:2:java.lang.Object invoke(java.lang.Object):322 -> a
     3:3:java.lang.Object invoke(java.lang.Object):322:322 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt -> com.android.tools.r8.internal.nj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt -> com.android.tools.r8.internal.Vi:
 # {"id":"sourceFile","fileName":"extensionUtils.kt"}
     1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor applySingleExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):13:16 -> a
     5:13:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension singleOfType(java.util.Collection,com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):25:33 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.Ix:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.Zw:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.Px:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.gx:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.cy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.tx:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
     void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.hy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.yx:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.ny:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.Ex:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.ry:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.Ix:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeAliasExtension -> com.android.tools.r8.internal.wy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeAliasExtension -> com.android.tools.r8.internal.Nx:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.yy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.Px:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.By:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.Sx:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.Hy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.Yx:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.EE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.ID:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion Companion -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.DE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.HD:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion $$INSTANCE -> a
     com.android.tools.r8.jetbrains.kotlin.Lazy INSTANCES$delegate -> b
     1:1:void <clinit>():84:84 -> <clinit>
     1:1:void <init>():83:83 -> <init>
     1:1:java.util.List getINSTANCES():84:84 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.CE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.GD:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 INSTANCE -> b
     1:3:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2.invoke():85:87 -> a
     1:3:java.lang.Object invoke():84 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.internal.lO:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.vO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.jN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List argument_ -> e
     int memoizedSerializedSize -> g
@@ -83540,11 +82553,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder toBuilder():4329 -> m
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):4327:4327 -> m
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder toBuilder():4329 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.mO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.aN:
     1:1:void <init>():1957:1957 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1962:1962 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1957 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.tO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.hN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument defaultInstance -> h
     int memoizedSerializedSize -> g
@@ -83591,11 +82604,11 @@
     1:1:boolean hasValue():3813:3813 -> k
     1:2:void initFields():3823:3824 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder():3939:3939 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.nO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.bN:
     1:1:void <init>():2080:2080 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2085:2085 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2080 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.oO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.cN:
     int nameId_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> e
     int bitField0_ -> c
@@ -83646,7 +82659,7 @@
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> g
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument build():3986 -> g
     15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument build():3986:3986 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.sO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.gN:
     int flags_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value defaultInstance -> q
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -83760,11 +82773,11 @@
     1:1:boolean hasFlags():2793:2793 -> x
     1:1:boolean hasFloatValue():2617:2617 -> y
     1:1:boolean hasIntValue():2602:2602 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.pO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.dN:
     1:1:void <init>():2399:2399 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2404:2404 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2399 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.qO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.eN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type type_ -> d
     int flags_ -> n
     int arrayDimensionCount_ -> m
@@ -83809,15 +82822,12 @@
     84:84:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder addArrayElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder):3608:3608 -> a
     85:86:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.build():3058:3059 -> a
     85:86:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder addArrayElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder):3608 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     87:87:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder addArrayElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder):3608:3608 -> a
     88:88:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     88:88:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.build():3060 -> a
     88:88:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder addArrayElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder):3608 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     89:89:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.build():3060:3060 -> a
     89:89:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder addArrayElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder):3608 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     90:91:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder setArrayDimensionCount(int):3705:3706 -> a
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder setClassId(int):3416:3417 -> b
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.build():3058:3059 -> c
@@ -83838,7 +82848,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.create():3019:3019 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder access$2100():3005 -> f
     1:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3066:3114 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.rO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.fN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] $VALUES -> p
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type BYTE -> c
@@ -83872,7 +82882,7 @@
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2532:2532 -> c
     12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2531:2531 -> c
     13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2530:2530 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.uO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.iN:
     java.util.List argument_ -> e
     int id_ -> d
     int bitField0_ -> c
@@ -83905,7 +82915,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.create():4348:4348 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder access$4200():4334 -> f
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4389 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.zO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.nN:
     java.util.List enumEntry_ -> r
     java.util.List property_ -> p
     int fqName_ -> f
@@ -84105,11 +83115,11 @@
     1:1:java.util.List getSupertypeIdList():9110:9110 -> x
     1:1:java.util.List getSupertypeList():9074:9074 -> y
     1:1:java.util.List getTypeAliasList():9260:9260 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.wO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.kN:
     1:1:void <init>():8838:8838 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8843:8843 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8838 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.xO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.lN:
     java.util.List sealedSubclassFqName_ -> r
     java.util.List enumEntry_ -> q
     java.util.List typeAlias_ -> p
@@ -84214,15 +83224,12 @@
     199:199:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):10447:10447 -> a
     200:201:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
     200:201:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):10447 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     202:202:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):10447:10447 -> a
     203:203:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     203:203:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
     203:203:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):10447 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     204:204:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
     204:204:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):10447 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     205:207:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureSupertypeIsMutable():10494:10496 -> a
     205:207:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addSupertype(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):10571 -> a
     208:208:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addSupertype(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):10572:10572 -> a
@@ -84234,57 +83241,45 @@
     216:216:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10829:10829 -> a
     217:218:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():14066:14067 -> a
     217:218:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10829 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     219:219:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10829:10829 -> a
     220:220:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     220:220:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():14068 -> a
     220:220:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10829 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     221:221:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():14068:14068 -> a
     221:221:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10829 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     222:224:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureFunctionIsMutable():10876:10878 -> a
     222:224:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10953 -> a
     225:225:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10954:10954 -> a
     226:227:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.build():15398:15399 -> a
     226:227:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10954 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     228:228:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10954:10954 -> a
     229:229:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     229:229:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.build():15400 -> a
     229:229:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10954 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     230:230:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.build():15400:15400 -> a
     230:230:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10954 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     231:233:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.ensurePropertyIsMutable():11001:11003 -> a
     231:233:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):11078 -> a
     234:234:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):11079:11079 -> a
     235:236:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17361:17362 -> a
     235:236:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):11079 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     237:237:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):11079:11079 -> a
     238:238:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     238:238:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17363 -> a
     238:238:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):11079 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     239:239:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17363:17363 -> a
     239:239:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):11079 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     240:242:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureTypeAliasIsMutable():11126:11128 -> a
     240:242:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11203 -> a
     243:243:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11204:11204 -> a
     244:245:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():19966:19967 -> a
     244:245:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11204 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     246:246:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11204:11204 -> a
     247:247:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     247:247:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():19968 -> a
     247:247:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11204 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     248:248:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():19968:19968 -> a
     248:248:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11204 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     249:251:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureEnumEntryIsMutable():11251:11253 -> a
     249:251:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11328 -> a
     252:252:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11329:11329 -> a
@@ -84317,7 +83312,7 @@
     2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setFqName(int):10319:10320 -> f
     1:91:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class buildPartial():9897:9987 -> g
     92:93:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setInlineClassUnderlyingPropertyName(int):11456:11457 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.yO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.mN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind INTERFACE -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind CLASS -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind COMPANION_OBJECT -> i
@@ -84332,7 +83327,7 @@
     1:2:void <init>(java.lang.String,int,int,int):8954:8955 -> <init>
     1:1:int getNumber():8925:8925 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind[] values():8855:8855 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.CO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.qN:
     java.util.List valueParameter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor defaultInstance -> j
     int memoizedSerializedSize -> i
@@ -84392,11 +83387,11 @@
     1:1:boolean hasFlags():13802:13802 -> o
     1:3:void initFields():13888:13890 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():14020:14020 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.AO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.oN:
     1:1:void <init>():13774:13774 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13779:13779 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13774 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.BO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.pN:
     int flags_ -> f
     java.util.List versionRequirement_ -> h
     int bitField0_ -> e
@@ -84438,7 +83433,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.create():14043:14043 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder access$12800():14030 -> f
     1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():14074:14091 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.FO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.tN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -84487,11 +83482,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23860 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23858:23858 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23860 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.DO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.rN:
     1:1:void <init>():23703:23703 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23708:23708 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23703 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.EO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.sN:
     java.util.List effect_ -> d
     int bitField0_ -> c
     1:91:void <init>():23872:23962 -> <init>
@@ -84509,15 +83504,12 @@
     30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):24043:24043 -> a
     31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24721:24722 -> a
     31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):24043 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):24043:24043 -> a
     34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24723 -> a
     34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):24043 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24723:24723 -> a
     35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):24043 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23898:23899 -> c
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():23865 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> c
@@ -84533,7 +83525,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.create():23879:23879 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22600():23865 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23906:23912 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.KO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.yN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List effectConstructorArgument_ -> e
@@ -84595,11 +83587,11 @@
     1:1:boolean hasKind():24530:24530 -> n
     1:4:void initFields():24540:24543 -> o
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():24672:24672 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.GO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.uN:
     1:1:void <init>():24270:24270 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24275:24275 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24270 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.HO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.vN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> d
     java.util.List effectConstructorArgument_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression conclusionOfConditionalEffect_ -> f
@@ -84633,15 +83625,12 @@
     54:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder addEffectConstructorArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):24930:24930 -> a
     55:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25927:25928 -> a
     55:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder addEffectConstructorArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):24930 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     57:57:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder addEffectConstructorArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):24930:24930 -> a
     58:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     58:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25929 -> a
     58:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder addEffectConstructorArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):24930 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     59:59:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25929:25929 -> a
     59:59:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder addEffectConstructorArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):24930 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     60:62:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder setConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25009:25011 -> a
     63:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder setKind(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):25082:25085 -> a
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24721:24722 -> c
@@ -84659,7 +83648,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.create():24696:24696 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$23100():24682 -> f
     1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24729:24749 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.IO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.wN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_CONSTANT -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType CALLS -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_NOT_NULL -> e
@@ -84672,7 +83661,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24357:24357 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24356:24356 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24355:24355 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.JO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.xN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind[] $VALUES -> f
     int value -> b
@@ -84685,7 +83674,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24422:24422 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24421:24421 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24420:24420 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.NO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.BN:
     int memoizedSerializedSize -> g
     int bitField0_ -> d
     int name_ -> e
@@ -84696,7 +83685,6 @@
     1:273:void <clinit>():20842:21114 -> <clinit>
     274:274:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.initFields():20874:20874 -> <clinit>
     274:274:void <clinit>():21115 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20771:20771 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20771:20771 -> <init>
     3:128:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):20778:20903 -> <init>
@@ -84729,11 +83717,11 @@
     1:1:boolean hasName():20864:20864 -> m
     1:1:void initFields():20874:20874 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20979:20979 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.LO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.zN:
     1:1:void <init>():20843:20843 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20848:20848 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20843 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.MO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.AN:
     int name_ -> f
     int bitField0_ -> e
     1:1:void <init>():20995:20995 -> <init>
@@ -84772,7 +83760,7 @@
     10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> g
     10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry build():21023 -> g
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry build():21023:21023 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.RO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.FN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression defaultInstance -> m
@@ -84859,11 +83847,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25872 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25870:25870 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25872 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.OO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.CN:
     1:1:void <init>():25389:25389 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25394:25394 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25389 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.PO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.DN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type isInstanceType_ -> g
     int isInstanceTypeId_ -> h
     java.util.List orArgument_ -> j
@@ -84908,30 +83896,24 @@
     77:77:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addAndArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26445:26445 -> a
     78:79:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25927:25928 -> a
     78:79:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addAndArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26445 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     80:80:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addAndArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26445:26445 -> a
     81:81:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     81:81:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25929 -> a
     81:81:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addAndArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26445 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     82:82:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25929:25929 -> a
     82:82:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addAndArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26445 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder setValueParameterReference(int):26139:26140 -> b
     3:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.ensureOrArgumentIsMutable():26516:26518 -> b
     3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addOrArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26641 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addOrArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26642:26642 -> b
     7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25927:25928 -> b
     7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addOrArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26642 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addOrArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26642:26642 -> b
     10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> b
     10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25929 -> b
     10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addOrArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26642 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25929:25929 -> b
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addOrArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26642 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25927:25928 -> c
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():25882 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> c
@@ -84947,7 +83929,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.create():25896:25896 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder access$24000():25882 -> f
     1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25935:25968 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.QO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.EN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue FALSE -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue NULL -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] $VALUES -> f
@@ -84960,7 +83942,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25442:25442 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25441:25441 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25440:25440 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.UO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.IN:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> s
@@ -85082,11 +84064,11 @@
     1:1:boolean hasContract():15086:15086 -> x
     1:1:boolean hasFlags():14847:14847 -> y
     1:1:boolean hasName():14892:14892 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.SO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.GN:
     1:1:void <init>():14811:14811 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14816:14816 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14811 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.TO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.HN:
     java.util.List versionRequirement_ -> p
     int receiverTypeId_ -> m
     int returnTypeId_ -> j
@@ -85178,30 +84160,24 @@
     127:127:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):15925:15925 -> a
     128:129:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
     128:129:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):15925 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     130:130:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):15925:15925 -> a
     131:131:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     131:131:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
     131:131:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):15925 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     132:132:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
     132:132:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):15925 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     133:135:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15989:15991 -> a
     136:138:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.ensureValueParameterIsMutable():16064:16066 -> a
     136:138:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):16141 -> a
     139:139:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):16142:16142 -> a
     140:141:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():18807:18808 -> a
     140:141:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):16142 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     142:142:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):16142:16142 -> a
     143:143:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     143:143:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():18809 -> a
     143:143:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):16142 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     144:144:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():18809:18809 -> a
     144:144:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):16142 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     145:147:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.ensureVersionRequirementIsMutable():16248:16250 -> a
     145:147:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addVersionRequirement(int):16306 -> a
     148:148:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addVersionRequirement(int):16307:16307 -> a
@@ -85226,7 +84202,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.create():15357:15357 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder access$13600():15344 -> f
     1:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function buildPartial():15406:15460 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.VO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.JN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind DELEGATION -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind[] $VALUES -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind SYNTHESIZED -> f
@@ -85238,7 +84214,7 @@
     1:2:void <init>(java.lang.String,int,int,int):268:269 -> <init>
     1:1:int getNumber():242:242 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind[] values():196:196 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.WO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.KN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality SEALED -> f
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality OPEN -> d
@@ -85250,7 +84226,7 @@
     1:2:void <init>(java.lang.String,int,int,int):86:87 -> <init>
     1:1:int getNumber():60:60 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality[] values():14:14 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.ZO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.NN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package defaultInstance -> l
@@ -85329,11 +84305,11 @@
     1:1:boolean hasVersionRequirementTable():12123:12123 -> r
     1:5:void initFields():12133:12137 -> s
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():12294:12294 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.XO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.LN:
     1:1:void <init>():11982:11982 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11987:11987 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11982 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.YO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.MN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> j
     java.util.List function_ -> f
@@ -85385,43 +84361,34 @@
     81:81:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):12558:12558 -> a
     82:83:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.build():15398:15399 -> a
     82:83:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):12558 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     84:84:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):12558:12558 -> a
     85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.build():15400 -> a
     85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):12558 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.build():15400:15400 -> a
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):12558 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     87:89:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.ensurePropertyIsMutable():12605:12607 -> a
     87:89:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):12682 -> a
     90:90:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):12683:12683 -> a
     91:92:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17361:17362 -> a
     91:92:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):12683 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     93:93:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):12683:12683 -> a
     94:94:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     94:94:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17363 -> a
     94:94:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):12683 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     95:95:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17363:17363 -> a
     95:95:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):12683 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     96:98:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.ensureTypeAliasIsMutable():12730:12732 -> a
     96:98:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):12807 -> a
     99:99:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):12808:12808 -> a
     100:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():19966:19967 -> a
     100:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):12808 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     102:102:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):12808:12808 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():19968 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):12808 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     104:104:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():19968:19968 -> a
     104:104:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):12808 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     105:107:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder setVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12932:12934 -> a
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.build():12344:12345 -> c
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():12304 -> c
@@ -85440,7 +84407,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.create():12317:12317 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder access$11100():12304 -> f
     1:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package buildPartial():12352:12378 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.cP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.QN:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -85554,11 +84521,11 @@
     1:1:boolean hasFlags():16817:16817 -> x
     1:1:boolean hasGetterFlags():17000:17000 -> y
     1:1:boolean hasName():16863:16863 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.aP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.ON:
     1:1:void <init>():16780:16780 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16785:16785 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16780 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.bP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.PN:
     int getterFlags_ -> o
     java.util.List versionRequirement_ -> q
     int receiverTypeId_ -> m
@@ -85635,15 +84602,12 @@
     108:108:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):17872:17872 -> a
     109:110:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
     109:110:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):17872 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     111:111:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):17872:17872 -> a
     112:112:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     112:112:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
     112:112:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):17872 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     113:113:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
     113:113:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):17872 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     114:116:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17936:17938 -> a
     117:119:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setSetterValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18028:18030 -> a
     120:122:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.ensureVersionRequirementIsMutable():18182:18184 -> a
@@ -85671,7 +84635,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.create():17320:17320 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder access$15300():17307 -> f
     1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17369:17422 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.jP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.XN:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -85802,11 +84766,11 @@
     1:1:int getTypeParameter():5809:5809 -> x
     1:1:int getTypeParameterName():5832:5832 -> y
     1:1:boolean hasAbbreviatedType():5904:5904 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.dP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.RN:
     1:1:void <init>():4974:4974 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4979:4979 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4974 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.hP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.VN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument defaultInstance -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> h
@@ -85858,11 +84822,11 @@
     1:1:boolean hasTypeId():5259:5259 -> m
     1:3:void initFields():5269:5271 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder():5387:5387 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.eP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.SN:
     1:1:void <init>():5126:5126 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5131:5131 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5126 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.fP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.TN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> e
     int typeId_ -> f
@@ -85906,7 +84870,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.create():5411:5411 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder access$5000():5397 -> f
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5442:5457 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.gP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.UN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection INV -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection STAR -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection IN -> c
@@ -85921,7 +84885,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5187:5187 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5186:5186 -> c
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5185:5185 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.iP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.WN:
     int typeAliasName_ -> n
     int typeParameter_ -> l
     int typeParameterName_ -> m
@@ -86036,7 +85000,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6257 -> g
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6257:6257 -> g
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6263:6323 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.mP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.aO:
     int memoizedSerializedSize -> o
     int expandedTypeId_ -> k
     int underlyingTypeId_ -> i
@@ -86137,11 +85101,11 @@
     1:1:boolean hasName():19532:19532 -> x
     1:1:boolean hasUnderlyingType():19582:19582 -> y
     1:1:boolean hasUnderlyingTypeId():19597:19597 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.kP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.YN:
     1:1:void <init>():19486:19486 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19491:19491 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19486 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.lP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.ZN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type expandedType_ -> k
     int expandedTypeId_ -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type underlyingType_ -> i
@@ -86203,15 +85167,12 @@
     95:95:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):20296:20296 -> a
     96:97:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
     96:97:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):20296 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     98:98:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):20296:20296 -> a
     99:99:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     99:99:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
     99:99:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):20296 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     100:100:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
     100:100:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):20296 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     101:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setExpandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20452:20454 -> a
     104:106:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.ensureAnnotationIsMutable():20527:20529 -> a
     104:106:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder):20604 -> a
@@ -86247,7 +85208,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.create():19931:19931 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$18100():19918 -> f
     1:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():19974:20016 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.qP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.eO:
     int memoizedSerializedSize -> m
     int upperBoundIdMemoizedSerializedSize -> k
     int name_ -> f
@@ -86329,11 +85290,11 @@
     1:1:boolean hasVariance():7518:7518 -> u
     1:6:void initFields():7586:7591 -> v
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7759:7759 -> w
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.nP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.bO:
     1:1:void <init>():7387:7387 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7392:7392 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7387 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.oP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.cO:
     int id_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance variance_ -> i
     java.util.List upperBound_ -> j
@@ -86378,7 +85339,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.create():7782:7782 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder access$7600():7769 -> f
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7819:7848 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.pP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.dO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance[] $VALUES -> f
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance INV -> e
@@ -86391,7 +85352,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7440:7440 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7439:7439 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7438:7438 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.tP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.hO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List type_ -> d
     int memoizedSerializedSize -> g
@@ -86444,11 +85405,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():13296 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13294:13294 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():13296 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.rP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.fO:
     1:1:void <init>():13105:13105 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13110:13110 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13105 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.sP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.gO:
     java.util.List type_ -> d
     int firstNullable_ -> e
     int bitField0_ -> c
@@ -86480,7 +85441,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.create():13315:13315 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$12100():13301 -> f
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13344:13356 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.wP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.kO:
     int memoizedSerializedSize -> l
     byte memoizedIsInitialized -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> i
@@ -86557,11 +85518,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18760 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18758:18758 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18760 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.uP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.iO:
     1:1:void <init>():18474:18474 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18479:18479 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18474 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.vP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.jO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> j
     int varargElementTypeId_ -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> h
@@ -86627,7 +85588,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.create():18778:18778 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder access$17000():18765 -> f
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18815:18842 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.BP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.pO:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -86691,11 +85652,11 @@
     1:1:boolean hasVersionKind():21625:21625 -> s
     1:6:void initFields():21640:21645 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():21776:21776 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.xP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.lO:
     1:1:void <init>():21348:21348 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21353:21353 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21348 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.yP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.mO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> f
     int message_ -> h
     int errorCode_ -> g
@@ -86731,7 +85692,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.create():21800:21800 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$20100():21786 -> f
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21837:21864 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.zP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.nO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level HIDDEN -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level ERROR -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level WARNING -> c
@@ -86744,7 +85705,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21401:21401 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21400:21400 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21399:21399 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.AP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.oO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind API_VERSION -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> d
@@ -86757,7 +85718,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21466:21466 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21465:21465 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21464:21464 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.EP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.sO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List requirement_ -> c
@@ -86802,11 +85763,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22486 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22484:22484 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22486 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.CP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.qO:
     1:1:void <init>():22335:22335 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22340:22340 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22335 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.DP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.rO:
     java.util.List requirement_ -> d
     int bitField0_ -> c
     1:85:void <init>():22498:22582 -> <init>
@@ -86845,7 +85806,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.create():22505:22505 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$21200():22491 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22532:22538 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.FP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.tO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility[] $VALUES -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility LOCAL -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PRIVATE_TO_THIS -> g
@@ -86859,7 +85820,7 @@
     1:2:void <init>(java.lang.String,int,int,int):186:187 -> <init>
     1:1:int getNumber():158:158 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility[] values():96:96 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.internal.V4:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.internal.S4:
 # {"id":"sourceFile","fileName":"BinaryVersion.kt"}
     java.util.List rest -> e
     int patch -> d
@@ -86885,7 +85846,7 @@
     1:1:java.lang.String toString():70 -> toString
     2:6:java.lang.String toString():99:103 -> toString
     7:7:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.Kk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.ok:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_CROSSINLINE -> q
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField DECLARES_DEFAULT_VALUE -> p
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NOT_DEFAULT -> s
@@ -86990,15 +85951,14 @@
     4:4:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):199 -> a
     5:5:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):199:199 -> a
     6:6:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):0:0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.internal.Gk:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.Hk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.lk:
     1:1:void <init>(int):269:269 -> <init>
     1:1:java.lang.Object get(int):266:266 -> a
     2:2:int toFlags(java.lang.Boolean):280:280 -> a
     1:1:java.lang.Boolean get(int):275:275 -> b
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField.$$$reportNull$$$0(int):0:0 -> b
     2:2:java.lang.Boolean get(int):275 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.Ik:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.mk:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[] values -> c
     1:2:void <init>(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):290:291 -> <init>
     1:6:int bitWidth(java.lang.Object[]):295:300 -> a
@@ -87010,22 +85970,22 @@
     307:307:int bitWidth(java.lang.Object[]):300:300 -> a
     311:315:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):306:310 -> a
     311:315:java.lang.Object get(int):286 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.Jk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.nk:
     int bitWidth -> b
     int offset -> a
     1:1:void <init>(int,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1):234:234 -> <init>
     2:4:void <init>(int,int):256:258 -> <init>
     java.lang.Object get(int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.LG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.IF:
 # {"id":"sourceFile","fileName":"NameResolver.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.GP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.uO:
 # {"id":"sourceFile","fileName":"ProtoBufUtil.kt"}
     1:1:java.lang.Object getExtensionOrNull(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):12:12 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt -> com.android.tools.r8.internal.hQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt -> com.android.tools.r8.internal.TO:
 # {"id":"sourceFile","fileName":"protoTypeTableUtil.kt"}
     1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):62:64 -> a
     4:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):76:78 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.m10:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.CZ:
 # {"id":"sourceFile","fileName":"TypeTable.kt"}
     java.util.List types -> a
     1:20:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):21:40 -> <init>
@@ -87033,7 +85993,7 @@
     22:35:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):27:40 -> <init>
     36:36:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):22:22 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type get(int):34:34 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.E20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.T00:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version version -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind kind -> b
@@ -87064,7 +86024,7 @@
     248:248:java.lang.String toString():81:81 -> toString
     249:249:java.lang.String toString():81:81 -> toString
     246:246:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.D20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.S00:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     int minor -> b
     int patch -> c
@@ -87079,7 +86039,7 @@
     int component3() -> c
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version.asString():33:33 -> toString
     1:1:java.lang.String toString():50 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.G20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.V00:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     java.util.List infos -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion Companion -> b
@@ -87096,10 +86056,10 @@
     5:5:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.getOrNull(java.util.List,int):304:304 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12:12 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.F20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.U00:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     1:1:void <init>():14:14 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.fx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.ww:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension constructorSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension propertySignature -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension flags -> e
@@ -87115,8 +86075,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension anonymousObjectOriginName -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension packageLocalVariable -> n
     1:233:void <clinit>():3965:4197 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.internal.Ow:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.Rw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.iw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature defaultInstance -> h
     int memoizedSerializedSize -> g
@@ -87165,11 +86124,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2834 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2832:2832 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2834 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.Pw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.gw:
     1:1:void <init>():2671:2671 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2676:2676 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2671 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.Qw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.hw:
     int name_ -> d
     int desc_ -> e
     int bitField0_ -> c
@@ -87197,7 +86156,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.create():2853:2853 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder access$2500():2839 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2882:2893 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.Uw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.lw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> h
     int memoizedSerializedSize -> g
@@ -87246,11 +86205,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2372 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2370:2370 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2372 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.Sw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.jw:
     1:1:void <init>():2209:2209 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2214:2214 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2209 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.Tw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.kw:
     int name_ -> d
     int desc_ -> e
     int bitField0_ -> c
@@ -87278,7 +86237,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.create():2391:2391 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder access$1800():2377 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2420:2431 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.Xw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.ow:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> f
     byte memoizedIsInitialized -> i
@@ -87337,11 +86296,11 @@
     1:1:boolean hasSyntheticMethod():3265:3265 -> q
     1:5:void initFields():3334:3338 -> r
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3462:3462 -> s
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.Vw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.mw:
     1:1:void <init>():3225:3225 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3230:3230 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3225 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.Ww:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.nw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> g
@@ -87435,7 +86394,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.create():3486:3486 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3472 -> f
     1:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3521:3544 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.ex:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.vw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes defaultInstance -> h
     java.util.List localName_ -> d
@@ -87485,11 +86444,11 @@
     1:1:java.util.List getRecordList():1569:1569 -> i
     1:2:void initFields():1634:1635 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder():1752:1752 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.Yw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.pw:
     1:1:void <init>():172:172 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):177:177 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):172 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.Zw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.qw:
     java.util.List localName_ -> e
     java.util.List record_ -> d
     int bitField0_ -> c
@@ -87539,7 +86498,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.create():1776:1776 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder access$1200():1762 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1805:1816 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.dx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.uw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> m
     java.lang.Object string_ -> f
@@ -87643,11 +86602,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():943 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):941:941 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():943 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.ax:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.rw:
     1:1:void <init>():471:471 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):476:476 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):471 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.bx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.sw:
     java.lang.Object string_ -> f
     java.util.List replaceChar_ -> i
     int range_ -> d
@@ -87691,7 +86650,7 @@
     1:1:int getSubstringIndexCount():1373:1373 -> j
     1:1:boolean hasOperation():1301:1301 -> k
     1:1:boolean hasPredefinedIndex():1153:1153 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.cx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.tw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation[] $VALUES -> f
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation DESC_TO_CLASS_ID -> e
@@ -87704,7 +86663,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):544:544 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.d5:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.a5:
     boolean FORCE_8TO7_ENCODING -> a
     boolean $assertionsDisabled -> b
     1:13:void <clinit>():15:27 -> <clinit>
@@ -87768,7 +86727,7 @@
     123:123:byte[] decodeBytes(java.lang.String[]):191 -> a
     124:140:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding.decode7to8(byte[]):247:263 -> a
     124:140:byte[] decodeBytes(java.lang.String[]):192 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.wa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.ja:
 # {"id":"sourceFile","fileName":"ClassMapperLite.kt"}
     java.util.Map map -> b
     java.lang.String kotlin -> a
@@ -87852,12 +86811,12 @@
     462:462:void <clinit>():22:22 -> <clinit>
     1:1:void map$lambda-0$add(java.util.Map,java.lang.String,java.lang.String):42:42 -> a
     2:2:java.lang.String mapClass(java.lang.String):80:80 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.vw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.Ov:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():14:14 -> <init>
     java.lang.String asString() -> a
     1:1:java.lang.String toString():27:27 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.sw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.Lv:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -87873,20 +86832,20 @@
     1:1:java.lang.String getName():23:23 -> c
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getName():23:23 -> equals
     1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getName():23:23 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean equals(java.lang.Object):0:0 -> equals
-    4:5:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getDesc():23:23 -> equals
-    4:5:boolean equals(java.lang.Object):0 -> equals
-    6:6:boolean equals(java.lang.Object):0:0 -> equals
+    2:2:boolean equals(java.lang.Object):0:0 -> equals
+    3:3:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getName():23:23 -> equals
+    3:3:boolean equals(java.lang.Object):0 -> equals
+    4:4:boolean equals(java.lang.Object):0:0 -> equals
+    5:6:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getDesc():23:23 -> equals
+    5:6:boolean equals(java.lang.Object):0 -> equals
+    7:7:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getName():23:23 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getDesc():23:23 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.tw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.Mv:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -87902,20 +86861,20 @@
     1:1:java.lang.String getName():19:19 -> c
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getName():19:19 -> equals
     1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getName():19:19 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean equals(java.lang.Object):0:0 -> equals
-    4:5:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getDesc():19:19 -> equals
-    4:5:boolean equals(java.lang.Object):0 -> equals
-    6:6:boolean equals(java.lang.Object):0:0 -> equals
+    2:2:boolean equals(java.lang.Object):0:0 -> equals
+    3:3:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getName():19:19 -> equals
+    3:3:boolean equals(java.lang.Object):0 -> equals
+    4:4:boolean equals(java.lang.Object):0:0 -> equals
+    5:6:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getDesc():19:19 -> equals
+    5:6:boolean equals(java.lang.Object):0 -> equals
+    7:7:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getName():19:19 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getDesc():19:19 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.Gw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.Zv:
 # {"id":"sourceFile","fileName":"JvmMetadataVersion.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> g
     boolean isStrictSemantics -> f
@@ -87923,13 +86882,12 @@
     1:1:void <init>(int[],boolean):14:14 -> <init>
     2:2:void <init>(int[]):15:15 -> <init>
     1:6:boolean isCompatible():19:24 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.Jw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.bw:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     java.util.Set localNameIndices -> c
-    java.util.List PREDEFINED_STRINGS -> f
+    java.util.List PREDEFINED_STRINGS -> e
     java.util.List records -> d
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion Companion -> e
-    java.util.Map PREDEFINED_STRINGS_MAP -> g
+    java.util.Map PREDEFINED_STRINGS_MAP -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes types -> a
     java.lang.String[] strings -> b
     1:4:void <clinit>():81:84 -> <clinit>
@@ -88295,10 +87253,7 @@
     1:1:java.lang.String[] getStrings():15:15 -> b
     2:2:boolean isLocalClassName(int):77:77 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getTypes():14:14 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.internal.Iw:
-# {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
-    1:1:void <init>():79:79 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.gx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.xw:
 # {"id":"sourceFile","fileName":"JvmProtoBufUtil.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil INSTANCE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EXTENSION_REGISTRY -> b
@@ -88409,10 +87364,10 @@
     7:7:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
     8:8:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(byte[],java.lang.String[]):42:42 -> c
     8:8:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.UtfEncodingKt -> com.android.tools.r8.internal.g20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.UtfEncodingKt -> com.android.tools.r8.internal.w00:
 # {"id":"sourceFile","fileName":"utfEncoding.kt"}
     1:51:java.lang.String[] bytesToStrings(byte[]):27:77 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.hx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.yw:
 # {"id":"sourceFile","fileName":"JvmStringTable.kt"}
     java.util.LinkedHashSet localNames -> d
     java.util.ArrayList records -> b
@@ -88432,33 +87387,31 @@
     590:591:int getStringIndex(java.lang.String):39:40 -> a
     592:667:int getStringIndex(java.lang.String):34:109 -> a
     668:668:int getStringIndex(java.lang.String):107:107 -> a
-    669:688:int getQualifiedClassNameIndex(java.lang.String,boolean):57:76 -> a
-    689:689:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion.getPredefinedStringIndex(java.lang.String):118:118 -> a
-    689:689:int getQualifiedClassNameIndex(java.lang.String,boolean):76 -> a
-    690:695:int getQualifiedClassNameIndex(java.lang.String,boolean):78:83 -> a
-    696:711:int getQualifiedClassNameIndex(java.lang.String,boolean):74:89 -> a
-    712:732:void serializeTo(java.io.OutputStream):95:115 -> a
-    733:734:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():991:992 -> a
-    733:734:void serializeTo(java.io.OutputStream):96 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    735:735:void serializeTo(java.io.OutputStream):96:96 -> a
-    736:736:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    736:736:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():993 -> a
-    736:736:void serializeTo(java.io.OutputStream):96 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    737:737:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():993:993 -> a
-    737:737:void serializeTo(java.io.OutputStream):96 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    738:739:void serializeTo(java.io.OutputStream):96:97 -> a
-    740:741:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1797:1798 -> a
-    740:741:void serializeTo(java.io.OutputStream):98 -> a
-    742:742:void serializeTo(java.io.OutputStream):98:98 -> a
-    743:743:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    743:743:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1799 -> a
-    743:743:void serializeTo(java.io.OutputStream):98 -> a
-    744:744:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1799:1799 -> a
-    744:744:void serializeTo(java.io.OutputStream):98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.su:
+    669:685:int getQualifiedClassNameIndex(java.lang.String,boolean):57:73 -> a
+    686:686:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion.getPredefinedStringIndex(java.lang.String):118:118 -> a
+    686:686:int getQualifiedClassNameIndex(java.lang.String,boolean):76 -> a
+    687:692:int getQualifiedClassNameIndex(java.lang.String,boolean):78:83 -> a
+    693:708:int getQualifiedClassNameIndex(java.lang.String,boolean):74:89 -> a
+    709:729:void serializeTo(java.io.OutputStream):95:115 -> a
+    730:730:void serializeTo(java.io.OutputStream):96:96 -> a
+    731:732:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():991:992 -> a
+    731:732:void serializeTo(java.io.OutputStream):96 -> a
+    733:733:void serializeTo(java.io.OutputStream):96:96 -> a
+    734:734:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
+    734:734:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():993 -> a
+    734:734:void serializeTo(java.io.OutputStream):96 -> a
+    735:735:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():993:993 -> a
+    735:735:void serializeTo(java.io.OutputStream):96 -> a
+    736:737:void serializeTo(java.io.OutputStream):96:97 -> a
+    738:739:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1797:1798 -> a
+    738:739:void serializeTo(java.io.OutputStream):98 -> a
+    740:740:void serializeTo(java.io.OutputStream):98:98 -> a
+    741:741:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
+    741:741:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1799 -> a
+    741:741:void serializeTo(java.io.OutputStream):98 -> a
+    742:742:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1799:1799 -> a
+    742:742:void serializeTo(java.io.OutputStream):98 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.Mt:
 # {"id":"sourceFile","fileName":"Interner.kt"}
     java.util.HashMap interned -> b
     int firstIndex -> a
@@ -88467,13 +87420,13 @@
     21:24:java.lang.Integer find(java.lang.Object):19:22 -> a
     1:1:boolean isEmpty():16:16 -> b
     2:3:int intern(java.lang.Object):26:27 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$special$$inlined$sortedBy$1 -> com.android.tools.r8.internal.ru:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$special$$inlined$sortedBy$1 -> com.android.tools.r8.internal.Lt:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     java.util.HashMap $receiver$inlined -> b
     1:1:int compare(java.lang.Object,java.lang.Object):321:321 -> compare
     2:2:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):78:78 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):321 -> compare
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.JG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.GF:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.interner -> a
     1:6:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.<init>():23:28 -> <init>
@@ -88512,7 +87465,7 @@
     69:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():40:40 -> a
     69:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.fZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.vX:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     byte[] bytes -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> a
@@ -88614,7 +87567,7 @@
     9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser.parsePartialFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):196:196 -> b
     9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):209 -> b
     9:9:java.lang.Object parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):49 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.b6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.Y5:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString EMPTY -> b
     boolean $assertionsDisabled -> c
     1:22:void <clinit>():60:81 -> <clinit>
@@ -88641,9 +87594,9 @@
     int peekCachedHashCode() -> e
     java.lang.String toString(java.lang.String) -> f
     1:1:java.lang.String toString():1019:1019 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.internal.Z5:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.internal.W5:
     byte nextByte() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.a6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.X5:
     int bufferPos -> f
     byte[] EMPTY_BYTE_ARRAY -> g
     int flushedBuffersTotalBytes -> d
@@ -88672,7 +87625,7 @@
     20:28:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output.flushFullBuffer(int):898:906 -> write
     20:28:void write(byte[],int,int):814 -> write
     29:30:void write(byte[],int,int):815:816 -> write
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.Vb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.Ab:
     byte[] buffer -> a
     int currentLimit -> h
     int recursionDepth -> i
@@ -88804,7 +87757,7 @@
     7:7:int readTag():158 -> n
     8:8:int readTag():158:158 -> n
     1:8:void recomputeBufferSizeAfterLimit():1001:1008 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.Xb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.Cb:
     byte[] buffer -> a
     java.io.OutputStream output -> e
     int totalBytesWritten -> d
@@ -88924,9 +87877,9 @@
     15:15:void writeSInt64(int,long):342 -> e
     1:4:void writeRawLittleEndian32(int):1246:1249 -> f
     1:4:void writeRawVarint32(int):1195:1198 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.Wb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.Bb:
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.mj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.Ui:
     java.util.Map extensionsByNumber -> a
     int $r8$clinit -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EMPTY -> b
@@ -88938,20 +87891,19 @@
     3:3:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125:125 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
     4:4:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getNumber():830:830 -> a
     5:5:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125 -> a
     6:6:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getNumber():694:694 -> a
     6:6:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getNumber():830 -> a
     6:6:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125 -> a
     7:7:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125:125 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.lj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.Ti:
     java.lang.Object object -> a
     int number -> b
     1:3:void <init>(java.lang.Object,int):167:169 -> <init>
     1:5:boolean equals(java.lang.Object):178:182 -> equals
     1:1:int hashCode():174:174 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.fk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.Lj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet DEFAULT_INSTANCE -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap fields -> a
     int $r8$clinit -> e
@@ -88969,7 +87921,6 @@
     14:14:void addRepeatedField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):340:340 -> a
     15:15:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
     15:15:void addRepeatedField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):340 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
     16:16:void addRepeatedField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):345 -> a
     17:17:void addRepeatedField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):345:345 -> a
@@ -88980,7 +87931,6 @@
     27:28:boolean isInitialized(java.util.Map$Entry):435:436 -> a
     29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
     29:29:boolean isInitialized(java.util.Map$Entry):436 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:30:boolean isInitialized(java.util.Map$Entry):436:436 -> a
     31:31:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
     31:31:boolean isInitialized(java.util.Map$Entry):437 -> a
@@ -88988,228 +87938,218 @@
     47:52:void mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet):481:486 -> a
     53:87:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):556:590 -> a
     88:88:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):575:575 -> a
-    89:89:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readSInt32():585:585 -> a
-    89:89:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):574 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    90:90:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):574:574 -> a
-    91:91:long com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readSFixed64():580:580 -> a
-    91:91:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):573 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    89:89:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):574:574 -> a
+    90:90:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readSInt32():585:585 -> a
+    90:90:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):574 -> a
+    91:91:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):574:574 -> a
     92:92:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):573:573 -> a
-    93:93:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readSFixed32():575:575 -> a
-    93:93:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):572 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    94:108:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):572:586 -> a
-    109:109:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readUInt32():562:562 -> a
-    109:109:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):571 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    110:110:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):571:571 -> a
-    111:122:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):570:581 -> a
-    123:123:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):578:578 -> a
-    124:124:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):568:568 -> a
-    125:125:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):564:564 -> a
-    126:126:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readFixed32():358:358 -> a
-    126:126:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):563 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    127:127:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):563:563 -> a
-    128:128:long com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readFixed64():353:353 -> a
-    128:128:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):562 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    129:129:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):562:562 -> a
-    130:130:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readInt32():348:348 -> a
-    130:130:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):561 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    131:131:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):561:561 -> a
-    132:132:long com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readUInt64():338:338 -> a
-    132:132:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):560 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    133:133:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):560:560 -> a
-    134:134:long com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readInt64():343:343 -> a
-    134:134:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):559 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    135:135:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):559:559 -> a
-    136:136:float com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readFloat():333:333 -> a
-    136:136:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):558 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    137:137:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):558:558 -> a
-    138:138:double com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readDouble():328:328 -> a
-    138:138:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):557 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    139:139:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):557:557 -> a
-    140:163:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):679:702 -> a
-    164:164:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeSInt64NoTag(long):517:517 -> a
-    164:164:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):702 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    165:165:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):701:701 -> a
-    166:166:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeSInt32NoTag(int):512:512 -> a
-    166:166:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):701 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    167:167:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):700:700 -> a
-    168:168:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeSFixed64NoTag(long):507:507 -> a
-    168:168:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):700 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    169:169:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):699:699 -> a
-    170:170:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeSFixed32NoTag(int):502:502 -> a
-    170:170:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):699 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    171:172:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):705:706 -> a
-    173:173:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeEnumNoTag(int):497:497 -> a
-    173:173:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):706 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    174:174:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):708:708 -> a
-    175:175:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeEnumNoTag(int):497:497 -> a
-    175:175:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):708 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    176:176:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):698:698 -> a
-    177:177:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeUInt32NoTag(int):489:489 -> a
-    177:177:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):698 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    178:179:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):692:693 -> a
-    180:181:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeBytesNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):455:456 -> a
-    180:181:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):693 -> a
-    182:182:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):695:695 -> a
-    183:184:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeByteArrayNoTag(byte[]):461:462 -> a
-    183:184:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):695 -> a
-    185:185:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):690:690 -> a
-    186:186:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):689:689 -> a
-    187:187:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroupNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):430:430 -> a
-    187:187:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):689 -> a
-    188:188:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):688:688 -> a
-    189:191:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeStringNoTag(java.lang.String):423:425 -> a
-    189:191:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):688 -> a
-    192:192:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):687:687 -> a
-    193:193:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeBoolNoTag(boolean):415:415 -> a
-    193:193:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):687 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    194:194:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):686:686 -> a
-    195:195:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeFixed32NoTag(int):410:410 -> a
-    195:195:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):686 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    196:196:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):685:685 -> a
-    197:197:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeFixed64NoTag(long):405:405 -> a
-    197:197:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):685 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    198:198:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):684:684 -> a
-    199:199:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):683:683 -> a
-    200:200:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeUInt64NoTag(long):385:385 -> a
-    200:200:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):683 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    201:201:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):682:682 -> a
-    202:202:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeInt64NoTag(long):390:390 -> a
-    202:202:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):682 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    203:203:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):681:681 -> a
-    204:204:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeFloatNoTag(float):380:380 -> a
-    204:204:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):681 -> a
-    205:205:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):680:680 -> a
-    206:206:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeDoubleNoTag(double):375:375 -> a
-    206:206:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):680 -> a
-    207:207:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):719:719 -> a
-    208:208:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
-    208:208:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):719 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    209:209:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getNumber():694:694 -> a
-    209:209:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):720 -> a
-    210:210:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
-    210:210:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):721 -> a
-    211:211:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):722:722 -> a
-    212:212:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isPacked():710:710 -> a
-    212:212:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):723 -> a
-    213:213:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
-    213:213:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):724 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    214:223:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):727:736 -> a
-    224:225:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):657:658 -> a
-    224:225:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
-    226:226:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
-    226:226:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):233 -> a
-    226:226:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
-    226:226:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
-    227:227:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroupNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):430:430 -> a
-    227:227:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):234 -> a
-    227:227:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
-    227:227:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
-    228:228:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
-    228:228:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):235 -> a
-    228:228:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
-    228:228:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
-    229:229:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.getWireFormatForFieldType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):472:472 -> a
-    229:229:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):660 -> a
-    229:229:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
-    230:230:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
-    230:230:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):660 -> a
-    230:230:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
-    231:231:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):661:661 -> a
-    231:231:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
-    232:233:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):657:658 -> a
-    232:233:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
-    234:234:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
-    234:234:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):233 -> a
-    234:234:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
-    234:234:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
-    235:235:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroupNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):430:430 -> a
-    235:235:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):234 -> a
-    235:235:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
-    235:235:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
-    236:236:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
-    236:236:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):235 -> a
-    236:236:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
-    236:236:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
-    237:237:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.getWireFormatForFieldType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):472:472 -> a
-    237:237:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):660 -> a
-    237:237:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
+    93:93:long com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readSFixed64():580:580 -> a
+    93:93:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):573 -> a
+    94:94:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):573:573 -> a
+    95:95:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):572:572 -> a
+    96:96:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readSFixed32():575:575 -> a
+    96:96:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):572 -> a
+    97:111:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):572:586 -> a
+    112:112:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):571:571 -> a
+    113:113:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readUInt32():562:562 -> a
+    113:113:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):571 -> a
+    114:114:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):571:571 -> a
+    115:126:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):570:581 -> a
+    127:127:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):578:578 -> a
+    128:128:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):568:568 -> a
+    129:129:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):564:564 -> a
+    130:130:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):563:563 -> a
+    131:131:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readFixed32():358:358 -> a
+    131:131:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):563 -> a
+    132:132:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):563:563 -> a
+    133:133:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):562:562 -> a
+    134:134:long com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readFixed64():353:353 -> a
+    134:134:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):562 -> a
+    135:135:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):562:562 -> a
+    136:136:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):561:561 -> a
+    137:137:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readInt32():348:348 -> a
+    137:137:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):561 -> a
+    138:138:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):561:561 -> a
+    139:139:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):560:560 -> a
+    140:140:long com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readUInt64():338:338 -> a
+    140:140:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):560 -> a
+    141:141:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):560:560 -> a
+    142:142:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):559:559 -> a
+    143:143:long com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readInt64():343:343 -> a
+    143:143:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):559 -> a
+    144:144:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):559:559 -> a
+    145:145:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):558:558 -> a
+    146:146:float com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readFloat():333:333 -> a
+    146:146:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):558 -> a
+    147:147:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):558:558 -> a
+    148:148:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):557:557 -> a
+    149:149:double com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readDouble():328:328 -> a
+    149:149:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):557 -> a
+    150:150:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):557:557 -> a
+    151:174:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):679:702 -> a
+    175:175:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeSInt64NoTag(long):517:517 -> a
+    175:175:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):702 -> a
+    176:176:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):701:701 -> a
+    177:177:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeSInt32NoTag(int):512:512 -> a
+    177:177:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):701 -> a
+    178:178:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):700:700 -> a
+    179:179:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeSFixed64NoTag(long):507:507 -> a
+    179:179:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):700 -> a
+    180:180:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):699:699 -> a
+    181:181:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeSFixed32NoTag(int):502:502 -> a
+    181:181:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):699 -> a
+    182:183:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):705:706 -> a
+    184:184:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeEnumNoTag(int):497:497 -> a
+    184:184:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):706 -> a
+    185:185:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):708:708 -> a
+    186:186:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeEnumNoTag(int):497:497 -> a
+    186:186:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):708 -> a
+    187:187:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):698:698 -> a
+    188:188:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeUInt32NoTag(int):489:489 -> a
+    188:188:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):698 -> a
+    189:190:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):692:693 -> a
+    191:192:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeBytesNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):455:456 -> a
+    191:192:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):693 -> a
+    193:193:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):695:695 -> a
+    194:195:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeByteArrayNoTag(byte[]):461:462 -> a
+    194:195:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):695 -> a
+    196:196:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):690:690 -> a
+    197:197:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):689:689 -> a
+    198:198:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroupNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):430:430 -> a
+    198:198:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):689 -> a
+    199:199:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):688:688 -> a
+    200:202:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeStringNoTag(java.lang.String):423:425 -> a
+    200:202:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):688 -> a
+    203:203:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):687:687 -> a
+    204:204:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeBoolNoTag(boolean):415:415 -> a
+    204:204:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):687 -> a
+    205:205:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):686:686 -> a
+    206:206:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeFixed32NoTag(int):410:410 -> a
+    206:206:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):686 -> a
+    207:207:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):685:685 -> a
+    208:208:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeFixed64NoTag(long):405:405 -> a
+    208:208:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):685 -> a
+    209:209:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):684:684 -> a
+    210:210:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):683:683 -> a
+    211:211:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeUInt64NoTag(long):385:385 -> a
+    211:211:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):683 -> a
+    212:212:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):682:682 -> a
+    213:213:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeInt64NoTag(long):390:390 -> a
+    213:213:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):682 -> a
+    214:214:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):681:681 -> a
+    215:215:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeFloatNoTag(float):380:380 -> a
+    215:215:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):681 -> a
+    216:216:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):680:680 -> a
+    217:217:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeDoubleNoTag(double):375:375 -> a
+    217:217:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):680 -> a
+    218:218:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):719:719 -> a
+    219:219:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
+    219:219:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):719 -> a
+    220:220:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getNumber():694:694 -> a
+    220:220:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):720 -> a
+    221:221:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
+    221:221:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):721 -> a
+    222:222:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):722:722 -> a
+    223:223:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isPacked():710:710 -> a
+    223:223:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):723 -> a
+    224:224:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):724:724 -> a
+    225:225:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
+    225:225:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):724 -> a
+    226:235:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):727:736 -> a
+    236:237:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):657:658 -> a
+    236:237:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
     238:238:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
-    238:238:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):660 -> a
-    238:238:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
-    239:239:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):661:661 -> a
-    239:239:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
-    240:281:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):835:876 -> a
-    282:282:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):858:858 -> a
-    283:283:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeSInt64SizeNoTag(long):948:948 -> a
-    283:283:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):858 -> a
-    284:284:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):857:857 -> a
-    285:285:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeSInt32SizeNoTag(int):940:940 -> a
-    285:285:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):857 -> a
-    286:286:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):856:856 -> a
-    287:301:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):855:869 -> a
-    302:302:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeEnumSizeNoTag(int):916:916 -> a
-    302:302:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):869 -> a
-    303:303:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):872:872 -> a
-    304:304:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeEnumSizeNoTag(int):916:916 -> a
-    304:304:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):872 -> a
-    305:305:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):854:854 -> a
-    306:306:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeUInt32SizeNoTag(int):908:908 -> a
-    306:306:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):854 -> a
-    307:308:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):849:850 -> a
-    309:309:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeBytesSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):883:883 -> a
-    309:309:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):850 -> a
-    310:310:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):852:852 -> a
-    311:311:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeByteArraySizeNoTag(byte[]):892:892 -> a
-    311:311:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):852 -> a
-    312:312:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):864:864 -> a
-    313:313:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):847:847 -> a
-    314:314:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeGroupSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):844:844 -> a
-    314:314:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):847 -> a
-    315:315:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):846:846 -> a
-    316:320:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeStringSizeNoTag(java.lang.String):831:835 -> a
-    316:320:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):846 -> a
-    321:321:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):845:845 -> a
-    322:322:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):844:844 -> a
-    323:323:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):843:843 -> a
-    324:324:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):842:842 -> a
-    325:325:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):841:841 -> a
-    326:326:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeUInt64SizeNoTag(long):777:777 -> a
-    326:326:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):841 -> a
-    327:327:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):840:840 -> a
-    328:328:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeInt64SizeNoTag(long):785:785 -> a
-    328:328:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):840 -> a
-    329:329:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):839:839 -> a
-    330:330:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):838:838 -> a
+    238:238:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):233 -> a
+    238:238:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
+    238:238:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
+    239:239:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroupNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):430:430 -> a
+    239:239:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):234 -> a
+    239:239:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
+    239:239:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
+    240:240:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
+    240:240:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):235 -> a
+    240:240:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
+    240:240:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
+    241:241:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.getWireFormatForFieldType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):472:472 -> a
+    241:241:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):660 -> a
+    241:241:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
+    242:242:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):660:660 -> a
+    242:242:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
+    243:243:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
+    243:243:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):660 -> a
+    243:243:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
+    244:244:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):661:661 -> a
+    244:244:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):737 -> a
+    245:246:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):657:658 -> a
+    245:246:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
+    247:247:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
+    247:247:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):233 -> a
+    247:247:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
+    247:247:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
+    248:248:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroupNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):430:430 -> a
+    248:248:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):234 -> a
+    248:248:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
+    248:248:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
+    249:249:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
+    249:249:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeGroup(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):235 -> a
+    249:249:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):658 -> a
+    249:249:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
+    250:250:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.getWireFormatForFieldType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):472:472 -> a
+    250:250:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):660 -> a
+    250:250:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
+    251:251:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):660:660 -> a
+    251:251:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
+    252:252:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
+    252:252:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):660 -> a
+    252:252:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
+    253:253:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.writeElement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,int,java.lang.Object):661:661 -> a
+    253:253:void writeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):744 -> a
+    254:295:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):835:876 -> a
+    296:296:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):858:858 -> a
+    297:297:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeSInt64SizeNoTag(long):948:948 -> a
+    297:297:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):858 -> a
+    298:298:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):857:857 -> a
+    299:299:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeSInt32SizeNoTag(int):940:940 -> a
+    299:299:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):857 -> a
+    300:300:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):856:856 -> a
+    301:315:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):855:869 -> a
+    316:316:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeEnumSizeNoTag(int):916:916 -> a
+    316:316:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):869 -> a
+    317:317:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):872:872 -> a
+    318:318:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeEnumSizeNoTag(int):916:916 -> a
+    318:318:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):872 -> a
+    319:319:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):854:854 -> a
+    320:320:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeUInt32SizeNoTag(int):908:908 -> a
+    320:320:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):854 -> a
+    321:322:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):849:850 -> a
+    323:323:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeBytesSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):883:883 -> a
+    323:323:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):850 -> a
+    324:324:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):852:852 -> a
+    325:325:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeByteArraySizeNoTag(byte[]):892:892 -> a
+    325:325:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):852 -> a
+    326:326:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):864:864 -> a
+    327:327:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):847:847 -> a
+    328:328:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeGroupSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):844:844 -> a
+    328:328:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):847 -> a
+    329:329:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):846:846 -> a
+    330:334:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeStringSizeNoTag(java.lang.String):831:835 -> a
+    330:334:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):846 -> a
+    335:335:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):845:845 -> a
+    336:336:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):844:844 -> a
+    337:337:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):843:843 -> a
+    338:338:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):842:842 -> a
+    339:339:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):841:841 -> a
+    340:340:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeUInt64SizeNoTag(long):777:777 -> a
+    340:340:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):841 -> a
+    341:341:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):840:840 -> a
+    342:342:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeInt64SizeNoTag(long):785:785 -> a
+    342:342:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):840 -> a
+    343:343:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):839:839 -> a
+    344:344:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):838:838 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet emptySet():99:99 -> b
     2:2:boolean hasField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite):209:209 -> b
     3:3:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> b
     3:3:boolean hasField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite):209 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean hasField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite):214:214 -> b
     5:5:boolean hasField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite):210:210 -> b
     6:27:void verifyType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):369:390 -> b
@@ -89224,7 +88164,6 @@
     65:71:void mergeFromField(java.util.Map$Entry):504:510 -> b
     72:72:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> b
     72:72:void mergeFromField(java.util.Map$Entry):510 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     73:73:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.getField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite):224:224 -> b
     73:73:void mergeFromField(java.util.Map$Entry):511 -> b
     74:77:void mergeFromField(java.util.Map$Entry):513:516 -> b
@@ -89249,7 +88188,6 @@
     111:111:int computeFieldSize(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):885:885 -> b
     112:112:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> b
     112:112:int computeFieldSize(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):885 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     113:113:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getNumber():694:694 -> b
     113:113:int computeFieldSize(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):886 -> b
     114:114:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> b
@@ -89264,7 +88202,6 @@
     1:1:void setField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):238:238 -> c
     2:2:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> c
     2:2:void setField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):238 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:13:void setField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):239:249 -> c
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> c
     14:14:void setField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):249 -> c
@@ -89279,157 +88216,163 @@
     1:5:java.util.Iterator iterator():197:201 -> e
     1:5:void makeImmutable():107:111 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet newFieldSet():92:92 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.ek:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Sl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.Kj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.vl:
     1:1:void <init>():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):56:56 -> <init>
-    1:1:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):73:73 -> a
-    2:10:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):517:525 -> a
-    2:10:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
-    11:11:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):525 -> a
-    11:11:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    12:12:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):525:525 -> a
-    12:12:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    13:13:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.getWireFormatForFieldType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):472:472 -> a
-    13:13:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):525 -> a
-    13:13:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    14:14:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):529:529 -> a
-    14:14:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
-    15:15:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):529 -> a
-    15:15:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    16:22:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):540:546 -> a
-    16:22:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
-    23:23:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):546 -> a
-    23:23:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    24:25:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):546:547 -> a
-    24:25:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    26:26:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readEnum():570:570 -> a
-    26:26:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):548 -> a
-    26:26:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    27:27:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):549:549 -> a
-    27:27:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    28:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getEnumType():714:714 -> a
-    28:28:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):549 -> a
-    28:28:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    29:41:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):549:561 -> a
-    29:41:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    42:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
-    42:42:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):561 -> a
-    42:42:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    43:53:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):561:571 -> a
-    43:53:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    54:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
-    54:54:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):571 -> a
-    54:54:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    55:92:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):571:608 -> a
-    55:92:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    93:93:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
-    93:93:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):608 -> a
-    93:93:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    94:94:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):608:608 -> a
-    94:94:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    95:95:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):574:574 -> a
-    95:95:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    96:96:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
-    96:96:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):574 -> a
-    96:96:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    97:100:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):575:578 -> a
-    97:100:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    101:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getMessageDefaultInstance():839:839 -> a
-    101:101:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):582 -> a
-    101:101:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    102:105:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):582:585 -> a
-    102:105:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    106:106:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
-    106:106:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):585 -> a
-    106:106:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    107:107:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):585:585 -> a
-    107:107:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    108:108:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getNumber():694:694 -> a
-    108:108:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getNumber():830 -> a
-    108:108:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):587 -> a
-    108:108:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    109:114:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):587:592 -> a
-    109:114:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    115:115:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readEnum():570:570 -> a
-    115:115:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):596 -> a
-    115:115:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    116:116:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):597:597 -> a
-    116:116:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    117:117:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getEnumType():714:714 -> a
-    117:117:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):597 -> a
-    117:117:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    118:123:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):597:602 -> a
-    118:123:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    124:124:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeUInt32NoTag(int):489:489 -> a
-    124:124:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):603 -> a
-    124:124:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    125:125:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):614:614 -> a
-    125:125:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    126:126:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
-    126:126:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):614 -> a
-    126:126:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    127:130:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):615:618 -> a
-    127:130:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
-    131:131:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newSingularGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Class):639:639 -> a
-    132:133:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newRepeatedGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean,java.lang.Class):661:662 -> a
-    134:136:java.lang.reflect.Method getMethodOrDie(java.lang.Class,java.lang.String,java.lang.Class[]):735:737 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.internal.Ll:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.Ml:
+    1:738:java.lang.reflect.Method getMethodOrDie(java.lang.Class,java.lang.String,java.lang.Class[]):0:737 -> a
+    739:739:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):73:73 -> a
+    740:748:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):517:525 -> a
+    740:748:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    749:749:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
+    749:749:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):525 -> a
+    749:749:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    750:750:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):525:525 -> a
+    750:750:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    751:751:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet.getWireFormatForFieldType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean):472:472 -> a
+    751:751:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):525 -> a
+    751:751:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    752:769:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):529:546 -> a
+    752:769:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    770:770:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
+    770:770:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):546 -> a
+    770:770:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    771:772:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):546:547 -> a
+    771:772:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    773:773:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readEnum():570:570 -> a
+    773:773:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):548 -> a
+    773:773:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    774:774:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):549:549 -> a
+    774:774:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    775:775:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getEnumType():714:714 -> a
+    775:775:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):549 -> a
+    775:775:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    776:788:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):549:561 -> a
+    776:788:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    789:789:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
+    789:789:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):561 -> a
+    789:789:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    790:800:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):561:571 -> a
+    790:800:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    801:801:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
+    801:801:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):571 -> a
+    801:801:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    802:839:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):571:608 -> a
+    802:839:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    840:840:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
+    840:840:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):608 -> a
+    840:840:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    841:841:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):608:608 -> a
+    841:841:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    842:842:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):574:574 -> a
+    842:842:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    843:843:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
+    843:843:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):574 -> a
+    843:843:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    844:847:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):575:578 -> a
+    844:847:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    848:848:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getMessageDefaultInstance():839:839 -> a
+    848:848:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):582 -> a
+    848:848:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    849:852:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):582:585 -> a
+    849:852:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    853:853:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
+    853:853:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):585 -> a
+    853:853:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    854:854:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):585:585 -> a
+    854:854:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    855:855:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getNumber():830:830 -> a
+    855:855:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):587 -> a
+    855:855:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    856:856:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getNumber():694:694 -> a
+    856:856:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getNumber():830 -> a
+    856:856:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):587 -> a
+    856:856:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    857:866:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):587:596 -> a
+    857:866:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    867:867:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream.readEnum():570:570 -> a
+    867:867:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):596 -> a
+    867:867:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    868:868:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):597:597 -> a
+    868:868:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    869:869:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getEnumType():714:714 -> a
+    869:869:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):597 -> a
+    869:869:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    870:875:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):597:602 -> a
+    870:875:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    876:876:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeUInt32NoTag(int):489:489 -> a
+    876:876:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):603 -> a
+    876:876:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    877:877:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):614:614 -> a
+    877:877:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    878:878:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
+    878:878:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):614 -> a
+    878:878:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    879:882:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):615:618 -> a
+    879:882:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
+    883:883:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newSingularGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Class):639:639 -> a
+    884:885:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newRepeatedGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean,java.lang.Class):661:662 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.pl:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     1:45:void <init>():87:131 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder setUnknownFields(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):127:127 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType() -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString getUnknownFields():123:123 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.Nl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.ql:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> c
     boolean extensionsIsMutable -> d
     1:3:void <init>():332:334 -> <init>
-    1:3:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
-    1:3:void mergeExtensionFields(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage):495 -> a
-    4:4:void mergeExtensionFields(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage):496:496 -> a
-    5:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.buildExtensions():361:363 -> a
-    5:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):327 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
-    8:8:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder addExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):327:327 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.buildExtensions():361:363 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):327 -> a
+    5:7:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
+    5:7:void mergeExtensionFields(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage):495 -> a
+    8:8:void mergeExtensionFields(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage):496:496 -> a
     9:9:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
     9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder addExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    10:12:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
-    10:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder addExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):454 -> a
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder addExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):455:455 -> a
-    14:14:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
-    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder addExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
-    15:15:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> a
-    16:16:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> a
-    17:19:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
-    17:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):432 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433:433 -> a
-    21:21:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
-    21:21:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.toFieldSetType(java.lang.Object):869 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433 -> a
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
-    22:22:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.toFieldSetType(java.lang.Object):870 -> a
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433 -> a
-    23:33:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.toFieldSetType(java.lang.Object):870:880 -> a
-    23:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433 -> a
-    34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433:433 -> a
-    35:35:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
-    35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.Pl:
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
+    10:10:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder addExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    11:11:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder addExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    12:14:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
+    12:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder addExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):454 -> a
+    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder addExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):455:455 -> a
+    16:16:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
+    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder addExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    17:17:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
+    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> a
+    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
+    18:18:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
+    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> a
+    19:19:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
+    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> a
+    20:22:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
+    20:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):432 -> a
+    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433:433 -> a
+    24:24:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.toFieldSetType(java.lang.Object):869:869 -> a
+    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433 -> a
+    25:25:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
+    25:25:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.toFieldSetType(java.lang.Object):869 -> a
+    25:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433 -> a
+    26:26:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.toFieldSetType(java.lang.Object):870:870 -> a
+    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433 -> a
+    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
+    27:27:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.toFieldSetType(java.lang.Object):870 -> a
+    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433 -> a
+    28:38:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.toFieldSetType(java.lang.Object):870:880 -> a
+    28:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433 -> a
+    39:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433:433 -> a
+    40:40:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
+    40:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.sl:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> b
     1:2:void <init>():171:172 -> <init>
     3:4:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):175:176 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet access$200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage):164:164 -> a
-    2:2:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):246:246 -> a
+    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):181:181 -> a
+    2:2:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):211 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
     3:3:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):181 -> a
     3:3:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):211 -> a
@@ -89441,26 +88384,31 @@
     9:9:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
     9:9:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.fromFieldSetType(java.lang.Object):844 -> a
     9:9:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):216 -> a
-    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
-    10:10:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.fromFieldSetType(java.lang.Object):845 -> a
+    10:10:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.fromFieldSetType(java.lang.Object):845:845 -> a
     10:10:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):216 -> a
-    11:21:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.fromFieldSetType(java.lang.Object):845:855 -> a
-    11:21:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):216 -> a
-    22:22:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):184:184 -> a
-    22:22:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):211 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> b
-    1:1:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):181 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
+    11:11:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.fromFieldSetType(java.lang.Object):845 -> a
+    11:11:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):216 -> a
+    12:22:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.fromFieldSetType(java.lang.Object):845:855 -> a
+    12:22:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):216 -> a
+    23:23:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):184:184 -> a
+    23:23:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):211 -> a
+    24:24:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):246:246 -> a
+    1:1:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):181:181 -> b
     1:1:boolean hasExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):194 -> b
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):181:181 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> b
+    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):181 -> b
     2:2:boolean hasExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):194 -> b
-    3:3:boolean hasExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):195:195 -> b
-    4:4:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):184:184 -> b
-    4:4:boolean hasExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):194 -> b
+    3:3:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):181:181 -> b
+    3:3:boolean hasExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):194 -> b
+    4:4:boolean hasExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):195:195 -> b
+    5:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):184:184 -> b
+    5:5:boolean hasExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):194 -> b
     1:1:boolean extensionsAreInitialized():233:233 -> g
     1:1:int extensionsSerializedSize():316:316 -> h
     1:1:void makeExtensionsImmutable():261:261 -> i
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter newExtensionWriter():308:308 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.Ol:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.rl:
     java.util.Map$Entry next -> b
     java.util.Iterator iter -> a
     boolean messageSetWireFormat -> c
@@ -89470,11 +88418,9 @@
     1:1:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):288:288 -> a
     2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getNumber():694:694 -> a
     2:2:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):288 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):289:290 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
     5:5:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):290 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):290:290 -> a
     7:7:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
     7:7:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):290 -> a
@@ -89484,26 +88430,21 @@
     10:10:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
     10:10:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeMessageSetExtension(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):352 -> a
     10:10:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     11:11:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
     11:11:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeUInt32(int,int):303 -> a
     11:11:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeMessageSetExtension(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):353 -> a
     11:11:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
     12:12:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeUInt32NoTag(int):489:489 -> a
     12:12:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeUInt32(int,int):304 -> a
     12:12:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeMessageSetExtension(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):353 -> a
     12:12:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
     13:13:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeMessageSetExtension(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):354:354 -> a
     13:13:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeTag(int,int):1180:1180 -> a
     14:14:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeMessageSetExtension(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):355 -> a
     14:14:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     15:20:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):296:301 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.Ql:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.tl:
     boolean isRepeated -> e
     boolean isPacked -> f
     int number -> c
@@ -89514,7 +88455,7 @@
     1:1:int compareTo(java.lang.Object):671:671 -> compareTo
     2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.compareTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor):725:725 -> compareTo
     2:2:int compareTo(java.lang.Object):671 -> compareTo
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.Rl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.ul:
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
     java.lang.reflect.Method enumValueOf -> e
@@ -89525,7 +88466,6 @@
     1:1:java.lang.Object singularFromFieldSetType(java.lang.Object):860:860 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
     2:2:java.lang.Object singularFromFieldSetType(java.lang.Object):860 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:java.lang.Object singularFromFieldSetType(java.lang.Object):860:861 -> a
     5:17:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite.invokeOrDie(java.lang.reflect.Method,java.lang.Object,java.lang.Object[]):746:758 -> a
     5:17:java.lang.Object singularFromFieldSetType(java.lang.Object):861 -> a
@@ -89536,30 +88476,29 @@
     1:1:java.lang.Object singularToFieldSetType(java.lang.Object):885:885 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> b
     2:2:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:java.lang.Object singularToFieldSetType(java.lang.Object):885:886 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.gu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.At:
     byte[] EMPTY_BYTE_ARRAY -> a
     1:6:void <clinit>():383:388 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.eu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.yt:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.fu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.zt:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite findValueByNumber(int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.Au:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.Ut:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite unfinishedMessage -> b
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException setUnfinishedMessage(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):57:57 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getUnfinishedMessage():66:66 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException truncatedMessage():70:70 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.oB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.xA:
     java.util.Iterator iterator -> b
     1:2:void <init>(java.util.Iterator):130:131 -> <init>
     1:1:boolean hasNext():136:136 -> hasNext
     1:2:java.util.Map$Entry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator.next():142:143 -> next
     1:2:java.lang.Object next():127 -> next
     1:1:void remove():151:151 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.AC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.JB:
     int hash -> e
     byte[] bytes -> d
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -89588,17 +88527,16 @@
     217:217:boolean equals(java.lang.Object):197:197 -> equals
     218:218:boolean equals(java.lang.Object):197:197 -> equals
     215:215:boolean equals(java.lang.Object):197:197 -> equals
-    1:1:java.lang.String toString(java.lang.String):155:155 -> f
-    2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString.size():76:76 -> f
-    2:2:java.lang.String toString(java.lang.String):155 -> f
-    3:3:java.lang.String toString(java.lang.String):155:155 -> f
+    1:156:java.lang.String toString(java.lang.String):0:155 -> f
+    157:157:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString.size():76:76 -> f
+    157:157:java.lang.String toString(java.lang.String):155 -> f
+    158:158:java.lang.String toString(java.lang.String):155:155 -> f
     int getOffsetIntoBytes() -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():307:307 -> h
     1:9:int hashCode():251:259 -> hashCode
     1:1:java.util.Iterator iterator():52:52 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.internal.yC:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.zC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.IB:
     int position -> b
     int limit -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> d
@@ -89609,12 +88547,12 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator.next():325:325 -> next
     1:1:java.lang.Object next():310 -> next
     1:1:void remove():337:337 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.BE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.FD:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType() -> a
     boolean isInitialized() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.bM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.XK:
     java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.OU:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.gT:
     int treeDepth -> h
     int hash -> i
     int leftLength -> g
@@ -89647,36 +88585,52 @@
     1:2:boolean isValidUtf8():429:430 -> c
     1:1:int peekCachedHashCode():562:562 -> e
     1:20:boolean equals(java.lang.Object):456:475 -> equals
-    21:26:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):494:499 -> equals
-    21:26:boolean equals(java.lang.Object):480 -> equals
-    27:27:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString.size():76:76 -> equals
-    27:27:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):503 -> equals
+    21:21:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):494:494 -> equals
+    21:21:boolean equals(java.lang.Object):480 -> equals
+    22:22:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.next():716:716 -> equals
+    22:22:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):495 -> equals
+    22:22:boolean equals(java.lang.Object):480 -> equals
+    23:23:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):498:498 -> equals
+    23:23:boolean equals(java.lang.Object):480 -> equals
+    24:24:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.next():716:716 -> equals
+    24:24:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):499 -> equals
+    24:24:boolean equals(java.lang.Object):480 -> equals
+    25:25:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):503:503 -> equals
+    25:25:boolean equals(java.lang.Object):480 -> equals
+    26:26:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString.size():76:76 -> equals
+    26:26:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):503 -> equals
+    26:26:boolean equals(java.lang.Object):480 -> equals
+    27:27:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):504:504 -> equals
     27:27:boolean equals(java.lang.Object):480 -> equals
     28:28:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString.size():76:76 -> equals
     28:28:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):504 -> equals
     28:28:boolean equals(java.lang.Object):480 -> equals
-    29:55:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):505:531 -> equals
-    29:55:boolean equals(java.lang.Object):480 -> equals
-    1:1:java.lang.String toString(java.lang.String):421:421 -> f
-    2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.size():269:269 -> f
-    2:2:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString.toByteArray():528 -> f
-    2:2:java.lang.String toString(java.lang.String):421 -> f
-    3:6:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString.toByteArray():530:533 -> f
-    3:6:java.lang.String toString(java.lang.String):421 -> f
-    7:7:java.lang.String toString(java.lang.String):421:421 -> f
+    29:44:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):505:520 -> equals
+    29:44:boolean equals(java.lang.Object):480 -> equals
+    45:45:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.next():716:716 -> equals
+    45:45:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):525 -> equals
+    45:45:boolean equals(java.lang.Object):480 -> equals
+    46:46:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.next():716:716 -> equals
+    46:46:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):531 -> equals
+    46:46:boolean equals(java.lang.Object):480 -> equals
+    1:422:java.lang.String toString(java.lang.String):0:421 -> f
+    423:423:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.size():269:269 -> f
+    423:423:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString.toByteArray():528 -> f
+    423:423:java.lang.String toString(java.lang.String):421 -> f
+    424:427:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString.toByteArray():530:533 -> f
+    424:427:java.lang.String toString(java.lang.String):421 -> f
+    428:428:java.lang.String toString(java.lang.String):421:421 -> f
     1:1:int[] access$600():70:70 -> g
     1:9:int hashCode():547:555 -> hashCode
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.iterator():779:779 -> iterator
     1:1:java.util.Iterator iterator():70 -> iterator
     1:1:int size():269:269 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.internal.KU:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.LU:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.dT:
     java.util.Stack prefixesStack -> a
     1:5:void <init>():602:606 -> <init>
     6:6:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1):602:602 -> <init>
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer.balance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):609:616 -> a
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):602 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):628:628 -> a
     10:10:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer.insert(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):656:656 -> a
     10:10:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):629 -> a
@@ -89699,7 +88653,7 @@
     691:691:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):635:635 -> a
     692:692:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):635:635 -> a
     689:689:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):635:635 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.MU:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.eT:
     java.util.Stack breadCrumbs -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next -> c
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1):716:716 -> <init>
@@ -89708,16 +88662,16 @@
     1:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString getLeafByLeft(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):728:733 -> a
     1:1:boolean hasNext():752:752 -> hasNext
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():761:761 -> l
-    2:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getNextNonEmptyLeaf():740:743 -> l
-    2:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765 -> l
-    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString.isEmpty():135:135 -> l
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getNextNonEmptyLeaf():744 -> l
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765 -> l
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765:765 -> l
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> l
+    2:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getNextNonEmptyLeaf():740:744 -> l
+    2:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765 -> l
+    7:7:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString.isEmpty():135:135 -> l
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getNextNonEmptyLeaf():744 -> l
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765 -> l
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765:765 -> l
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> l
     1:1:java.lang.Object next():716:716 -> next
     1:1:void remove():770:770 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.NU:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.fT:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator bytes -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator pieces -> b
     int bytesRemaining -> d
@@ -89728,7 +88682,7 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator.next():799:799 -> next
     1:1:java.lang.Object next():782 -> next
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.bW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.AU:
     java.util.Map com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.overflowEntries -> d
     java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.entryList -> c
     boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.isImmutable -> e
@@ -89740,27 +88694,23 @@
     java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.put(java.lang.Comparable,java.lang.Object) -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.access$200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):87:87 -> a
-    2:2:java.util.Map$Entry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getArrayEntryAt(int):185:185 -> a
-    2:2:java.util.Map$Entry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getArrayEntryAt(int):0 -> a
-      # {"id":"com.android.tools.r8.synthesized"}
+    2:2:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.access$500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,int):87:87 -> a
     3:5:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.removeArrayEntryAt(int):296:298 -> a
     3:5:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.access$500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,int):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:10:java.util.SortedMap com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getOverflowEntriesMutable():377:381 -> a
     6:10:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.removeArrayEntryAt(int):301 -> a
     6:10:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.access$500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,int):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     11:13:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.removeArrayEntryAt(int):301:303 -> a
     11:13:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.access$500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,int):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,java.util.Map$Entry):406:406 -> a
     14:14:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.removeArrayEntryAt(int):303 -> a
     14:14:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.access$500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,int):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     15:16:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.removeArrayEntryAt(int):303:304 -> a
     15:16:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.access$500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,int):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:33:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.binarySearchInArray(java.lang.Comparable):316:332 -> a
+    17:17:java.util.Map$Entry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getArrayEntryAt(int):185:185 -> a
+    17:17:java.util.Map$Entry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getArrayEntryAt(int):0 -> a
+      # {"id":"com.android.tools.r8.synthesized"}
+    18:34:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.binarySearchInArray(java.lang.Comparable):316:332 -> a
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.access$400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):87:87 -> b
     2:6:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.put(java.lang.Comparable,java.lang.Object):237:241 -> b
     7:9:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.ensureEntryArrayMutable():389:391 -> b
@@ -89800,11 +88750,9 @@
     3:5:void makeImmutable():106:108 -> m
     6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> m
     6:6:void makeImmutable():108 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:13:void makeImmutable():109:115 -> m
     14:14:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> m
     14:14:void makeImmutable():115 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:16:void makeImmutable():116:117 -> m
     17:25:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.makeImmutable():161:169 -> m
     17:25:void makeImmutable():121 -> m
@@ -89840,20 +88788,20 @@
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.size():202:202 -> size
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.size():0 -> size
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.eW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.DU:
     java.util.Iterator ITERATOR -> a
     java.lang.Iterable ITERABLE -> b
     1:16:void <clinit>():591:606 -> <clinit>
     1:1:java.util.Iterator access$700():589:589 -> a
     1:1:java.lang.Iterable iterable():615:615 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.cW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.BU:
     1:1:void <init>():591:591 -> <init>
     1:1:java.lang.Object next():598:598 -> next
     1:1:void remove():602:602 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.dW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.CU:
     1:1:void <init>():606:606 -> <init>
     1:1:java.util.Iterator iterator():609:609 -> iterator
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.fW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.EU:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     java.lang.Comparable key -> b
     java.lang.Object value -> c
@@ -89865,6 +88813,11 @@
     2:2:int compareTo(java.lang.Object):400 -> compareTo
     3:3:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry.compareTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry):426:426 -> compareTo
     3:3:int compareTo(java.lang.Object):400 -> compareTo
+    4:4:java.lang.Comparable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry.getKey():416:416 -> compareTo
+    4:4:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry.compareTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry):426 -> compareTo
+    4:4:int compareTo(java.lang.Object):400 -> compareTo
+    5:5:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry.compareTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry):426:426 -> compareTo
+    5:5:int compareTo(java.lang.Object):400 -> compareTo
     1:6:boolean equals(java.lang.Object):442:447 -> equals
     7:7:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry.equals(java.lang.Object,java.lang.Object):463:463 -> equals
     7:7:boolean equals(java.lang.Object):447 -> equals
@@ -89877,7 +88830,7 @@
     1:1:int hashCode():452:452 -> hashCode
     1:3:java.lang.Object setValue(java.lang.Object):431:433 -> setValue
     1:1:java.lang.String toString():458:458 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.gW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.FU:
     java.util.Iterator lazyOverflowIterator -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> e
     int pos -> b
@@ -89900,7 +88853,7 @@
     9:12:void remove():566 -> remove
     13:13:void remove():566:566 -> remove
     14:14:void remove():558:558 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.hW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.GU:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):470:470 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1):470:470 -> <init>
@@ -89912,9 +88865,9 @@
     1:1:java.util.Iterator iterator():474:474 -> iterator
     1:3:boolean remove(java.lang.Object):514:516 -> remove
     1:1:int size():479:479 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.z10:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.PZ:
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):53:53 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.f20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.v00:
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
     67:67:int partialIsValidUtf8(byte[],int,int):252:252 -> a
     68:79:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8.partialIsValidUtf8NonAscii(byte[],int,int):270:281 -> a
@@ -89935,10 +88888,9 @@
     94:94:int partialIsValidUtf8(byte[],int,int):256 -> a
     95:95:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8.partialIsValidUtf8NonAscii(byte[],int,int):306:306 -> a
     95:95:int partialIsValidUtf8(byte[],int,int):256 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.K30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.V10:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.D30:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.I30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.T10:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType javaType -> b
     int wireType -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType FLOAT -> e
@@ -89967,18 +88919,18 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType getJavaType():143:143 -> a
     1:1:int getWireType():144:144 -> b
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.E30:
-    1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):116:116 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.F30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.P10:
+    1:117:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):0:116 -> <init>
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.Q10:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):119:119 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.G30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.R10:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):122:122 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.H30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.S10:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):125:125 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.J30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.U10:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType DOUBLE -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BOOLEAN -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType[] $VALUES -> l
@@ -89993,7 +88945,7 @@
     1:9:void <clinit>():78:86 -> <clinit>
     10:10:void <clinit>():77:77 -> <clinit>
     1:2:void <init>(java.lang.String,int,java.lang.Object):88:89 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.iw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.Bv:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():85:85 -> <clinit>
@@ -90007,7 +88959,7 @@
     1:1:void visitEnd():75 -> b
     2:2:void visitEnd():75:75 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():54:54 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.lw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.Ev:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     1:1:void <clinit>():280:280 -> <clinit>
@@ -90015,14 +88967,14 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):256:256 -> <init>
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():260:260 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.mw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.Fv:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor delegate -> a
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor):14:15 -> <init>
     void visitModuleName(java.lang.String) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor getDelegate():15:15 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):34:34 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.ow:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.Hv:
 # {"id":"sourceFile","fileName":"jvmExtensions.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):25:25 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):167 -> a
@@ -90033,7 +88985,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):31:31 -> b
     1:1:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):182 -> b
     2:2:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):182:182 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.pw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.Iv:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -90050,25 +89002,25 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature.getDesc():51:51 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.rw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.Kv:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor delegate -> a
     1:1:void <clinit>():161:161 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor):122:123 -> <init>
-    3:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):122:122 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):122:122 -> <init>
+    2:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor):122:123 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):136:136 -> a
     2:2:void visitLambdaClassOriginName(java.lang.String):144:144 -> a
     3:3:void visitEnd():151:151 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():126:126 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.uw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.Nv:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():16:16 -> <init>
     java.lang.String asString() -> a
     java.lang.String getDesc() -> b
     java.lang.String getName() -> c
     1:1:java.lang.String toString():30:30 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.Hw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.aw:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -90085,7 +89037,7 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature.getDesc():40:40 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.Lw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.dw:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():115:115 -> <clinit>
@@ -90097,20 +89049,20 @@
     1:1:void visitEnd():105 -> b
     2:2:void visitEnd():105:105 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():99:99 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.Nw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.fw:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor delegate -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():249:249 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor):168:169 -> <init>
-    3:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):168:168 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):168:168 -> <init>
+    2:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor):168:169 -> <init>
     1:4:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):191:194 -> a
     5:5:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):208:208 -> a
     6:6:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):219:219 -> a
-    7:7:void visitEnd():239:239 -> a
     1:1:void visitSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):232:232 -> b
+    2:2:void visitEnd():239:239 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():172:172 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.jx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.Aw:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor delegate -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
@@ -90121,7 +89073,7 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):344:344 -> a
     2:2:void visitEnd():351:351 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():327:327 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.lx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Cw:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor delegate -> a
@@ -90131,7 +89083,7 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):299:299 -> a
     2:2:void visitEnd():306:306 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():291:291 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.uz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.Ky:
 # {"id":"sourceFile","fileName":"KotlinClassHeader.kt"}
     java.lang.String packageName -> g
     java.lang.String extraString -> f
@@ -90179,7 +89131,6 @@
     2:72:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
     73:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9889:9890 -> i
     73:74:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int):70 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     73:74:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int,int,java.lang.Object):65 -> i
     73:74:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
     75:76:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int):70:71 -> i
@@ -90195,12 +89146,10 @@
     79:79:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> i
     79:79:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9891 -> i
     79:79:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int):70 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     79:79:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int,int,java.lang.Object):65 -> i
     79:79:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
     80:80:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9891:9891 -> i
     80:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int):70 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     80:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int,int,java.lang.Object):65 -> i
     80:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.b:
@@ -90215,7 +89164,7 @@
     5:5:java.lang.Object invoke():30 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair invoke():32:32 -> a
     6:6:java.lang.Object invoke():30 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.xz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.Ny:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():310:310 -> <init>
     1:1:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.checkMetadataVersion(int[]):345:345 -> a
@@ -90253,7 +89202,6 @@
     2:123:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
     124:125:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.build():12344:12345 -> h
     124:125:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write(int[],int):121 -> h
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     124:125:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int,int,java.lang.Object):116 -> h
     124:125:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
     126:127:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write(int[],int):121:122 -> h
@@ -90269,12 +89217,10 @@
     130:130:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> h
     130:130:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.build():12346 -> h
     130:130:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write(int[],int):121 -> h
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     130:130:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int,int,java.lang.Object):116 -> h
     130:130:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
     131:131:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.build():12346:12346 -> h
     131:131:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write(int[],int):121 -> h
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     131:131:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int,int,java.lang.Object):116 -> h
     131:131:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.d:
@@ -90313,7 +89259,6 @@
     2:297:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
     298:299:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.build():12344:12345 -> a
     298:299:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String,int[],int):295 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     298:299:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int,int,java.lang.Object):289 -> a
     298:299:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
     300:302:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String,int[],int):295:297 -> a
@@ -90329,12 +89274,10 @@
     305:305:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
     305:305:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.build():12346 -> a
     305:305:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String,int[],int):295 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     305:305:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int,int,java.lang.Object):289 -> a
     305:305:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
     306:306:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.build():12346:12346 -> a
     306:306:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String,int[],int):295 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     306:306:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int,int,java.lang.Object):289 -> a
     306:306:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.f:
@@ -90405,10 +89348,10 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> b
     1:2:com.android.tools.r8.jetbrains.kotlin.Pair invoke():134:135 -> a
     1:2:java.lang.Object invoke():133 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.yz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.Oy:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):308:308 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.hw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.Av:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     int jvmFlags -> f
@@ -90430,7 +89373,7 @@
     1:1:int getJvmFlags():38:38 -> d
     1:1:java.util.List getLocalDelegatedProperties():35:35 -> e
     1:1:java.lang.String getModuleName():36:36 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.kw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.Dv:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> b
     1:1:void <init>():145:145 -> <init>
@@ -90440,10 +89383,10 @@
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():146:146 -> a
     6:6:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):149:149 -> a
     1:1:void setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):146:146 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt -> com.android.tools.r8.internal.nw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt -> com.android.tools.r8.internal.Gv:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):22:22 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.qw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.Jv:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> c
     java.lang.String lambdaClassOriginName -> d
@@ -90455,7 +89398,7 @@
     8:8:void visitLambdaClassOriginName(java.lang.String):97:97 -> a
     1:1:java.lang.String getLambdaClassOriginName():90:90 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():89:89 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.Fw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.Yv:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17:17 -> a
@@ -90485,7 +89428,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension createPropertyExtension():305:305 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension createTypeExtension():311:311 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension createTypeParameterExtension():309:309 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.xw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.Qv:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -90494,7 +89437,7 @@
     2:3:void visitModuleName(java.lang.String):134:135 -> a
     4:4:void visitJvmFlags(int):141:141 -> a
     1:1:void visitAnonymousObjectOriginName(java.lang.String):124:124 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.ww:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Pv:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder $proto -> b
     1:1:java.lang.Object invoke(java.lang.Object):129:129 -> a
@@ -90513,14 +89456,14 @@
     138:138:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17363:17363 -> a
     138:138:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):130 -> a
     138:138:java.lang.Object invoke(java.lang.Object):129 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.yw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.Rv:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder $proto -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):249:249 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):252:252 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.zw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.Sv:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder $proto -> c
@@ -90528,14 +89471,14 @@
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):177:177 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):180:180 -> a
     2:2:void visitLambdaClassOriginName(java.lang.String):185:185 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.Bw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.Uv:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder $proto -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder):151:151 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):154:154 -> a
     2:3:void visitModuleName(java.lang.String):159:160 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Aw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Tv:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder $proto -> b
     1:1:java.lang.Object invoke(java.lang.Object):154:154 -> a
@@ -90554,7 +89497,7 @@
     163:163:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17363:17363 -> a
     163:163:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):155 -> a
     163:163:java.lang.Object invoke(java.lang.Object):154 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.Cw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.Vv:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder signatureOrNull -> d
@@ -90573,18 +89516,18 @@
     10:10:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):212 -> a
     11:14:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):215:218 -> a
     15:15:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):225:225 -> a
-    16:20:void visitEnd():235:239 -> a
-    21:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3513:3514 -> a
-    21:22:void visitEnd():239 -> a
-    23:23:void visitEnd():239:239 -> a
-    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3515 -> a
-    24:24:void visitEnd():239 -> a
-    25:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3515:3515 -> a
-    25:25:void visitEnd():239 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder getSignature():199:199 -> b
-    2:2:void visitSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):231:231 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.Dw:
+    1:1:void visitSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):231:231 -> b
+    2:6:void visitEnd():235:239 -> b
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3513:3514 -> b
+    7:8:void visitEnd():239 -> b
+    9:9:void visitEnd():239:239 -> b
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> b
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3515 -> b
+    10:10:void visitEnd():239 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3515:3515 -> b
+    11:11:void visitEnd():239 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder getSignature():199:199 -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.Wv:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -90599,7 +89542,7 @@
     6:6:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):279 -> a
     7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
     7:7:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):279 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.Ew:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.Xv:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -90613,7 +89556,7 @@
     5:5:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):264 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
     6:6:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):264 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.Kw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.cw:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String moduleName -> d
@@ -90629,7 +89572,7 @@
     123:123:void visitModuleName(java.lang.String):75:75 -> a
     1:1:java.util.List getLocalDelegatedProperties():68:68 -> c
     1:1:java.lang.String getModuleName():69:69 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.Mw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.ew:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForDelegate -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> g
@@ -90643,14 +89586,14 @@
     2:7:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):108 -> a
     8:11:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):122:125 -> a
     12:12:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):129:129 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature getFieldSignature():110:110 -> b
-    2:2:void visitSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):133:133 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getGetterSignature():111:111 -> c
-    1:1:int getJvmFlags():109:109 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature():112:112 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations():113:113 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForDelegate():114:114 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.ix:
+    1:1:void visitSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):133:133 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature getFieldSignature():110:110 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getGetterSignature():111:111 -> d
+    1:1:int getJvmFlags():109:109 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature():112:112 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations():113:113 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForDelegate():114:114 -> h
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.zw:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> d
     boolean isRaw -> c
@@ -90666,7 +89609,7 @@
     14:14:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):181:181 -> a
     1:1:java.util.List getAnnotations():174:174 -> b
     1:1:boolean isRaw():173:173 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.kx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.Bw:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> c
     1:2:void <init>():158:159 -> <init>
@@ -90679,7 +89622,7 @@
     31:31:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):158 -> a
     32:32:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):162:162 -> a
     1:1:java.util.List getAnnotations():159:159 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.android.tools.r8.internal.mx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.android.tools.r8.internal.Dw:
 # {"id":"sourceFile","fileName":"jvmWriteUtils.kt"}
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):14:16 -> a
     4:66:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):0:62 -> a
@@ -90688,31 +89631,31 @@
     67:67:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):16 -> a
     68:75:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17:24 -> a
     76:85:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):15:24 -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.Py:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.gy:
     void get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.Qy:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.Ry:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.Sy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.hy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.iy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.jy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.Ty:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.ky:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.Uy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.ly:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.Vy:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.Wy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.my:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.ny:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor get(int,java.lang.String,int,int) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.Xy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.oy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.Yy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.py:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor get(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.Zy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.qy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor get(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.az:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.bz:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.cz:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.ry:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.sy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.ty:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.dz:
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.mz:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.uy:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.Cy:
     com.android.tools.r8.kotlin.Kotlin$Functional functional -> b
     com.android.tools.r8.kotlin.Kotlin$Metadata metadata -> d
     com.android.tools.r8.kotlin.Kotlin$_Assertions assertions -> e
@@ -90720,13 +89663,12 @@
     com.android.tools.r8.kotlin.Kotlin$Intrinsics intrinsics -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:7:void <init>(com.android.tools.r8.graph.DexItemFactory):93:99 -> <init>
-com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.internal.gz:
-com.android.tools.r8.kotlin.Kotlin$ClassClassifiers -> com.android.tools.r8.internal.hz:
+com.android.tools.r8.kotlin.Kotlin$ClassClassifiers -> com.android.tools.r8.internal.xy:
     java.util.Set kotlinPrimitivesDescriptors -> a
     java.util.Set kotlinStaticallyKnownTypes -> b
     1:32:void <clinit>():58:89 -> <clinit>
     1:2:void lambda$static$0(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,java.lang.String):81:82 -> a
-com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.iz:
+com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.yy:
     com.android.tools.r8.graph.DexType lambdaType -> a
     com.android.tools.r8.kotlin.Kotlin this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.kotlin.Kotlin$1):102:102 -> <init>
@@ -90736,7 +89678,7 @@
     13:26:void <init>(com.android.tools.r8.kotlin.Kotlin):117:130 -> <init>
     27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):128:128 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):120:120 -> a
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.jz:
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.zy:
     com.android.tools.r8.graph.DexMethod checkNotNullParameter -> d
     com.android.tools.r8.graph.DexMethod checkParameterIsNotNull -> c
     com.android.tools.r8.graph.DexMethod throwParameterIsNullNPE -> b
@@ -90748,7 +89690,7 @@
     25:31:void <init>(com.android.tools.r8.kotlin.Kotlin):177:183 -> <init>
     32:37:void <init>(com.android.tools.r8.kotlin.Kotlin):181:186 -> <init>
     38:38:void <init>(com.android.tools.r8.kotlin.Kotlin):185:185 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.kz:
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.Ay:
     com.android.tools.r8.graph.DexString kind -> a
     com.android.tools.r8.graph.DexString metadataVersion -> b
     com.android.tools.r8.graph.DexString bytecodeVersion -> c
@@ -90758,11 +89700,11 @@
     com.android.tools.r8.graph.DexString packageName -> g
     com.android.tools.r8.graph.DexString extraInt -> h
     1:9:void <init>(com.android.tools.r8.kotlin.Kotlin):144:152 -> <init>
-com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.lz:
+com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.By:
     com.android.tools.r8.graph.DexField enabledField -> b
     com.android.tools.r8.graph.DexType type -> a
     1:5:void <init>(com.android.tools.r8.kotlin.Kotlin):155:159 -> <init>
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.sz:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.Iy:
     java.util.Map EMPTY_ARGUMENTS -> a
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -90773,7 +89715,7 @@
     11:20:void lambda$create$0(java.util.LinkedHashMap,com.android.tools.r8.graph.DexItemFactory,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):55 -> a
     21:21:void lambda$create$0(java.util.LinkedHashMap,com.android.tools.r8.graph.DexItemFactory,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):55:55 -> a
     22:26:java.util.Map create(java.util.Map,com.android.tools.r8.graph.DexItemFactory):51:55 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.nz:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.Dy:
     com.android.tools.r8.kotlin.KotlinAnnotationInfo value -> b
     1:2:void <init>(com.android.tools.r8.kotlin.KotlinAnnotationInfo):129:130 -> <init>
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):135:136 -> a
@@ -90781,7 +89723,7 @@
     3:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):141:141 -> a
     4:4:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):147:147 -> a
     5:5:void lambda$rewrite$0(java.util.function.Consumer,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):150:150 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.oz:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.Ey:
     java.util.List value -> b
     com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo EMPTY -> c
     1:2:void <clinit>():160:161 -> <clinit>
@@ -90791,7 +89733,7 @@
     9:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):182:183 -> a
     11:24:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):190:203 -> a
     25:25:void lambda$rewrite$0(java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):197:197 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.pz:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.Fy:
     int arrayDimensionCount -> c
     com.android.tools.r8.kotlin.KotlinTypeReference value -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,int):64:66 -> <init>
@@ -90800,7 +89742,7 @@
     4:4:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):77:77 -> a
     5:5:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):83:83 -> a
     6:6:void lambda$rewrite$0(java.util.function.Consumer,java.lang.String):84:84 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.qz:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.Gy:
     java.lang.String enumEntryName -> c
     com.android.tools.r8.kotlin.KotlinTypeReference enumClassName -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String):96:98 -> <init>
@@ -90811,14 +89753,14 @@
     7:7:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):110:110 -> a
     8:8:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):116:116 -> a
     9:9:void lambda$rewrite$0(java.util.function.Consumer,java.lang.String):118:118 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.rz:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.Hy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument argument -> b
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):212:213 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):217:217 -> a
     1:1:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo access$400(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):208 -> a
     2:2:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):228:228 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.tz:
+com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.Jy:
     java.util.Map arguments -> b
     java.util.List EMPTY_ANNOTATIONS -> c
     com.android.tools.r8.kotlin.KotlinTypeReference annotationType -> a
@@ -90834,7 +89776,7 @@
     65:65:void lambda$rewrite$0(java.util.Map,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):74:74 -> a
     66:67:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):89:90 -> a
     68:68:void lambda$trace$3(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):90:90 -> a
-com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.vz:
+com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.Ly:
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> l
     com.android.tools.r8.kotlin.KotlinMetadataMembersTracker originalMembersWithKotlinInfo -> t
     com.android.tools.r8.kotlin.KotlinTypeInfo inlineClassUnderlyingType -> r
@@ -90973,112 +89915,111 @@
     1:1:java.util.function.Consumer lambda$trace$6(com.android.tools.r8.kotlin.KotlinTypeReference):420:420 -> b
     1:1:java.lang.String getPackageName():405:405 -> j
     1:1:int[] getMetadataVersion():410:410 -> m
-com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.wz:
+com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.My:
     boolean isNoKotlinInformation() -> a
     com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> f
     java.lang.String getPackageName() -> j
     boolean isSyntheticClass() -> l
     int[] getMetadataVersion() -> m
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.Bz:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.Qy:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():34:34 -> <clinit>
-    1:3:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):51:53 -> a
-    4:4:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
-    4:4:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:66 -> a
-    6:6:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":284,"2":285,"3":286}}
-    284:284:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:66 -> a
-    285:285:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:66 -> a
-    286:286:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:66 -> a
-    72:72:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:66 -> a
-    73:73:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":290,"2":291,"3":292}}
-    290:290:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):70:70 -> a
-    291:291:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):70:70 -> a
-    292:292:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):70:70 -> a
-    145:145:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):72:72 -> a
-    146:152:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):67:73 -> a
-    153:153:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
-    153:153:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    154:154:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
-    155:155:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":293,"2":294,"3":295}}
-    293:293:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
-    294:294:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
-    295:295:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
-    211:211:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
-    212:212:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":299,"2":300,"3":301}}
-    299:299:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):60:60 -> a
-    300:300:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):60:60 -> a
-    301:301:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):60:60 -> a
-    274:274:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):62:62 -> a
-    275:281:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):57:63 -> a
-    302:303:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):78:79 -> a
-    304:311:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.getFlavour(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin):109:116 -> a
-    304:311:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):80 -> a
-    312:316:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):85:89 -> a
-    317:319:java.util.Map com.android.tools.r8.kotlin.KotlinClassMetadataReader.toElementMap(com.android.tools.r8.graph.DexEncodedAnnotation):117:119 -> a
-    317:319:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):89 -> a
-    320:324:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):147:151 -> a
-    320:324:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):90 -> a
-    325:330:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):91:96 -> a
-    331:335:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):147:151 -> a
-    331:335:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):97 -> a
-    336:336:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):96:96 -> a
-    337:337:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):149:149 -> a
-    337:337:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):97 -> a
-    338:338:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):149:149 -> a
-    338:338:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):90 -> a
-    339:341:java.util.Map com.android.tools.r8.kotlin.KotlinClassMetadataReader.toElementMap(com.android.tools.r8.graph.DexEncodedAnnotation):117:119 -> a
-    339:341:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):112 -> a
-    342:342:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):112:112 -> a
-    343:347:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):147:151 -> a
-    343:347:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):126 -> a
-    348:363:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):127:142 -> a
-    364:367:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):322:322 -> a
-    364:367:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    364:367:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
-    370:380:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):325:335 -> a
-    370:380:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    370:380:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
-    381:381:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):334:334 -> a
-    381:381:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    381:381:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
-    382:382:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):333:333 -> a
-    382:382:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    382:382:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
-    383:383:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):332:332 -> a
-    383:383:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    383:383:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
-    384:384:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):331:331 -> a
-    384:384:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    384:384:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
-    385:395:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):330:340 -> a
-    385:395:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    385:395:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
-    396:396:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):338:338 -> a
+    1:16:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):51:66 -> a
+    17:17:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
+    17:17:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66 -> a
+    18:18:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:66 -> a
+    19:19:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":298,"2":299,"3":300}}
+    298:298:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:66 -> a
+    299:299:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:66 -> a
+    300:300:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:66 -> a
+    85:85:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:66 -> a
+    86:86:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":304,"2":305,"3":306}}
+    304:304:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):70:70 -> a
+    305:305:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):70:70 -> a
+    306:306:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):70:70 -> a
+    158:158:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):72:72 -> a
+    159:165:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):67:73 -> a
+    166:166:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
+    167:167:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
+    167:167:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56 -> a
+    168:168:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
+    169:169:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":307,"2":308,"3":309}}
+    307:307:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
+    308:308:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
+    309:309:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
+    225:225:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
+    226:226:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":313,"2":314,"3":315}}
+    313:313:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):60:60 -> a
+    314:314:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):60:60 -> a
+    315:315:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):60:60 -> a
+    288:288:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):62:62 -> a
+    289:295:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):57:63 -> a
+    316:317:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):78:79 -> a
+    318:325:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.getFlavour(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin):109:116 -> a
+    318:325:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):80 -> a
+    326:330:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):85:89 -> a
+    331:333:java.util.Map com.android.tools.r8.kotlin.KotlinClassMetadataReader.toElementMap(com.android.tools.r8.graph.DexEncodedAnnotation):117:119 -> a
+    331:333:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):89 -> a
+    334:338:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):147:151 -> a
+    334:338:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):90 -> a
+    339:344:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):91:96 -> a
+    345:349:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):147:151 -> a
+    345:349:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):97 -> a
+    350:350:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):96:96 -> a
+    351:351:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):149:149 -> a
+    351:351:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):97 -> a
+    352:352:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):149:149 -> a
+    352:352:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):90 -> a
+    353:355:java.util.Map com.android.tools.r8.kotlin.KotlinClassMetadataReader.toElementMap(com.android.tools.r8.graph.DexEncodedAnnotation):117:119 -> a
+    353:355:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):112 -> a
+    356:356:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):112:112 -> a
+    357:361:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):147:151 -> a
+    357:361:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):126 -> a
+    362:377:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):127:142 -> a
+    378:381:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):322:322 -> a
+    378:381:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    378:381:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
+    384:394:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):325:335 -> a
+    384:394:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    384:394:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
+    395:395:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):334:334 -> a
+    395:395:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    395:395:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
+    396:396:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):333:333 -> a
     396:396:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
     396:396:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
-    397:397:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):149:149 -> a
-    397:397:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):126 -> a
-    398:415:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):160:177 -> a
-    416:436:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):176:196 -> a
-    437:437:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":634,"2":635,"3":636}}
-    634:634:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):196:196 -> a
-    635:635:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):196:196 -> a
-    636:636:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):196:196 -> a
-    633:633:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):196:196 -> a
-    637:637:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):201:201 -> a
-    638:638:boolean com.android.tools.r8.graph.DexValue.isDexValueArray():0:0 -> a
-    638:638:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):201 -> a
-    639:643:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):204:208 -> a
-    644:644:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):202:202 -> a
+    397:397:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):332:332 -> a
+    397:397:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    397:397:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
+    398:398:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):331:331 -> a
+    398:398:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    398:398:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
+    399:409:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):330:340 -> a
+    399:409:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    399:409:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
+    410:410:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):338:338 -> a
+    410:410:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    410:410:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):143 -> a
+    411:411:int com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):149:149 -> a
+    411:411:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):126 -> a
+    412:429:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):160:177 -> a
+    430:450:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):176:196 -> a
+    451:451:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":648,"2":649,"3":650}}
+    648:648:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):196:196 -> a
+    649:649:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):196:196 -> a
+    650:650:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):196:196 -> a
+    647:647:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):196:196 -> a
+    651:651:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):201:201 -> a
+    652:652:boolean com.android.tools.r8.graph.DexValue.isDexValueArray():0:0 -> a
+    652:652:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):201 -> a
+    653:657:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):204:208 -> a
+    658:658:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):202:202 -> a
     1:4:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):227:230 -> b
     5:5:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):228:228 -> b
     1:1:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):214:214 -> c
@@ -91086,40 +90027,14 @@
     2:2:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):214 -> c
     3:7:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):217:221 -> c
     8:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):215:215 -> c
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$1 -> com.android.tools.r8.internal.zz:
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.Az:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.Py:
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassMetadataReader$1):233:233 -> <init>
     2:2:void <init>(java.lang.String):235:235 -> <init>
-com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.Iz:
+com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.Wy:
     1:1:void <init>():24:24 -> <init>
     boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
     com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens) -> a
-    1:9:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):28:36 -> a
-    10:13:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):35:38 -> a
-    14:14:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinTypeReference.fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory):60:60 -> a
-    14:14:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):39 -> a
-    15:24:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):39:48 -> a
-    25:26:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):53:54 -> a
-    25:26:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
-    27:27:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":31,"2":32,"3":33,"4":34,"5":35,"6":36}}
-    31:31:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
-    31:31:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
-    32:32:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
-    32:32:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
-    33:33:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
-    33:33:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
-    34:34:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
-    34:34:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
-    35:35:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
-    35:35:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
-    36:36:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
-    36:36:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
-    28:28:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
-    28:28:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
-    29:30:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48:49 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.internal.Cz:
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.Dz:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.Ry:
     boolean isLocalOrAnonymous -> b
     com.android.tools.r8.kotlin.KotlinTypeReference type -> a
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,boolean,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):59:59 -> <init>
@@ -91139,38 +90054,38 @@
     7:7:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,java.lang.String):73:73 -> a
     11:11:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:83 -> a
     12:12:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):88:88 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.Ez:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.Sy:
     java.lang.String typeAlias -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):112:112 -> <init>
     2:3:void <init>(java.lang.String):116:117 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):122:122 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.Fz:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.Ty:
     int typeId -> a
     1:1:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):92:92 -> <init>
     2:3:void <init>(int):96:97 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):102:102 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.Gz:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.Uy:
     java.lang.String classifier -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):132:132 -> <init>
     2:3:void <init>(java.lang.String):135:136 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):141:141 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.Hz:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.Vy:
     java.lang.String classifier -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):151:151 -> <init>
     2:3:void <init>(java.lang.String):154:155 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):160:160 -> a
-com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.Jz:
+com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.Xy:
     java.lang.String companionObjectFieldName -> a
     1:2:void <init>(java.lang.String):18:19 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:4:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):33:36 -> a
     boolean isCompanion() -> d
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> e
-com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.Kz:
+com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.Yy:
     java.util.List valueParameters -> b
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> c
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> d
@@ -91190,7 +90105,7 @@
     31:33:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):94:96 -> a
     boolean isConstructor() -> g
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> h
-com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.Lz:
+com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.Zy:
     java.util.List effects -> a
     com.android.tools.r8.kotlin.KotlinContractInfo NO_EFFECT -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -91202,7 +90117,7 @@
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectInfo):49:49 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):49:49 -> a
     19:27:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):56:64 -> a
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.Nz:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.bz:
     java.util.List functionsWithNoBacking -> b
     java.util.List typeAliases -> a
     java.util.List propertiesWithNoBacking -> c
@@ -91251,7 +90166,7 @@
     171:171:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinFunctionInfo):255:255 -> a
     1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):222:222 -> b
     1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinPropertyInfo):256:256 -> c
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.Mz:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.az:
     com.android.tools.r8.graph.DexEncodedField backingField -> a
     com.android.tools.r8.graph.DexEncodedMethod getter -> c
     com.android.tools.r8.graph.DexEncodedMethod setter -> b
@@ -91264,7 +90179,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$100(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):259:259 -> b
     2:3:void setSetter(com.android.tools.r8.graph.DexEncodedMethod):276:277 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$200(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):259:259 -> c
-com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.Oz:
+com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.cz:
     java.util.List orArguments -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo isInstanceType -> d
     java.util.List andArguments -> e
@@ -91281,7 +90196,7 @@
     26:26:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):84:84 -> a
     27:45:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90:108 -> a
     1:1:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):85:85 -> b
-com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.Pz:
+com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.dz:
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo conclusion -> d
     java.util.List constructorArguments -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind invocationKind -> b
@@ -91290,8 +90205,8 @@
     1:1:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):50:50 -> a
     2:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):50:51 -> a
     4:13:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):56:65 -> a
-com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.Qz:
-com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.Rz:
+com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.ez:
+com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.fz:
     int[] metadataVersion -> c
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> a
     java.lang.String packageName -> b
@@ -91302,18 +90217,18 @@
     14:14:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82:82 -> a
     1:1:java.lang.String getPackageName():72:72 -> j
     1:1:int[] getMetadataVersion():77:77 -> m
-com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.Sz:
-    java.lang.String typeFlexibilityId -> i
-    com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo NO_FLEXIBLE_UPPER_BOUND -> j
-    boolean $assertionsDisabled -> k
-    1:4:void <clinit>():17:20 -> <clinit>
-    1:10:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo,java.lang.String):35:44 -> <init>
-    1:12:com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):50:61 -> a
-    13:15:com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60:62 -> a
-    16:20:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69:73 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,int):74:74 -> a
-    22:25:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):79:82 -> a
-com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.Tz:
+com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.gz:
+    com.android.tools.r8.kotlin.KotlinTypeInfo kotlinTypeInfo -> b
+    java.lang.String typeFlexibilityId -> a
+    com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo NO_FLEXIBLE_UPPER_BOUND -> c
+    boolean $assertionsDisabled -> d
+    1:4:void <clinit>():15:18 -> <clinit>
+    1:4:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo):25:28 -> <init>
+    1:5:com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):34:38 -> a
+    6:14:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):45:53 -> a
+    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,int):54:54 -> a
+    16:23:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):59:66 -> a
+com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.hz:
     com.android.tools.r8.kotlin.KotlinTypeReference lambdaClassOrigin -> h
     com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> e
     java.util.List typeParameters -> f
@@ -91354,7 +90269,7 @@
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> b
     boolean isFunction() -> i
     1:1:boolean hasCrossInlineParameter():72:72 -> n
-com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.Uz:
+com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.iz:
     java.lang.String name -> b
     com.android.tools.r8.kotlin.KotlinTypeReference type -> a
     1:3:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinTypeReference):26:28 -> <init>
@@ -91364,7 +90279,7 @@
     5:5:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):38:38 -> a
     6:19:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):47:60 -> a
     20:20:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):66:66 -> a
-com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.Vz:
+com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.jz:
     java.util.List EMPTY_PARAMETERS_LIST -> e
     java.util.List parameters -> c
     boolean $assertionsDisabled -> f
@@ -91400,7 +90315,7 @@
     128:128:java.lang.String toString():112:112 -> toString
     129:129:java.lang.String toString():112:112 -> toString
     117:126:java.lang.String toString():114:123 -> toString
-com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation -> com.android.tools.r8.internal.Yz:
+com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation -> com.android.tools.r8.internal.lz:
     java.util.Set noExtensionIndicesForFunctions -> a
     java.util.Set noExtensionIndicesForConstructors -> b
     com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation EMPTY -> c
@@ -91471,8 +90386,7 @@
     65:65:com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation readInformationFromMessage(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.utils.InternalOptions):91 -> a
     66:66:boolean hasJvmMethodSignatureExtensionForConstructor(int):121:121 -> a
     1:1:boolean hasJvmMethodSignatureExtensionForFunction(int):117:117 -> b
-com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$1 -> com.android.tools.r8.internal.Wz:
-com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$KotlinJvmSignatureExtensionInformationBuilder -> com.android.tools.r8.internal.Xz:
+com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$KotlinJvmSignatureExtensionInformationBuilder -> com.android.tools.r8.internal.kz:
     java.util.Set noExtensionIndicesForFunctions -> a
     java.util.Set noExtensionIndicesForConstructors -> b
     1:4:void <init>():132:135 -> <init>
@@ -91487,7 +90401,7 @@
     7:7:void visitConstructors(java.util.List):166:166 -> a
     8:9:void lambda$visitConstructors$0(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,int):169:170 -> a
     1:1:void visitFunctions(java.util.List):154:154 -> b
-com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.Zz:
+com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.mz:
     boolean hasBacking -> b
     com.android.tools.r8.kotlin.KotlinFunctionInfo function -> a
     boolean $assertionsDisabled -> c
@@ -91505,7 +90419,7 @@
     16:23:com.android.tools.r8.kotlin.KotlinLambdaInfo create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):50:57 -> a
     24:35:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):65:76 -> a
     36:36:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):81:81 -> a
-com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.aA:
+com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.nz:
     java.util.List propertyInfos -> a
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo EMPTY_DELEGATED_PROPERTIES -> b
     boolean $assertionsDisabled -> c
@@ -91516,7 +90430,7 @@
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):52:52 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):52:52 -> a
     19:20:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):58:59 -> a
-com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.internal.bA:
+com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.internal.oz:
     boolean isNoKotlinInformation() -> a
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> b
     boolean isProperty() -> c
@@ -91526,7 +90440,7 @@
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> h
     boolean isFunction() -> i
     com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> k
-com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.cA:
+com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.pz:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     java.lang.String message -> d
@@ -91534,7 +90448,7 @@
     1:1:java.lang.String getDiagnosticMessage():38:38 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():28:28 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():33:33 -> getPosition
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.fA:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.rz:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set prunedTypes -> c
@@ -91552,37 +90466,42 @@
     46:46:void done(com.android.tools.r8.shaking.Enqueuer):94 -> a
     47:79:void done(com.android.tools.r8.shaking.Enqueuer):98:130 -> a
     80:83:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):66:69 -> a
-    84:86:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):61:63 -> a
-    84:86:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):69 -> a
-    87:98:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):70:81 -> a
-    99:100:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):41:42 -> a
-    99:100:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):81 -> a
-    101:106:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):80:85 -> a
-    107:108:boolean lambda$done$0(com.android.tools.r8.graph.DexAnnotation):77:78 -> a
-    109:109:void lambda$done$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):82:82 -> a
-    110:110:void lambda$done$3(java.util.Set,com.android.tools.r8.graph.ProgramMethod):104:104 -> a
-    111:112:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):113:114 -> a
-    113:115:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):61:63 -> a
-    113:115:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):114 -> a
-    116:125:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):115:124 -> a
-    126:126:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension.definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):48:48 -> a
-    126:126:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):124 -> a
-    127:127:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):124:124 -> a
-    128:129:boolean com.android.tools.r8.kotlin.KotlinClassMetadataReader.hasKotlinClassMetadataAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):105:106 -> a
-    128:129:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):124 -> a
-    130:130:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):125:125 -> a
-    131:131:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):124:124 -> a
-    132:132:void lambda$done$7(com.android.tools.r8.graph.DexProgramClass) -> a
-    133:133:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension.definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):48:48 -> a
-    133:133:void lambda$done$7(com.android.tools.r8.graph.DexProgramClass):132 -> a
-    134:135:void lambda$done$7(com.android.tools.r8.graph.DexProgramClass):132:133 -> a
-    136:136:void lambda$done$6(com.android.tools.r8.graph.ProgramMember):135:135 -> a
-    137:137:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension.definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):48:48 -> a
-    137:137:void lambda$done$6(com.android.tools.r8.graph.ProgramMember):135 -> a
+    84:84:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):61:61 -> a
+    84:84:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):69 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    85:86:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):62:63 -> a
+    85:86:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):69 -> a
+    87:99:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):69:81 -> a
+    100:101:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):41:42 -> a
+    100:101:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):81 -> a
+    102:107:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):80:85 -> a
+    108:109:boolean lambda$done$0(com.android.tools.r8.graph.DexAnnotation):77:78 -> a
+    110:110:void lambda$done$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):82:82 -> a
+    111:111:void lambda$done$3(java.util.Set,com.android.tools.r8.graph.ProgramMethod):104:104 -> a
+    112:113:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):113:114 -> a
+    114:114:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):61:61 -> a
+    114:114:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):114 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    115:116:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):62:63 -> a
+    115:116:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):114 -> a
+    117:127:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):114:124 -> a
+    128:128:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension.definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):48:48 -> a
+    128:128:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):124 -> a
+    129:129:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):124:124 -> a
+    130:131:boolean com.android.tools.r8.kotlin.KotlinClassMetadataReader.hasKotlinClassMetadataAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):105:106 -> a
+    130:131:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):124 -> a
+    132:132:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):125:125 -> a
+    133:133:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):124:124 -> a
+    134:134:void lambda$done$7(com.android.tools.r8.graph.DexProgramClass):132:132 -> a
+    135:135:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension.definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):48:48 -> a
+    135:135:void lambda$done$7(com.android.tools.r8.graph.DexProgramClass):132 -> a
+    136:137:void lambda$done$7(com.android.tools.r8.graph.DexProgramClass):132:133 -> a
     138:138:void lambda$done$6(com.android.tools.r8.graph.ProgramMember):135:135 -> a
+    139:139:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension.definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):48:48 -> a
+    139:139:void lambda$done$6(com.android.tools.r8.graph.ProgramMember):135 -> a
+    140:140:void lambda$done$6(com.android.tools.r8.graph.ProgramMember):135:135 -> a
     1:2:boolean lambda$done$4(com.android.tools.r8.graph.DexAnnotation):119:120 -> b
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1 -> com.android.tools.r8.internal.dA:
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.eA:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.qz:
     java.util.Set prunedTypes -> c
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> b
     com.android.tools.r8.graph.ProgramDefinition context -> a
@@ -91591,7 +90510,7 @@
     2:5:void <init>(com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier,java.util.Set):148:151 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():167:167 -> a
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):159:162 -> c
-com.android.tools.r8.kotlin.KotlinMetadataMembersTracker -> com.android.tools.r8.internal.gA:
+com.android.tools.r8.kotlin.KotlinMetadataMembersTracker -> com.android.tools.r8.internal.sz:
     java.util.Set references -> b
     boolean $assertionsDisabled -> c
     int count -> a
@@ -91606,7 +90525,7 @@
     26:26:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
     26:26:boolean com.android.tools.r8.kotlin.KotlinMetadataMembersTracker.isKotlinJvmType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):63 -> a
     26:26:boolean lambda$isEqual$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):54 -> a
-com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.jA:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.uz:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens lens -> b
@@ -91712,12 +90631,11 @@
     226:233:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):263:270 -> a
     234:243:int[] getMaxVersion(int[],int[]):291:300 -> a
     1:1:void runForR8(java.util.concurrent.ExecutorService):90:90 -> b
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):387:387 -> b
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):391:391 -> b
     2:2:void runForR8(java.util.concurrent.ExecutorService):90 -> b
     3:15:void runForR8(java.util.concurrent.ExecutorService):91:103 -> b
     16:16:void runForR8(java.util.concurrent.ExecutorService):102:102 -> b
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$1 -> com.android.tools.r8.internal.hA:
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.iA:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.tz:
     boolean writeData2 -> e
     boolean writeExtraString -> f
     boolean writePackageName -> g
@@ -91730,7 +90648,7 @@
     2:10:void <init>(boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean):57:65 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo.rewriteAll():69:69 -> a
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo access$100():39 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.pA:
+com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.zz:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo NO_KOTLIN_INFO -> a
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo INVALID_KOTLIN_INFO -> b
     1:2:void <clinit>():36:37 -> <clinit>
@@ -91750,8 +90668,7 @@
     118:118:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):199 -> a
     119:129:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):202:212 -> a
     1:1:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo getNoKotlinInfo():81:81 -> b
-com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.kA:
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.nA:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.xz:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature -> c
@@ -91766,17 +90683,17 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature():150:150 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$300(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):112:112 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature():154:154 -> c
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.mA:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.wz:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):120:120 -> <init>
     1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):123:126 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.lA:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.vz:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 this$1 -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():126:126 -> <clinit>
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1):126:126 -> <init>
     1:6:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):133:138 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.oA:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.yz:
     java.lang.String name -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinMetadataUtils$1):39:39 -> <init>
     2:3:void <init>(java.lang.String):44:45 -> <init>
@@ -91786,7 +90703,7 @@
     1:1:java.lang.String getPackageName():61:61 -> j
     1:1:int[] getMetadataVersion():66:66 -> m
     1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.qA:
+com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.Az:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
     1:122:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:121 -> a
@@ -91815,164 +90732,163 @@
     136:136:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):297 -> a
     137:137:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):297:297 -> a
     138:138:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):293:293 -> a
-    139:143:void writeKotlinMetadataAnnotation(java.lang.String,com.android.tools.r8.graph.DexAnnotation,java.io.PrintStream,com.android.tools.r8.kotlin.Kotlin):53:57 -> a
-    144:151:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):63:70 -> a
-    152:154:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataWriter.kotlinMultiFileClassFacadeMetadataString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.lang.String):111:113 -> a
-    152:154:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):70 -> a
-    155:162:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):72:79 -> a
-    163:171:java.lang.String kotlinClassMetadataToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String):85:93 -> a
-    172:172:void lambda$kotlinClassMetadataToString$0(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String):91:91 -> a
-    173:181:java.lang.String kotlinFileFacadeMetadataToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String):98:106 -> a
-    182:182:void lambda$kotlinFileFacadeMetadataToString$1(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String):104:104 -> a
-    183:193:java.lang.String kotlinMultiFileClassPartToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):119:129 -> a
-    194:194:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):125:125 -> a
-    195:195:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():257:257 -> a
-    195:195:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):126 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    196:198:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):125:127 -> a
-    199:222:java.lang.String kotlinSyntheticClassToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String):134:157 -> a
-    223:236:void lambda$kotlinSyntheticClassToString$4(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.StringBuilder,java.lang.String):141:154 -> a
-    237:237:void lambda$kotlinSyntheticClassToString$3(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda,java.lang.String):148:148 -> a
-    238:242:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):184:188 -> a
-    243:243:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":436,"2":437,"3":438}}
-    436:436:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):188:188 -> a
-    437:437:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):188:188 -> a
-    438:438:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):188:188 -> a
-    431:431:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):188:188 -> a
-    432:435:void com.android.tools.r8.kotlin.KotlinMetadataWriter.appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):162:165 -> a
-    432:435:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):188 -> a
-    439:442:void lambda$appendKmList$6(java.util.Collection,java.lang.StringBuilder,java.lang.String,java.util.function.BiConsumer):192:195 -> a
-    443:444:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):204:205 -> a
-    445:445:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":655,"2":656,"3":657}}
-    655:655:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):205:205 -> a
-    656:656:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):205:205 -> a
-    657:657:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):205:205 -> a
-    650:650:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):205:205 -> a
-    651:654:void com.android.tools.r8.kotlin.KotlinMetadataWriter.appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):162:165 -> a
-    651:654:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):205 -> a
-    658:658:void lambda$appendKeyValue$7(java.util.function.Consumer,java.lang.String):205:205 -> a
-    659:660:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):209:210 -> a
-    661:661:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":876,"2":877,"3":878}}
-    876:876:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):210:210 -> a
-    877:877:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):210:210 -> a
-    878:878:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):210:210 -> a
-    871:871:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):210:210 -> a
-    872:875:void com.android.tools.r8.kotlin.KotlinMetadataWriter.appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):162:165 -> a
-    872:875:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):210 -> a
-    879:879:void lambda$appendKeyValue$8(java.lang.StringBuilder,java.lang.String):210:210 -> a
-    880:932:void appendKmDeclarationContainer(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):215:267 -> a
-    933:935:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):224:226 -> a
-    936:939:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):225:228 -> a
-    940:940:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):220:220 -> a
-    941:941:void lambda$appendKmDeclarationContainer$10(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):230:230 -> a
-    942:942:void lambda$appendKmDeclarationContainer$15(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):280:280 -> a
-    943:943:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):286:286 -> a
-    944:944:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
-    944:944:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
-    945:945:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):16:16 -> a
-    945:945:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):69 -> a
-    945:945:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
-    946:946:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):69:69 -> a
-    946:946:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
-    947:948:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287:288 -> a
-    949:950:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):305:306 -> a
-    951:951:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
-    951:951:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):48 -> a
-    951:951:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306 -> a
-    952:952:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):48:48 -> a
-    952:952:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306 -> a
-    953:981:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306:334 -> a
-    982:997:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):330:345 -> a
-    998:998:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1405,"2":1406,"3":1407}}
-    1405:1405:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
-    1406:1406:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
-    1407:1407:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
-    1345:1345:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):347:347 -> a
-    1346:1349:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:349 -> a
-    1350:1356:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):348:354 -> a
-    1357:1363:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):350:356 -> a
-    1364:1364:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):355:355 -> a
-    1365:1365:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
-    1365:1365:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):39 -> a
-    1365:1365:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):361 -> a
-    1366:1366:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):39:39 -> a
-    1366:1366:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):361 -> a
-    1367:1367:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):357:357 -> a
-    1368:1368:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
-    1368:1368:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):29 -> a
-    1368:1368:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362 -> a
-    1369:1369:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):29:29 -> a
-    1369:1369:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362 -> a
-    1370:1404:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362:396 -> a
-    1408:1408:void lambda$appendKmClass$19(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):313:313 -> a
-    1409:1409:void lambda$appendKmClass$20(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):326:326 -> a
-    1410:1410:void lambda$appendKmClass$23(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):374:374 -> a
-    1411:1411:java.lang.String lambda$appendKmClass$25(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):390:390 -> a
-    1412:1412:void lambda$appendKmClass$26(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):393:393 -> a
-    1413:1413:void appendKmConstructor(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):401:401 -> a
-    1414:1414:void lambda$appendKmConstructor$28(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):412:412 -> a
-    1415:1415:void appendKmFunction(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):421:421 -> a
-    1416:1416:void lambda$appendKmFunction$30(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):432:432 -> a
-    1417:1417:void appendKmProperty(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):473:473 -> a
-    1418:1418:void lambda$appendKmProperty$36(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):484:484 -> a
-    1419:1422:void appendKmType(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):543:546 -> a
-    1423:1423:void lambda$appendKmType$42(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):562:562 -> a
-    1424:1424:void lambda$appendKmType$42(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):558:558 -> a
-    1425:1425:void lambda$appendKmType$41(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):564:564 -> a
-    1426:1426:void lambda$appendKmType$43(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):571:571 -> a
-    1427:1427:void lambda$appendKmType$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):584:584 -> a
-    1428:1428:void lambda$appendKmType$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):600:600 -> a
-    1429:1429:void lambda$appendKmType$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):599:599 -> a
-    1430:1430:void lambda$appendKmType$48(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):616:616 -> a
-    1431:1431:void appendKmTypeProjection(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):624:624 -> a
-    1432:1432:void lambda$appendKmTypeProjection$51(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):634:634 -> a
-    1433:1433:void lambda$appendValueParameters$53(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):650:650 -> a
-    1434:1437:void appendValueParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):657:660 -> a
-    1438:1438:void lambda$appendValueParameter$54(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):672:672 -> a
-    1439:1439:void appendTypeParameters(java.lang.String,java.lang.StringBuilder,java.util.List):686:686 -> a
-    1440:1440:void lambda$appendTypeParameters$57(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):692:692 -> a
-    1441:1441:void appendTypeParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):698:698 -> a
-    1442:1442:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):716:716 -> a
-    1443:1443:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):712:712 -> a
-    1444:1444:void appendTypeAlias(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):739:739 -> a
-    1445:1445:void lambda$appendTypeAlias$64(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):753:753 -> a
-    1446:1446:void lambda$appendTypeAlias$64(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):749:749 -> a
-    1447:1447:void appendKmAnnotation(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):787:787 -> a
-    1448:1449:void lambda$appendKmAnnotation$73(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.String):792:793 -> a
-    1450:1455:void lambda$appendKmAnnotation$72(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):798:803 -> a
-    1456:1456:void lambda$appendKmAnnotation$72(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):799:799 -> a
-    1457:1457:void lambda$appendKmAnnotation$71(java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):805:805 -> a
-    1458:1458:void lambda$appendKmAnnotation$70(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String):810:810 -> a
-    1459:1459:void lambda$appendKmAnnotation$69(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):815:815 -> a
-    1460:1471:void appendKmArgument(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):825:836 -> a
-    1472:1472:void lambda$appendKmArgument$74(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):833:833 -> a
-    1473:1473:void appendKmVersionRequirement(java.lang.String,java.lang.StringBuilder,java.util.List):842:842 -> a
-    1474:1474:void lambda$appendKmVersionRequirement$77(java.lang.StringBuilder,java.util.List,java.lang.String):847:847 -> a
-    1475:1475:void lambda$appendKmVersionRequirement$76(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):853:853 -> a
-    1476:1478:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):858:860 -> a
-    1479:1487:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):859:867 -> a
-    1488:1496:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):861:869 -> a
-    1497:1497:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):868:868 -> a
-    1498:1498:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():801:801 -> a
-    1498:1498:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874 -> a
-    1499:1499:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874:874 -> a
-    1500:1500:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):870:870 -> a
-    1501:1501:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():801:801 -> a
-    1501:1501:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874 -> a
-    1502:1502:void appendKmContract(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract):881:881 -> a
-    1503:1503:void lambda$appendKmContract$79(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):895:895 -> a
-    1504:1504:void lambda$appendKmContract$79(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):891:891 -> a
-    1505:1505:void lambda$appendKmContract$78(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):896:896 -> a
-    1506:1506:void appendKmEffect(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):901:901 -> a
-    1507:1507:void lambda$appendKmEffect$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):921:921 -> a
-    1508:1508:void lambda$appendKmEffect$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):917:917 -> a
-    1509:1509:void lambda$appendKmEffect$81(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):923:923 -> a
-    1510:1510:void lambda$appendKmEffect$83(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):934:934 -> a
-    1511:1511:void appendKmEffectExpression(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):941:941 -> a
+    139:196:void writeKotlinMetadataAnnotation(java.lang.String,com.android.tools.r8.graph.DexAnnotation,java.io.PrintStream,com.android.tools.r8.kotlin.Kotlin):0:57 -> a
+    197:204:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):63:70 -> a
+    205:207:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataWriter.kotlinMultiFileClassFacadeMetadataString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.lang.String):111:113 -> a
+    205:207:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):70 -> a
+    208:215:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):72:79 -> a
+    216:224:java.lang.String kotlinClassMetadataToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String):85:93 -> a
+    225:225:void lambda$kotlinClassMetadataToString$0(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String):91:91 -> a
+    226:234:java.lang.String kotlinFileFacadeMetadataToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String):98:106 -> a
+    235:235:void lambda$kotlinFileFacadeMetadataToString$1(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String):104:104 -> a
+    236:246:java.lang.String kotlinMultiFileClassPartToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):119:129 -> a
+    247:248:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):125:126 -> a
+    249:249:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():257:257 -> a
+    249:249:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):126 -> a
+    250:252:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):125:127 -> a
+    253:276:java.lang.String kotlinSyntheticClassToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String):134:157 -> a
+    277:290:void lambda$kotlinSyntheticClassToString$4(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.StringBuilder,java.lang.String):141:154 -> a
+    291:291:void lambda$kotlinSyntheticClassToString$3(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda,java.lang.String):148:148 -> a
+    292:296:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):184:188 -> a
+    297:297:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":490,"2":491,"3":492}}
+    490:490:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):188:188 -> a
+    491:491:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):188:188 -> a
+    492:492:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):188:188 -> a
+    485:485:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):188:188 -> a
+    486:489:void com.android.tools.r8.kotlin.KotlinMetadataWriter.appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):162:165 -> a
+    486:489:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):188 -> a
+    493:496:void lambda$appendKmList$6(java.util.Collection,java.lang.StringBuilder,java.lang.String,java.util.function.BiConsumer):192:195 -> a
+    497:498:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):204:205 -> a
+    499:499:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":709,"2":710,"3":711}}
+    709:709:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):205:205 -> a
+    710:710:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):205:205 -> a
+    711:711:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):205:205 -> a
+    704:704:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):205:205 -> a
+    705:708:void com.android.tools.r8.kotlin.KotlinMetadataWriter.appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):162:165 -> a
+    705:708:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):205 -> a
+    712:712:void lambda$appendKeyValue$7(java.util.function.Consumer,java.lang.String):205:205 -> a
+    713:714:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):209:210 -> a
+    715:715:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":930,"2":931,"3":932}}
+    930:930:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):210:210 -> a
+    931:931:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):210:210 -> a
+    932:932:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):210:210 -> a
+    925:925:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):210:210 -> a
+    926:929:void com.android.tools.r8.kotlin.KotlinMetadataWriter.appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):162:165 -> a
+    926:929:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):210 -> a
+    933:933:void lambda$appendKeyValue$8(java.lang.StringBuilder,java.lang.String):210:210 -> a
+    934:986:void appendKmDeclarationContainer(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):215:267 -> a
+    987:989:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):224:226 -> a
+    990:993:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):225:228 -> a
+    994:994:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):220:220 -> a
+    995:995:void lambda$appendKmDeclarationContainer$10(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):230:230 -> a
+    996:996:void lambda$appendKmDeclarationContainer$15(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):280:280 -> a
+    997:997:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):286:286 -> a
+    998:998:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
+    998:998:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
+    999:999:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):16:16 -> a
+    999:999:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):69 -> a
+    999:999:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
+    1000:1000:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):69:69 -> a
+    1000:1000:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
+    1001:1002:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287:288 -> a
+    1003:1004:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):305:306 -> a
+    1005:1005:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
+    1005:1005:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):48 -> a
+    1005:1005:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306 -> a
+    1006:1006:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):48:48 -> a
+    1006:1006:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306 -> a
+    1007:1035:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306:334 -> a
+    1036:1051:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):330:345 -> a
+    1052:1052:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1459,"2":1460,"3":1461}}
+    1459:1459:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
+    1460:1460:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
+    1461:1461:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
+    1399:1399:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):347:347 -> a
+    1400:1403:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:349 -> a
+    1404:1410:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):348:354 -> a
+    1411:1417:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):350:356 -> a
+    1418:1418:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):355:355 -> a
+    1419:1419:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
+    1419:1419:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):39 -> a
+    1419:1419:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):361 -> a
+    1420:1420:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):39:39 -> a
+    1420:1420:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):361 -> a
+    1421:1421:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):357:357 -> a
+    1422:1422:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
+    1422:1422:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):29 -> a
+    1422:1422:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362 -> a
+    1423:1423:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):29:29 -> a
+    1423:1423:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362 -> a
+    1424:1458:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362:396 -> a
+    1462:1462:void lambda$appendKmClass$19(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):313:313 -> a
+    1463:1463:void lambda$appendKmClass$20(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):326:326 -> a
+    1464:1464:void lambda$appendKmClass$23(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):374:374 -> a
+    1465:1465:java.lang.String lambda$appendKmClass$25(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):390:390 -> a
+    1466:1466:void lambda$appendKmClass$26(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):393:393 -> a
+    1467:1467:void appendKmConstructor(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):401:401 -> a
+    1468:1468:void lambda$appendKmConstructor$28(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):412:412 -> a
+    1469:1469:void appendKmFunction(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):421:421 -> a
+    1470:1470:void lambda$appendKmFunction$30(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):432:432 -> a
+    1471:1471:void appendKmProperty(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):473:473 -> a
+    1472:1472:void lambda$appendKmProperty$36(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):484:484 -> a
+    1473:1476:void appendKmType(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):543:546 -> a
+    1477:1477:void lambda$appendKmType$42(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):562:562 -> a
+    1478:1478:void lambda$appendKmType$42(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):558:558 -> a
+    1479:1479:void lambda$appendKmType$41(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):564:564 -> a
+    1480:1480:void lambda$appendKmType$43(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):571:571 -> a
+    1481:1481:void lambda$appendKmType$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):584:584 -> a
+    1482:1482:void lambda$appendKmType$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):600:600 -> a
+    1483:1483:void lambda$appendKmType$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):599:599 -> a
+    1484:1484:void lambda$appendKmType$48(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):616:616 -> a
+    1485:1485:void appendKmTypeProjection(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):624:624 -> a
+    1486:1486:void lambda$appendKmTypeProjection$51(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):634:634 -> a
+    1487:1487:void lambda$appendValueParameters$53(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):650:650 -> a
+    1488:1491:void appendValueParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):657:660 -> a
+    1492:1492:void lambda$appendValueParameter$54(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):672:672 -> a
+    1493:1493:void appendTypeParameters(java.lang.String,java.lang.StringBuilder,java.util.List):686:686 -> a
+    1494:1494:void lambda$appendTypeParameters$57(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):692:692 -> a
+    1495:1495:void appendTypeParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):698:698 -> a
+    1496:1496:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):716:716 -> a
+    1497:1497:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):712:712 -> a
+    1498:1498:void appendTypeAlias(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):739:739 -> a
+    1499:1499:void lambda$appendTypeAlias$64(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):753:753 -> a
+    1500:1500:void lambda$appendTypeAlias$64(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):749:749 -> a
+    1501:1501:void appendKmAnnotation(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):787:787 -> a
+    1502:1503:void lambda$appendKmAnnotation$73(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.String):792:793 -> a
+    1504:1509:void lambda$appendKmAnnotation$72(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):798:803 -> a
+    1510:1510:void lambda$appendKmAnnotation$72(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):799:799 -> a
+    1511:1511:void lambda$appendKmAnnotation$71(java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):805:805 -> a
+    1512:1512:void lambda$appendKmAnnotation$70(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String):810:810 -> a
+    1513:1513:void lambda$appendKmAnnotation$69(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):815:815 -> a
+    1514:1525:void appendKmArgument(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):825:836 -> a
+    1526:1526:void lambda$appendKmArgument$74(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):833:833 -> a
+    1527:1527:void appendKmVersionRequirement(java.lang.String,java.lang.StringBuilder,java.util.List):842:842 -> a
+    1528:1528:void lambda$appendKmVersionRequirement$77(java.lang.StringBuilder,java.util.List,java.lang.String):847:847 -> a
+    1529:1529:void lambda$appendKmVersionRequirement$76(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):853:853 -> a
+    1530:1532:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):858:860 -> a
+    1533:1541:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):859:867 -> a
+    1542:1550:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):861:869 -> a
+    1551:1551:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):868:868 -> a
+    1552:1552:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():801:801 -> a
+    1552:1552:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874 -> a
+    1553:1553:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874:874 -> a
+    1554:1554:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):870:870 -> a
+    1555:1555:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():801:801 -> a
+    1555:1555:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874 -> a
+    1556:1556:void appendKmContract(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract):881:881 -> a
+    1557:1557:void lambda$appendKmContract$79(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):895:895 -> a
+    1558:1558:void lambda$appendKmContract$79(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):891:891 -> a
+    1559:1559:void lambda$appendKmContract$78(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):896:896 -> a
+    1560:1560:void appendKmEffect(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):901:901 -> a
+    1561:1561:void lambda$appendKmEffect$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):921:921 -> a
+    1562:1562:void lambda$appendKmEffect$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):917:917 -> a
+    1563:1563:void lambda$appendKmEffect$81(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):923:923 -> a
+    1564:1564:void lambda$appendKmEffect$83(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):934:934 -> a
+    1565:1565:void appendKmEffectExpression(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):941:941 -> a
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):0:0 -> b
     1:1:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):730 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):28:28 -> b
@@ -92086,8 +91002,8 @@
     148:155:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):946:953 -> e
     156:169:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):947:960 -> e
     170:198:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):954:982 -> e
-com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.rA:
-com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.sA:
+com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.Bz:
+com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.Cz:
     java.util.List partClassNames -> a
     int[] metadataVersion -> c
     java.lang.String packageName -> b
@@ -92124,7 +91040,7 @@
     376:376:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:92 -> a
     1:1:java.lang.String getPackageName():82:82 -> j
     1:1:int[] getMetadataVersion():87:87 -> m
-com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.tA:
+com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.Dz:
     int[] metadataVersion -> d
     java.lang.String facadeClassName -> a
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
@@ -92139,7 +91055,7 @@
     16:16:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):90:90 -> a
     1:1:java.lang.String getPackageName():80:80 -> j
     1:1:int[] getMetadataVersion():85:85 -> m
-com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.uA:
+com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.Ez:
     com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo containerInfo -> b
     com.android.tools.r8.kotlin.KotlinMetadataMembersTracker originalMembersWithKotlinInfo -> d
     java.lang.String moduleName -> a
@@ -92171,7 +91087,7 @@
     24:24:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):70:70 -> a
     25:42:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):78:95 -> a
     43:44:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):100:101 -> a
-com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.vA:
+com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.Fz:
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForAnnotations -> n
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForDelegate -> o
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> i
@@ -92215,7 +91131,7 @@
     1:1:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo getFieldSignature():131:131 -> n
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getGetterSignature():135:135 -> o
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getSetterSignature():139:139 -> p
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.zA:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.Iz:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():23:23 -> <clinit>
     1:17:java.lang.String parseStratumContents(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):193:209 -> a
@@ -92315,8 +91231,7 @@
     166:197:void lambda$parseStratumContents$2(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder,java.util.List):212 -> b
     198:205:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):288:295 -> b
     198:205:void lambda$parseStratumContents$2(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder,java.util.List):212 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.internal.wA:
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.xA:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.Gz:
     java.io.BufferedReader reader -> b
     java.lang.String readLine -> c
     boolean $assertionsDisabled -> d
@@ -92334,35 +91249,36 @@
     141:141:java.lang.String readUntil(java.util.function.Predicate,int,com.android.tools.r8.utils.ThrowingConsumer):111:111 -> a
     142:142:java.lang.String readUntil(java.util.function.Predicate,int,com.android.tools.r8.utils.ThrowingConsumer):111:111 -> a
     134:137:java.lang.String readUntil(java.util.function.Predicate,int,com.android.tools.r8.utils.ThrowingConsumer):111:114 -> a
-    1:1:boolean com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader.readExpectedLine(java.lang.String):55:55 -> b
-    1:1:void readExpectedLineOrThrow(java.lang.String):60 -> b
-    2:2:void readExpectedLineOrThrow(java.lang.String):61:61 -> b
-    3:3:void readExpectedLineOrThrow(java.lang.String):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":65,"2":66,"3":67}}
-    65:65:void readExpectedLineOrThrow(java.lang.String):61:61 -> b
+    1:1:void readExpectedLineOrThrow(java.lang.String):0:0 -> b
+    2:2:boolean com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader.readExpectedLine(java.lang.String):55:55 -> b
+    2:2:void readExpectedLineOrThrow(java.lang.String):60 -> b
+    3:3:void readExpectedLineOrThrow(java.lang.String):61:61 -> b
+    4:4:void readExpectedLineOrThrow(java.lang.String):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":66,"2":67,"3":68}}
     66:66:void readExpectedLineOrThrow(java.lang.String):61:61 -> b
     67:67:void readExpectedLineOrThrow(java.lang.String):61:61 -> b
-    64:64:void readExpectedLineOrThrow(java.lang.String):61:61 -> b
+    68:68:void readExpectedLineOrThrow(java.lang.String):61:61 -> b
+    65:65:void readExpectedLineOrThrow(java.lang.String):61:61 -> b
     1:1:java.lang.String readNextLine():51:51 -> c
     1:1:void close():119:119 -> close
-    1:2:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):71:72 -> d
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.yA:
+    1:73:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):0:72 -> d
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.Hz:
     1:1:void <init>(java.lang.String):36:36 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.zA$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.Iz$a:
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source source -> a
     com.android.tools.r8.naming.Range range -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source,com.android.tools.r8.naming.Range):355:357 -> <init>
     1:1:com.android.tools.r8.naming.Range getRange():365:365 -> a
     1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():361:361 -> b
     1:10:java.lang.String toString():370:379 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.zA$b:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.Iz$b:
     com.android.tools.r8.utils.SegmentTree inlineePositions -> a
     com.android.tools.r8.utils.SegmentTree calleePositions -> b
     1:3:void <init>(com.android.tools.r8.utils.SegmentTree,com.android.tools.r8.utils.SegmentTree):304:306 -> <init>
     1:1:java.util.Map$Entry lookupCalleePosition(int):314:314 -> a
     2:2:int inlinePositionsCount():318:318 -> a
     1:1:java.util.Map$Entry lookupInlinedPosition(int):310:310 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.zA$c:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.Iz$c:
     java.lang.String fileName -> a
     java.lang.String path -> b
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1):328:328 -> <init>
@@ -92375,11 +91291,11 @@
     3:3:java.lang.String toString():347:347 -> toString
     4:4:java.lang.String toString():347:347 -> toString
     5:5:java.lang.String toString():347:347 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder -> com.android.tools.r8.internal.AA:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder -> com.android.tools.r8.internal.Jz:
     java.util.Map files -> b
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
     1:4:void <init>():322:325 -> <init>
-com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.BA:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.Kz:
     com.android.tools.r8.kotlin.KotlinLambdaInfo lambda -> a
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour flavour -> d
     int[] metadataVersion -> c
@@ -92422,7 +91338,7 @@
     boolean isSyntheticClass() -> l
     1:1:int[] getMetadataVersion():103:103 -> m
     1:1:boolean isLambda():63:63 -> n
-com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.CA:
+com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.Lz:
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo expandedType -> d
     java.util.List typeParameters -> e
@@ -92438,26 +91354,67 @@
     21:24:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82:85 -> a
     25:25:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):84:84 -> a
     26:26:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):85:85 -> a
-com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.DA:
+com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.Mz:
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo flexibleTypeUpperBound -> g
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo outerType -> d
     java.util.List arguments -> e
     com.android.tools.r8.kotlin.KotlinClassifierInfo classifier -> b
     com.android.tools.r8.kotlin.KotlinTypeInfo abbreviatedType -> c
-    java.util.List EMPTY_ARGUMENTS -> h
+    java.util.List EMPTY_ARGUMENTS -> i
+    boolean isRaw -> h
     int flags -> a
     1:1:void <clinit>():28:28 -> <clinit>
-    1:8:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo):45:52 -> <init>
-    1:9:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59:67 -> a
-    10:10:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):66:66 -> a
-    11:18:java.util.List getArguments(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):72:79 -> a
-    19:46:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):87:114 -> a
-    47:56:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):122:131 -> a
-    57:57:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeProjectionInfo):129:129 -> a
-    58:58:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):131:131 -> a
-    59:59:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):135:135 -> a
-com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.EA:
+    1:9:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo,boolean):47:55 -> <init>
+    1:2:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):62:63 -> a
+    3:11:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):28:36 -> a
+    3:11:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    12:15:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):35:38 -> a
+    12:15:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    16:16:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinTypeReference.fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory):60:60 -> a
+    16:16:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):39 -> a
+    16:16:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    17:26:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):39:48 -> a
+    17:26:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    27:28:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):53:54 -> a
+    27:28:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
+    27:28:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    29:29:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":50,"2":51,"3":52,"4":53,"5":54,"6":55}}
+    50:50:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
+    50:50:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
+    50:50:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    51:51:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
+    51:51:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
+    51:51:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    52:52:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
+    52:52:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
+    52:52:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    53:53:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
+    53:53:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
+    53:53:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    54:54:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String) -> a
+    54:54:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
+    54:54:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    55:55:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
+    55:55:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
+    55:55:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    30:30:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):54:54 -> a
+    30:30:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
+    30:30:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    31:32:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48:49 -> a
+    31:32:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    33:35:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):65:67 -> a
+    36:43:java.util.List com.android.tools.r8.kotlin.KotlinTypeInfo.getArguments(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):76:83 -> a
+    36:43:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):67 -> a
+    44:46:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):68:70 -> a
+    47:49:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):69:71 -> a
+    56:85:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):91:120 -> a
+    86:95:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):127:136 -> a
+    96:96:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeProjectionInfo):134:134 -> a
+    97:97:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):136:136 -> a
+    98:98:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):140:140 -> a
+com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.Nz:
     java.util.List annotations -> f
     java.util.List originalUpperBounds -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> d
@@ -92488,7 +91445,7 @@
     41:41:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeInfo):113:113 -> a
     42:43:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):113:114 -> a
     44:44:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):114:114 -> a
-com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.FA:
+com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.Oz:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> a
     com.android.tools.r8.kotlin.KotlinTypeInfo typeInfo -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.kotlin.KotlinTypeInfo):22:24 -> <init>
@@ -92498,7 +91455,7 @@
     5:8:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):44:47 -> a
     9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,int):47:47 -> a
     10:11:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):53:54 -> a
-com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.GA:
+com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.Pz:
     com.android.tools.r8.graph.DexType known -> a
     java.lang.String originalName -> b
     boolean $assertionsDisabled -> c
@@ -92516,12 +91473,12 @@
     15:18:void lambda$toRenamedBinaryNameOrDefault$0(java.lang.String,java.util.function.Consumer,java.lang.String):120:123 -> a
     19:19:void lambda$toRenamedBinaryNameOrDefault$0(java.lang.String,java.util.function.Consumer,java.lang.String):121:121 -> a
     20:30:com.android.tools.r8.graph.DexType toRewrittenTypeOrNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):132:142 -> a
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):387:387 -> a
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):391:391 -> a
     31:31:com.android.tools.r8.graph.DexType toRewrittenTypeOrNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):142 -> a
     32:33:com.android.tools.r8.graph.DexType toRewrittenTypeOrNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):143:144 -> a
     34:36:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):157:159 -> a
     37:38:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):164:165 -> a
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):387:387 -> a
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):391:391 -> a
     39:39:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):165 -> a
     1:5:com.android.tools.r8.kotlin.KotlinTypeReference fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.lang.String):65:69 -> b
     6:25:boolean toRenamedDescriptorOrDefault(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,java.lang.String):77:96 -> b
@@ -92538,7 +91495,7 @@
     7:7:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> o
     7:7:java.lang.String toKotlinClassifier(boolean):103 -> o
     1:1:java.lang.String toString():152:152 -> toString
-com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.HA:
+com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.Qz:
     com.android.tools.r8.kotlin.KotlinTypeInfo varargElementType -> d
     java.util.List EMPTY_VALUE_PARAMETERS -> e
     com.android.tools.r8.kotlin.KotlinTypeInfo type -> c
@@ -92550,26 +91507,26 @@
     7:14:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59:66 -> a
     15:19:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):73:77 -> a
     20:22:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):85:87 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.JA:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.Sz:
     java.util.List versionRequirements -> a
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo NO_VERSION_REQUIREMENTS -> b
     1:2:void <clinit>():17:18 -> <clinit>
     1:2:void <init>(java.util.List):22:23 -> <init>
     1:8:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo create(java.util.List):27:34 -> a
     9:13:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider):38:42 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.IA:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.Rz:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind kind -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion version -> e
     java.lang.Integer errorCode -> a
     java.lang.String message -> d
     1:6:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion):60:65 -> <init>
-    1:5:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):69:73 -> a
-    1:5:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):47 -> a
-    6:8:void com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint.rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):78:80 -> a
-    6:8:void access$100(com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):47 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.PC:
+    1:1:void access$100(com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):47:47 -> a
+    2:4:void com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint.rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):78:80 -> a
+    2:4:void access$100(com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):47 -> a
+    5:9:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):69:73 -> a
+    5:9:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):47 -> a
+com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.XB:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -92585,7 +91542,7 @@
     1:1:void <init>(java.lang.String,com.android.tools.r8.position.Position):27:27 -> <init>
     1:2:com.android.tools.r8.naming.ApplyMappingError mapToExistingClass(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):32:33 -> a
     1:2:com.android.tools.r8.naming.ApplyMappingError mapToExistingMember(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):39:40 -> b
-com.android.tools.r8.naming.ClassNameMapper -> com.android.tools.r8.naming.c:
+com.android.tools.r8.naming.ClassNameMapper -> com.android.tools.r8.naming.b:
     java.util.Map signatureMap -> c
     java.util.Set mapVersions -> d
     com.android.tools.r8.utils.BiMapContainer nameMapping -> b
@@ -92708,8 +91665,7 @@
     1:2:boolean equals(java.lang.Object):281:282 -> equals
     1:1:int hashCode():287:287 -> hashCode
     1:3:java.lang.String toString():262:264 -> toString
-com.android.tools.r8.naming.ClassNameMapper$1 -> com.android.tools.r8.naming.b:
-com.android.tools.r8.naming.ClassNameMapper$Builder -> com.android.tools.r8.naming.c$a:
+com.android.tools.r8.naming.ClassNameMapper$Builder -> com.android.tools.r8.naming.b$a:
     java.util.Map mapping -> a
     java.util.LinkedHashSet mapVersions -> b
     1:1:void <init>(com.android.tools.r8.naming.ClassNameMapper$1):46:46 -> <init>
@@ -92725,12 +91681,12 @@
     7:7:void lambda$buildClassNameMappings$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$Builder):73:73 -> a
     8:8:com.android.tools.r8.naming.ProguardMap$Builder setCurrentMapVersion(com.android.tools.r8.naming.mappinginformation.MapVersionMappingInformation):79:79 -> a
     1:5:com.android.tools.r8.com.google.common.collect.ImmutableMap buildClassNameMappings():70:74 -> b
-com.android.tools.r8.naming.ClassNameMapper$MissingFileAction -> com.android.tools.r8.naming.c$b:
+com.android.tools.r8.naming.ClassNameMapper$MissingFileAction -> com.android.tools.r8.naming.b$b:
     com.android.tools.r8.naming.ClassNameMapper$MissingFileAction MISSING_FILE_IS_EMPTY_MAP -> b
     com.android.tools.r8.naming.ClassNameMapper$MissingFileAction MISSING_FILE_IS_ERROR -> c
     1:2:void <clinit>():42:43 -> <clinit>
     1:1:void <init>(java.lang.String,int):41:41 -> <init>
-com.android.tools.r8.naming.ClassNameMinifier -> com.android.tools.r8.naming.h:
+com.android.tools.r8.naming.ClassNameMinifier -> com.android.tools.r8.naming.f:
     java.util.function.Predicate isUsed -> j
     com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy classNamingStrategy -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -92746,38 +91702,38 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,java.lang.Iterable):51:51 -> <init>
     2:30:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,java.lang.Iterable):39:67 -> <init>
     1:1:java.util.function.Predicate access$100(com.android.tools.r8.naming.ClassNameMinifier):34:34 -> a
-    2:2:void setUsedTypeName(java.lang.String):72:72 -> a
-    2:2:void access$400(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):34 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:28:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):88:113 -> a
-    29:45:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):109:125 -> a
-    46:54:java.util.Map getPackageRenaming():129:137 -> a
-    46:54:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):125 -> a
-    55:55:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):125:125 -> a
-    56:57:void renameDanglingTypes(com.android.tools.r8.graph.DexClass):141:142 -> a
-    58:58:void renameDanglingTypesInField(com.android.tools.r8.graph.DexEncodedField):146:146 -> a
-    59:62:void renameDanglingTypesInMethod(com.android.tools.r8.graph.DexEncodedMethod):150:153 -> a
-    63:64:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):169:170 -> a
-    65:65:void setUsedTypeName(java.lang.String):72:72 -> a
-    65:65:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):170 -> a
-    66:66:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):171:171 -> a
-    67:80:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):185:198 -> a
-    67:80:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):172 -> a
-    81:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.InnerClassAttribute.getLiveContext(com.android.tools.r8.graph.AppView):101:115 -> a
-    81:95:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):198 -> a
-    81:95:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):172 -> a
-    96:100:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):174:178 -> a
-    101:101:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):203:203 -> a
-    102:115:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):185:198 -> a
-    102:115:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):207 -> a
-    116:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.InnerClassAttribute.getLiveContext(com.android.tools.r8.graph.AppView):101:115 -> a
-    116:130:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):198 -> a
-    116:130:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):207 -> a
-    131:140:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):209:218 -> a
-    141:157:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):236:252 -> a
-    141:157:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):220 -> a
-    158:160:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):224:226 -> a
-    161:165:java.lang.String getParentPackagePrefix(java.lang.String):328:332 -> a
+    2:2:void access$400(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):34:34 -> a
+    3:3:void setUsedTypeName(java.lang.String):72:72 -> a
+    3:3:void access$400(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):34 -> a
+    4:29:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):88:113 -> a
+    30:46:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):109:125 -> a
+    47:55:java.util.Map getPackageRenaming():129:137 -> a
+    47:55:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):125 -> a
+    56:56:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):125:125 -> a
+    57:58:void renameDanglingTypes(com.android.tools.r8.graph.DexClass):141:142 -> a
+    59:59:void renameDanglingTypesInField(com.android.tools.r8.graph.DexEncodedField):146:146 -> a
+    60:63:void renameDanglingTypesInMethod(com.android.tools.r8.graph.DexEncodedMethod):150:153 -> a
+    64:65:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):169:170 -> a
+    66:66:void setUsedTypeName(java.lang.String):72:72 -> a
+    66:66:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):170 -> a
+    67:67:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):171:171 -> a
+    68:81:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):185:198 -> a
+    68:81:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):172 -> a
+    82:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.InnerClassAttribute.getLiveContext(com.android.tools.r8.graph.AppView):101:115 -> a
+    82:96:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):198 -> a
+    82:96:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):172 -> a
+    97:101:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):174:178 -> a
+    102:102:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):203:203 -> a
+    103:116:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):185:198 -> a
+    103:116:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):207 -> a
+    117:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.InnerClassAttribute.getLiveContext(com.android.tools.r8.graph.AppView):101:115 -> a
+    117:131:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):198 -> a
+    117:131:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):207 -> a
+    132:141:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):209:218 -> a
+    142:158:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):236:252 -> a
+    142:158:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):220 -> a
+    159:161:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):224:226 -> a
+    162:166:java.lang.String getParentPackagePrefix(java.lang.String):328:332 -> a
     1:1:com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy access$200(com.android.tools.r8.naming.ClassNameMinifier):34:34 -> b
     2:2:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):230:230 -> b
     3:3:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageBinaryNameFromJavaType(java.lang.String):380:380 -> b
@@ -92788,17 +91744,16 @@
     2:2:boolean lambda$new$0(java.lang.String):64:64 -> c
     3:3:void lambda$computeRenaming$1(com.android.tools.r8.graph.DexType):99:99 -> c
     1:7:void renameDanglingType(com.android.tools.r8.graph.DexType):158:164 -> d
-com.android.tools.r8.naming.ClassNameMinifier$1 -> com.android.tools.r8.naming.d:
-com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy -> com.android.tools.r8.naming.e:
+com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy -> com.android.tools.r8.naming.c:
     boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate) -> a
     com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming -> com.android.tools.r8.naming.f:
+com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming -> com.android.tools.r8.naming.d:
     java.util.Map packageRenaming -> a
     java.util.Map classRenaming -> b
     1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNameMinifier$1):75:75 -> <init>
     2:4:void <init>(java.util.Map,java.util.Map):80:82 -> <init>
-com.android.tools.r8.naming.ClassNameMinifier$Namespace -> com.android.tools.r8.naming.g:
+com.android.tools.r8.naming.ClassNameMinifier$Namespace -> com.android.tools.r8.naming.e:
     char[] packagePrefix -> c
     com.android.tools.r8.naming.ClassNameMinifier this$0 -> f
     int dictionaryIndex -> d
@@ -92814,14 +91769,14 @@
     1:1:int getDictionaryIndex():289:289 -> b
     1:1:int incrementDictionaryIndex():294:294 -> c
     1:1:java.lang.String getPackageName():277:277 -> d
-com.android.tools.r8.naming.ClassNaming -> com.android.tools.r8.naming.j:
+com.android.tools.r8.naming.ClassNaming -> com.android.tools.r8.naming.h:
     com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature) -> a
-com.android.tools.r8.naming.ClassNaming$Builder -> com.android.tools.r8.naming.i:
+com.android.tools.r8.naming.ClassNaming$Builder -> com.android.tools.r8.naming.g:
     1:1:void <init>():19:19 -> <init>
     com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,java.lang.String) -> a
     void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer) -> a
     com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming) -> a
-com.android.tools.r8.naming.ClassNamingForMapApplier -> com.android.tools.r8.naming.m:
+com.android.tools.r8.naming.ClassNamingForMapApplier -> com.android.tools.r8.naming.j:
     com.android.tools.r8.com.google.common.collect.ImmutableMap qualifiedMethodMembers -> d
     com.android.tools.r8.position.Position position -> c
     com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> f
@@ -92842,8 +91797,7 @@
     1:1:int hashCode():247:247 -> hashCode
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):77:77 -> hashCode
     2:2:int hashCode():247 -> hashCode
-com.android.tools.r8.naming.ClassNamingForMapApplier$1 -> com.android.tools.r8.naming.k:
-com.android.tools.r8.naming.ClassNamingForMapApplier$Builder -> com.android.tools.r8.naming.l:
+com.android.tools.r8.naming.ClassNamingForMapApplier$Builder -> com.android.tools.r8.naming.i:
     com.android.tools.r8.position.Position position -> c
     com.android.tools.r8.utils.Reporter reporter -> d
     java.lang.String originalName -> a
@@ -92865,7 +91819,7 @@
     12:21:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):66:75 -> a
     22:22:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):74:74 -> a
     23:23:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):73:73 -> a
-com.android.tools.r8.naming.ClassNamingForNameMapper -> com.android.tools.r8.naming.o:
+com.android.tools.r8.naming.ClassNamingForNameMapper -> com.android.tools.r8.naming.k:
     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
@@ -92899,8 +91853,7 @@
     1:11:boolean equals(java.lang.Object):370:380 -> equals
     1:5:int hashCode():385:389 -> hashCode
     1:3:java.lang.String toString():360:362 -> toString
-com.android.tools.r8.naming.ClassNamingForNameMapper$1 -> com.android.tools.r8.naming.n:
-com.android.tools.r8.naming.ClassNamingForNameMapper$Builder -> com.android.tools.r8.naming.o$a:
+com.android.tools.r8.naming.ClassNamingForNameMapper$Builder -> com.android.tools.r8.naming.k$a:
     java.util.Map methodMembers -> c
     java.util.Map fieldMembers -> d
     java.lang.String originalName -> a
@@ -92919,7 +91872,7 @@
     21:21:java.util.List lambda$addMappedRange$1(java.lang.String):97:97 -> a
     22:28:void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):104:110 -> a
     1:1:java.util.List lambda$addMemberEntry$0(java.lang.String):59:59 -> b
-com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange -> com.android.tools.r8.naming.o$b:
+com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange -> com.android.tools.r8.naming.k$b:
     com.android.tools.r8.naming.Range originalRange -> c
     java.util.List additionalMappingInfo -> f
     com.android.tools.r8.naming.Range minifiedRange -> a
@@ -92955,7 +91908,7 @@
     1:10:boolean equals(java.lang.Object):540:549 -> equals
     1:4:int hashCode():555:558 -> hashCode
     1:10:java.lang.String toString():521:530 -> toString
-com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName -> com.android.tools.r8.naming.o$c:
+com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName -> com.android.tools.r8.naming.k$c:
     java.util.List mappedRanges -> a
     1:2:void <init>(java.util.List):118:119 -> <init>
     1:1:java.util.List access$300(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):115:115 -> a
@@ -92970,7 +91923,7 @@
     3:3:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):135 -> b
     1:7:boolean equals(java.lang.Object):193:199 -> equals
     1:1:int hashCode():204:204 -> hashCode
-com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.kh:
+com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.Sg:
     java.nio.file.Path path -> c
     java.io.BufferedReader reader -> b
     boolean $assertionsDisabled -> d
@@ -92980,7 +91933,7 @@
     41:54:com.android.tools.r8.com.google.common.collect.ImmutableList readAllNames(java.nio.file.Path,com.android.tools.r8.utils.Reporter):84:97 -> a
     55:71:com.android.tools.r8.com.google.common.collect.ImmutableList readAllNames(java.nio.file.Path,com.android.tools.r8.utils.Reporter):86:102 -> a
     1:2:void close():77:78 -> close
-com.android.tools.r8.naming.FieldNameMinifier -> com.android.tools.r8.naming.r:
+com.android.tools.r8.naming.FieldNameMinifier -> com.android.tools.r8.naming.n:
     java.util.Map renaming -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map reservedNamingStates -> d
@@ -92999,50 +91952,48 @@
     10:17:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):69:76 -> a
     18:18:com.android.tools.r8.naming.ReservedFieldNamingState getOrCreateReservedFieldNamingState(com.android.tools.r8.graph.DexType):97:97 -> a
     19:34:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):117:132 -> a
-    35:35:void com.android.tools.r8.naming.ReservedFieldNamingState.markReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):47:47 -> a
-    35:35:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):131 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:42:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):134:140 -> a
-    43:44:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):45:46 -> a
-    43:44:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):141 -> a
-    45:55:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):140:150 -> a
-    56:71:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):149:164 -> a
-    72:72:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):163:163 -> a
-    73:75:void patchUpAllIndirectlyImplementingInterfacesFromLibraryAndClassPath(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.naming.ReservedFieldNamingState):171:173 -> a
-    76:79:com.android.tools.r8.utils.TraversalContinuation lambda$patchUpAllIndirectlyImplementingInterfacesFromLibraryAndClassPath$2(com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):176:179 -> a
-    80:84:void renameFieldsInClasses():184:188 -> a
-    85:85:void renameFieldsInClasses():187:187 -> a
-    86:94:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):190:198 -> a
-    95:100:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):196:201 -> a
-    101:101:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):93:93 -> a
-    101:101:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):201 -> a
-    102:104:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):202:204 -> a
-    105:105:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
-    105:105:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):204 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    106:107:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):207:208 -> a
-    108:111:void lambda$renameFieldsInUnrelatedClasspathClasses$6(com.android.tools.r8.graph.DexClasspathClass):218:221 -> a
-    112:117:void renameFieldsInInterfacePartition(java.util.Set):237:242 -> a
-    118:118:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):93:93 -> a
-    118:118:void renameFieldsInInterfacePartition(java.util.Set):242 -> a
-    119:135:void renameFieldsInInterfacePartition(java.util.Set):244:260 -> a
-    136:136:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
-    136:136:void renameFieldsInInterfacePartition(java.util.Set):261 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    137:138:void lambda$renameFieldsInInterfacePartition$7(com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState):250:251 -> a
-    139:141:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.FieldNamingState):272:274 -> a
-    139:141:void lambda$renameFieldsInClasses$4(com.android.tools.r8.naming.FieldNamingState,com.android.tools.r8.graph.ProgramField):204 -> a
-    142:144:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.FieldNamingState):272:274 -> a
-    142:144:void lambda$renameFieldsInInterfacePartition$8(com.android.tools.r8.naming.FieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.ProgramField):263 -> a
-    145:145:void lambda$renameFieldsInInterfacePartition$8(com.android.tools.r8.naming.FieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.ProgramField):265:265 -> a
-    146:146:void com.android.tools.r8.naming.ReservedFieldNamingState.markReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):47:47 -> a
-    146:146:void lambda$renameFieldsInInterfacePartition$8(com.android.tools.r8.naming.FieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.ProgramField):264 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    147:147:void renameNonReboundAccessesToField(com.android.tools.r8.graph.FieldAccessInfo):286:286 -> a
-    148:151:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):292:295 -> a
-    152:152:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
-    152:152:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):295 -> a
-    153:161:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):295:303 -> a
+    35:35:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):131:131 -> a
+    36:36:void com.android.tools.r8.naming.ReservedFieldNamingState.markReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):47:47 -> a
+    36:36:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):131 -> a
+    37:43:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):134:140 -> a
+    44:45:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):45:46 -> a
+    44:45:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):141 -> a
+    46:56:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):140:150 -> a
+    57:72:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):149:164 -> a
+    73:73:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):163:163 -> a
+    74:76:void patchUpAllIndirectlyImplementingInterfacesFromLibraryAndClassPath(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.naming.ReservedFieldNamingState):171:173 -> a
+    77:80:com.android.tools.r8.utils.TraversalContinuation lambda$patchUpAllIndirectlyImplementingInterfacesFromLibraryAndClassPath$2(com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):176:179 -> a
+    81:85:void renameFieldsInClasses():184:188 -> a
+    86:86:void renameFieldsInClasses():187:187 -> a
+    87:95:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):190:198 -> a
+    96:101:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):196:201 -> a
+    102:102:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):93:93 -> a
+    102:102:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):201 -> a
+    103:105:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):202:204 -> a
+    106:106:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
+    106:106:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):204 -> a
+    107:108:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):207:208 -> a
+    109:112:void lambda$renameFieldsInUnrelatedClasspathClasses$6(com.android.tools.r8.graph.DexClasspathClass):218:221 -> a
+    113:118:void renameFieldsInInterfacePartition(java.util.Set):237:242 -> a
+    119:119:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):93:93 -> a
+    119:119:void renameFieldsInInterfacePartition(java.util.Set):242 -> a
+    120:137:void renameFieldsInInterfacePartition(java.util.Set):244:261 -> a
+    138:138:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
+    138:138:void renameFieldsInInterfacePartition(java.util.Set):261 -> a
+    139:140:void lambda$renameFieldsInInterfacePartition$7(com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState):250:251 -> a
+    141:143:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.FieldNamingState):272:274 -> a
+    141:143:void lambda$renameFieldsInClasses$4(com.android.tools.r8.naming.FieldNamingState,com.android.tools.r8.graph.ProgramField):204 -> a
+    144:146:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.FieldNamingState):272:274 -> a
+    144:146:void lambda$renameFieldsInInterfacePartition$8(com.android.tools.r8.naming.FieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.ProgramField):263 -> a
+    147:147:void lambda$renameFieldsInInterfacePartition$8(com.android.tools.r8.naming.FieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.ProgramField):265:265 -> a
+    148:148:void lambda$renameFieldsInInterfacePartition$8(com.android.tools.r8.naming.FieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.ProgramField):264:264 -> a
+    149:149:void com.android.tools.r8.naming.ReservedFieldNamingState.markReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):47:47 -> a
+    149:149:void lambda$renameFieldsInInterfacePartition$8(com.android.tools.r8.naming.FieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.ProgramField):264 -> a
+    150:150:void renameNonReboundAccessesToField(com.android.tools.r8.graph.FieldAccessInfo):286:286 -> a
+    151:154:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):292:295 -> a
+    155:155:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
+    155:155:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):295 -> a
+    156:164:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):295:303 -> a
     1:1:com.android.tools.r8.graph.SubtypingInfo access$300(com.android.tools.r8.naming.FieldNameMinifier):37:37 -> b
     2:2:com.android.tools.r8.naming.ReservedFieldNamingState lambda$getOrCreateReservedFieldNamingState$0(com.android.tools.r8.graph.DexType):98:98 -> b
     3:6:void renameFieldsInUnrelatedClasspathClasses():213:216 -> b
@@ -93050,12 +92001,12 @@
     2:4:void renameNonReboundReferences():280:282 -> c
     1:3:void reserveFieldNames():112:114 -> d
     4:4:void reserveFieldNames():113:113 -> d
-com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming -> com.android.tools.r8.naming.p:
+com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming -> com.android.tools.r8.naming.l:
     java.util.Map renaming -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.naming.FieldNameMinifier$1):79:79 -> <init>
     2:3:void <init>(java.util.Map):83:84 -> <init>
     1:1:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming empty():88:88 -> a
-com.android.tools.r8.naming.FieldNameMinifier$InterfacePartitioning -> com.android.tools.r8.naming.q:
+com.android.tools.r8.naming.FieldNameMinifier$InterfacePartitioning -> com.android.tools.r8.naming.m:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set visited -> c
     com.android.tools.r8.naming.FieldNameMinifier minifier -> a
@@ -93066,7 +92017,7 @@
     1:1:java.util.List access$100(com.android.tools.r8.naming.FieldNameMinifier$InterfacePartitioning,java.util.Collection):307:307 -> a
     2:9:java.util.List sortedPartitions(java.util.Collection):319:326 -> a
     10:43:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):333:366 -> a
-com.android.tools.r8.naming.FieldNamingState -> com.android.tools.r8.naming.t:
+com.android.tools.r8.naming.FieldNamingState -> com.android.tools.r8.naming.p:
     com.android.tools.r8.naming.ReservedFieldNamingState reservedNames -> d
     com.android.tools.r8.naming.MemberNamingStrategy strategy -> e
     java.util.function.BiPredicate isAvailable -> f
@@ -93081,25 +92032,19 @@
     10:10:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.ProgramField):57:57 -> a
     11:11:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState$InternalState.createNewName(com.android.tools.r8.graph.ProgramField):93:93 -> a
     11:11:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.ProgramField):57 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:12:com.android.tools.r8.naming.MemberNamingStrategy access$100(com.android.tools.r8.naming.FieldNamingState):17:17 -> a
     12:12:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState$InternalState.createNewName(com.android.tools.r8.graph.ProgramField):93 -> a
     12:12:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.ProgramField):57 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     13:13:java.util.function.BiPredicate access$000(com.android.tools.r8.naming.FieldNamingState):17:17 -> a
     13:13:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState$InternalState.createNewName(com.android.tools.r8.graph.ProgramField):93 -> a
     13:13:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.ProgramField):57 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     14:15:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState$InternalState.createNewName(com.android.tools.r8.graph.ProgramField):93:94 -> a
     14:15:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.ProgramField):57 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:com.android.tools.r8.naming.ReservedFieldNamingState access$200(com.android.tools.r8.naming.FieldNamingState):17:17 -> a
     16:16:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState$InternalState.createNewName(com.android.tools.r8.graph.ProgramField):94 -> a
     16:16:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.ProgramField):57 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     17:17:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState$InternalState.createNewName(com.android.tools.r8.graph.ProgramField):94:94 -> a
     17:17:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.ProgramField):57 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:18:com.android.tools.r8.naming.FieldNamingState$InternalState createInternalState():66:66 -> a
     18:18:java.lang.Object createInternalState():17 -> a
     19:19:void com.android.tools.r8.naming.FieldNamingState$InternalState.<init>(com.android.tools.r8.naming.FieldNamingState):84:84 -> a
@@ -93107,7 +92052,7 @@
     19:19:java.lang.Object createInternalState():17 -> a
     1:5:com.android.tools.r8.naming.FieldNamingState clone():71:75 -> b
     1:1:java.lang.Object clone():17:17 -> clone
-com.android.tools.r8.naming.FieldNamingState$InternalState -> com.android.tools.r8.naming.s:
+com.android.tools.r8.naming.FieldNamingState$InternalState -> com.android.tools.r8.naming.o:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.FieldNamingState this$0 -> d
     int dictionaryIndex -> b
@@ -93119,7 +92064,7 @@
     1:1:int incrementDictionaryIndex():110:110 -> c
     1:1:java.lang.Object clone():78:78 -> clone
     1:1:com.android.tools.r8.naming.FieldNamingState$InternalState clone():100:100 -> d
-com.android.tools.r8.naming.FieldNamingStateBase -> com.android.tools.r8.naming.u:
+com.android.tools.r8.naming.FieldNamingStateBase -> com.android.tools.r8.naming.q:
     java.util.Map internalStates -> c
     com.android.tools.r8.graph.AppView appView -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):20:22 -> <init>
@@ -93131,7 +92076,7 @@
     1:4:java.lang.Object getOrCreateInternalState(com.android.tools.r8.graph.DexType):35 -> b
     5:5:java.lang.Object getOrCreateInternalState(com.android.tools.r8.graph.DexType):36:36 -> b
     1:1:java.lang.Object lambda$getOrCreateInternalState$0(com.android.tools.r8.graph.DexType):36:36 -> c
-com.android.tools.r8.naming.IdentifierMinifier -> com.android.tools.r8.naming.v:
+com.android.tools.r8.naming.IdentifierMinifier -> com.android.tools.r8.naming.r:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter recordCfToCfRewriter -> c
     boolean $assertionsDisabled -> e
@@ -93155,9 +92100,9 @@
     46:46:com.android.tools.r8.graph.DexString getRenamedStringLiteral(com.android.tools.r8.graph.DexString):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":179,"2":180,"3":181}}
     179:179:com.android.tools.r8.graph.DexString getRenamedStringLiteral(com.android.tools.r8.graph.DexString):124:124 -> a
-    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     180:180:com.android.tools.r8.graph.DexString getRenamedStringLiteral(com.android.tools.r8.graph.DexString):124 -> a
-    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     181:181:com.android.tools.r8.graph.DexString getRenamedStringLiteral(com.android.tools.r8.graph.DexString):124 -> a
     171:178:com.android.tools.r8.graph.DexString getRenamedStringLiteral(com.android.tools.r8.graph.DexString):125:132 -> a
     182:188:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.ProgramMethod):163:169 -> a
@@ -93183,7 +92128,7 @@
     5:12:void lambda$replaceDexItemBasedConstString$1(com.android.tools.r8.graph.DexProgramClass):142 -> b
     13:13:void lambda$replaceDexItemBasedConstString$1(com.android.tools.r8.graph.DexProgramClass):144:144 -> b
     1:4:void run(java.util.concurrent.ExecutorService):54:57 -> c
-com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.Jn:
+com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.on:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> b
     boolean $assertionsDisabled -> c
@@ -93226,7 +92171,6 @@
     243:246:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):218 -> a
     247:247:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1576:1576 -> a
     247:247:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):344 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     247:247:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):218 -> a
     248:257:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):343:352 -> a
     248:257:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):218 -> a
@@ -93235,20 +92179,24 @@
     259:262:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):219:222 -> a
     263:263:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
     263:263:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):222 -> a
-    264:362:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):227:325 -> a
-    363:369:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
-    370:370:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):230:230 -> a
-    370:370:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
-    371:371:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:328 -> a
-    372:372:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
-    373:385:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):361:373 -> a
-    386:386:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":772,"2":773,"3":774}}
+    264:281:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):227:244 -> a
+    282:282:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):335:335 -> a
+    282:282:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):331 -> a
+    282:282:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):244 -> a
+    283:361:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):247:325 -> a
+    362:368:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
+    369:369:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):230:230 -> a
+    369:369:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
+    370:370:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:328 -> a
+    371:371:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
+    372:384:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):361:373 -> a
+    385:385:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":771,"2":772,"3":773}}
+    771:771:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):374:374 -> a
     772:772:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):374:374 -> a
     773:773:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):374:374 -> a
-    774:774:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):374:374 -> a
-    760:771:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):374:385 -> a
-com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.Mn:
+    759:770:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):374:385 -> a
+com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.rn:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():41:41 -> <clinit>
     boolean lambda$evaluateTypeArrayContentFromConstructionToUse$0(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
@@ -93257,11 +92205,9 @@
     97:102:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):186:191 -> a
     103:103:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1584:1584 -> a
     103:103:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):191 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     104:110:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):205:211 -> a
     111:111:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1576:1576 -> a
     111:111:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):211 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     112:112:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):213:213 -> a
     113:119:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):212:218 -> a
     120:122:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):180:182 -> a
@@ -93350,7 +92296,7 @@
     852:852:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):489:489 -> a
     853:853:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):489:489 -> a
     847:850:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):493:496 -> a
-com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.naming.z:
+com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.naming.v:
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
@@ -93395,14 +92341,12 @@
     225:231:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):584:590 -> a
     232:232:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):108:108 -> a
     232:232:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):590 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     233:237:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):591:595 -> a
     238:239:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):98:99 -> a
     238:239:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):595 -> a
     240:241:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):596:597 -> a
     242:242:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):108:108 -> a
     242:242:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):597 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     243:244:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):78:79 -> a
     243:244:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):598 -> a
     245:246:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):78:79 -> a
@@ -93411,48 +92355,44 @@
     253:253:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):430:430 -> a
     254:289:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):452:487 -> a
     290:294:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):486:490 -> a
-    295:306:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):489:500 -> a
-    307:308:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
-    307:308:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):501 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    309:310:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):501:502 -> a
-    311:312:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):128:129 -> a
-    311:312:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
-    313:314:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
-    313:314:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):132 -> a
-    313:314:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
-    315:317:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:91 -> a
-    315:317:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
-    315:317:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
-    318:318:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):92:92 -> a
-    318:318:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
-    318:318:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
-    319:319:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134:134 -> a
+    295:307:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):489:501 -> a
+    308:309:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
+    308:309:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):501 -> a
+    310:311:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):501:502 -> a
+    312:313:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):128:129 -> a
+    312:313:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
+    314:315:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
+    314:315:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):132 -> a
+    314:315:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
+    316:318:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:91 -> a
+    316:318:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
+    316:318:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
+    319:319:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):92:92 -> a
+    319:319:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
     319:319:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
-    320:323:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):608:611 -> a
-    324:324:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):108:108 -> a
-    324:324:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):611 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    325:328:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):613:616 -> a
-    329:329:boolean lambda$assignNewName$3(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):615:615 -> a
-    330:330:com.android.tools.r8.graph.DexString newNameInGroup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):625:625 -> a
-    331:333:void computeReservationFrontiersForAllImplementingClasses():640:642 -> a
-    334:338:void lambda$computeReservationFrontiersForAllImplementingClasses$6(com.android.tools.r8.graph.DexClass):645:649 -> a
-    339:347:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):651:659 -> a
-    348:348:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):104:104 -> a
-    348:348:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):659 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    349:349:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):660:660 -> a
-    350:352:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):112:112 -> a
-    350:352:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):660 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    320:320:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134:134 -> a
+    320:320:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
+    321:324:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):608:611 -> a
+    325:325:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):108:108 -> a
+    325:325:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):611 -> a
+    326:329:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):613:616 -> a
+    330:330:boolean lambda$assignNewName$3(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):615:615 -> a
+    331:331:com.android.tools.r8.graph.DexString newNameInGroup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):625:625 -> a
+    332:334:void computeReservationFrontiersForAllImplementingClasses():640:642 -> a
+    335:339:void lambda$computeReservationFrontiersForAllImplementingClasses$6(com.android.tools.r8.graph.DexClass):645:649 -> a
+    340:348:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):651:659 -> a
+    349:349:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):104:104 -> a
+    349:349:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):659 -> a
+    350:350:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):660:660 -> a
+    351:353:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):112:112 -> a
+    351:353:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):660 -> a
     1:1:com.android.tools.r8.naming.MethodNameMinifier$State access$100(com.android.tools.r8.naming.InterfaceMethodNameMinifier):97:97 -> b
     2:2:java.util.Comparator getDefaultInterfaceMethodOrdering():396:396 -> b
     3:3:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):491:491 -> b
     4:4:boolean lambda$newNameInGroup$4(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):625:625 -> b
     1:1:java.util.Map access$200(com.android.tools.r8.naming.InterfaceMethodNameMinifier):97:97 -> c
     1:1:com.android.tools.r8.com.google.common.base.Equivalence access$300(com.android.tools.r8.naming.InterfaceMethodNameMinifier):97:97 -> d
-com.android.tools.r8.naming.InterfaceMethodNameMinifier$1 -> com.android.tools.r8.naming.w:
+com.android.tools.r8.naming.InterfaceMethodNameMinifier$1 -> com.android.tools.r8.naming.s:
     com.android.tools.r8.naming.InterfaceMethodNameMinifier this$0 -> a
     1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier):382:382 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):382:382 -> a
@@ -93461,7 +92401,7 @@
     3:3:int doHash(java.lang.Object):382:382 -> a
     4:4:int doHash(com.android.tools.r8.graph.DexEncodedMethod):390:390 -> a
     4:4:int doHash(java.lang.Object):382 -> a
-com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState -> com.android.tools.r8.naming.x:
+com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState -> com.android.tools.r8.naming.t:
     java.util.Map methodStates -> c
     java.util.List callSiteCollidingMethods -> d
     java.util.Set callSites -> b
@@ -93501,7 +92441,7 @@
     2:2:int compareTo(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):358:358 -> compareTo
     2:2:int compareTo(java.lang.Object):237 -> compareTo
     1:4:void appendMethodGroupState(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):249:252 -> d
-com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState -> com.android.tools.r8.naming.y:
+com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState -> com.android.tools.r8.naming.u:
     com.android.tools.r8.graph.DexClass iface -> a
     java.util.Set reservationTypes -> c
     boolean $assertionsDisabled -> e
@@ -93513,34 +92453,30 @@
     1:2:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):115:116 -> a
     3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):121:121 -> a
     3:3:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):116 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):123:123 -> a
     5:13:java.lang.Object forAny(java.util.function.Function):187:195 -> a
     5:13:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):124 -> a
     14:28:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):124:138 -> a
-    29:31:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):126:128 -> a
-    32:32:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):104:104 -> a
-    32:32:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):129 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:36:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):130:133 -> a
-    37:37:void addReservationType(com.android.tools.r8.graph.DexType):142:142 -> a
-    38:38:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):172:172 -> a
-    39:39:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):174:174 -> a
-    40:40:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175:175 -> a
-    41:41:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):108:108 -> a
-    41:41:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    42:43:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):78:79 -> a
-    42:43:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175 -> a
-    44:44:void forAll(java.util.function.Consumer):179:179 -> a
-    45:53:java.lang.Object forAny(java.util.function.Function):187:195 -> a
-    45:53:void forAll(java.util.function.Consumer):179 -> a
-    54:54:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):181:181 -> a
-    55:62:java.lang.Object forChildren(java.util.function.Function):216:223 -> a
+    29:32:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):126:129 -> a
+    33:33:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):104:104 -> a
+    33:33:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):129 -> a
+    34:37:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):130:133 -> a
+    38:38:void addReservationType(com.android.tools.r8.graph.DexType):142:142 -> a
+    39:39:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):172:172 -> a
+    40:40:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):174:174 -> a
+    41:41:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175:175 -> a
+    42:42:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):108:108 -> a
+    42:42:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175 -> a
+    43:44:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):78:79 -> a
+    43:44:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175 -> a
+    45:45:void forAll(java.util.function.Consumer):179:179 -> a
+    46:54:java.lang.Object forAny(java.util.function.Function):187:195 -> a
+    46:54:void forAll(java.util.function.Consumer):179 -> a
+    55:55:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):181:181 -> a
+    56:63:java.lang.Object forChildren(java.util.function.Function):216:223 -> a
     1:1:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):150:150 -> b
     2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):104:104 -> b
     2:2:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):150 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):151:151 -> b
     4:7:void com.android.tools.r8.naming.MethodReservationState.reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):42:45 -> b
     4:7:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):151 -> b
@@ -93551,17 +92487,16 @@
     29:30:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):160:161 -> b
     31:31:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):108:108 -> b
     31:31:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):161 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     32:33:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):162:163 -> b
     34:41:java.lang.Object forParents(java.util.function.Function):199:206 -> b
     42:42:boolean containsReservation(com.android.tools.r8.graph.DexType):233:233 -> b
     1:1:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):146:146 -> c
     2:2:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):148:148 -> c
-com.android.tools.r8.naming.InternalNamingState -> com.android.tools.r8.naming.A:
+com.android.tools.r8.naming.InternalNamingState -> com.android.tools.r8.naming.w:
     int incrementNameIndex() -> a
     int getDictionaryIndex() -> b
     int incrementDictionaryIndex() -> c
-com.android.tools.r8.naming.MapVersion -> com.android.tools.r8.internal.KD:
+com.android.tools.r8.naming.MapVersion -> com.android.tools.r8.internal.RC:
     com.android.tools.r8.naming.MapVersion[] $VALUES -> h
     com.android.tools.r8.naming.MapVersion MAP_VERSION_UNKNOWN -> g
     com.android.tools.r8.naming.MapVersion MAP_VERSION_EXPERIMENTAL -> f
@@ -93574,13 +92509,12 @@
     1:2:void <init>(java.lang.String,int,java.lang.String):19:20 -> <init>
     1:1:com.android.tools.r8.naming.MapVersion[] com.android.tools.r8.naming.MapVersion.values():8:8 -> a
     1:1:com.android.tools.r8.naming.MapVersion fromName(java.lang.String):28 -> a
-    2:2:com.android.tools.r8.naming.MapVersion fromName(java.lang.String):28:28 -> a
-    3:3:java.lang.String com.android.tools.r8.naming.MapVersion.getName():24:24 -> a
-    3:3:com.android.tools.r8.naming.MapVersion fromName(java.lang.String):29 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.naming.MapVersion fromName(java.lang.String):29:29 -> a
-    5:5:java.lang.String getName():24:24 -> a
-com.android.tools.r8.naming.MemberNaming -> com.android.tools.r8.naming.B:
+    2:3:com.android.tools.r8.naming.MapVersion fromName(java.lang.String):28:29 -> a
+    4:4:java.lang.String com.android.tools.r8.naming.MapVersion.getName():24:24 -> a
+    4:4:com.android.tools.r8.naming.MapVersion fromName(java.lang.String):29 -> a
+    5:5:com.android.tools.r8.naming.MapVersion fromName(java.lang.String):29:29 -> a
+    6:6:java.lang.String getName():24:24 -> a
+com.android.tools.r8.naming.MemberNaming -> com.android.tools.r8.naming.x:
     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
@@ -93592,7 +92526,7 @@
     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.B$a:
+com.android.tools.r8.naming.MemberNaming$FieldSignature -> com.android.tools.r8.naming.x$a:
     java.lang.String type -> c
     1:2:void <init>(java.lang.String,java.lang.String):176:177 -> <init>
     com.android.tools.r8.naming.MemberNaming$FieldSignature asFieldSignature() -> a
@@ -93605,7 +92539,7 @@
     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.B$b:
+com.android.tools.r8.naming.MemberNaming$MethodSignature -> com.android.tools.r8.naming.x$b:
     boolean $assertionsDisabled -> e
     java.lang.String[] parameters -> d
     java.lang.String type -> c
@@ -93627,7 +92561,7 @@
     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.B$c:
+com.android.tools.r8.naming.MemberNaming$Signature -> com.android.tools.r8.naming.x$c:
     java.lang.String name -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():103:103 -> <clinit>
@@ -93641,13 +92575,13 @@
     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.MemberNamingStrategy -> com.android.tools.r8.naming.C:
+com.android.tools.r8.naming.MemberNamingStrategy -> com.android.tools.r8.naming.y:
     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.F:
+com.android.tools.r8.naming.MethodNameMinifier -> com.android.tools.r8.naming.B:
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> d
     java.util.Map renaming -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -93682,68 +92616,67 @@
     284:285:void lambda$assignNamesToClassesMethods$4(com.android.tools.r8.graph.DexClass):234 -> a
     289:290:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):229:230 -> a
     291:294:void lambda$renameMethodsInUnrelatedClasspathClasses$5(com.android.tools.r8.graph.DexClasspathClass):246:249 -> a
-    295:299:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):297:301 -> a
-    300:300:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):407:407 -> a
-    300:300:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):301 -> a
-    301:304:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState) -> a
+    295:299:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):302:306 -> a
+    300:300:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):416:416 -> a
+    300:300:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):306 -> a
+    301:304:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):306:309 -> a
     305:308:void com.android.tools.r8.naming.MethodReservationState.reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):42:45 -> a
-    305:308:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):304 -> a
-    309:309:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$7(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):298:298 -> a
-    310:320:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):311:321 -> a
-    321:330:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):335:344 -> a
-    321:330:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):326 -> a
-    331:331:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":664,"2":665,"3":666}}
-    664:664:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):344:344 -> a
-    664:664:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):326 -> a
-    665:665:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):344:344 -> a
-    665:665:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):326 -> a
-    666:666:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):344:344 -> a
-    666:666:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):326 -> a
-    332:332:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):345:345 -> a
-    332:332:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):326 -> a
-    333:333:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):327:327 -> a
-    334:334:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":667,"2":668,"3":669}}
-    667:667:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):327:327 -> a
-    668:668:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):327:327 -> a
-    669:669:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):327:327 -> a
-    661:663:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):327:329 -> a
-    670:677:void renameNonReboundReferences(java.util.concurrent.ExecutorService):351:358 -> a
-    678:678:void lambda$renameNonReboundReferences$8(java.util.Map,com.android.tools.r8.graph.DexMethod):356:356 -> a
-    679:714:void renameNonReboundMethodReference(com.android.tools.r8.graph.DexMethod,java.util.Map):363:398 -> a
-    715:715:boolean lambda$renameNonReboundMethodReference$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):395:395 -> a
+    305:308:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):309 -> a
+    309:309:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$7(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):303:303 -> a
+    310:320:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):316:326 -> a
+    321:334:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):340:353 -> a
+    321:334:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):331 -> a
+    335:335:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":673,"2":674,"3":675}}
+    673:673:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):353:353 -> a
+    673:673:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):331 -> a
+    674:674:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):353:353 -> a
+    674:674:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):331 -> a
+    675:675:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):353:353 -> a
+    675:675:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):331 -> a
+    336:336:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):354:354 -> a
+    336:336:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):331 -> a
+    337:337:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):332:332 -> a
+    338:338:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":676,"2":677,"3":678}}
+    676:676:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):332:332 -> a
+    677:677:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):332:332 -> a
+    678:678:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):332:332 -> a
+    670:672:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):332:334 -> a
+    679:686:void renameNonReboundReferences(java.util.concurrent.ExecutorService):360:367 -> a
+    687:687:void lambda$renameNonReboundReferences$8(java.util.Map,com.android.tools.r8.graph.DexMethod):365:365 -> a
+    688:723:void renameNonReboundMethodReference(com.android.tools.r8.graph.DexMethod,java.util.Map):372:407 -> a
+    724:724:boolean lambda$renameNonReboundMethodReference$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):404:404 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):91:91 -> b
     2:2:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):157:157 -> b
     3:3:java.util.function.Function getNamingKeyTransform():165:165 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> b
     4:4:java.util.function.Function getNamingKeyTransform():165 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:6:java.util.function.Function getNamingKeyTransform():166:167 -> b
-    7:19:void lambda$reserveNamesInClasses$6(com.android.tools.r8.graph.DexClass):279:291 -> b
-    20:20:void lambda$reserveNamesInClasses$6(com.android.tools.r8.graph.DexClass):288:288 -> b
+    7:19:void lambda$reserveNamesInClasses$6(com.android.tools.r8.graph.DexClass):284:296 -> b
+    20:20:void lambda$reserveNamesInClasses$6(com.android.tools.r8.graph.DexClass):293:293 -> b
     1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):91:91 -> c
     2:3:java.util.function.Function getReservationKeyTransform():154:155 -> c
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> c
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> c
     4:4:java.util.function.Function getReservationKeyTransform():155 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:8:java.util.function.Function getReservationKeyTransform():157:160 -> c
     9:9:java.lang.Object lambda$getReservationKeyTransform$1(com.android.tools.r8.graph.DexMethod):160:160 -> c
     1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):91:91 -> d
     2:5:void renameMethodsInUnrelatedClasspathClasses():241:244 -> d
     1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):91:91 -> e
-    2:4:void reserveNamesInClasses():275:277 -> e
-    5:5:void reserveNamesInClasses():276:276 -> e
-com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> com.android.tools.r8.naming.D:
+    2:5:void reserveNamesInClasses():276:276 -> e
+    9:11:void reserveNamesInClasses():280:282 -> e
+    12:12:void reserveNamesInClasses():281:281 -> e
+com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> com.android.tools.r8.naming.z:
     java.util.Map renaming -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):170:170 -> <init>
     2:3:void <init>(java.util.Map):174:175 -> <init>
     1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():179:179 -> a
-com.android.tools.r8.naming.MethodNameMinifier$State -> com.android.tools.r8.naming.E:
+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):95:95 -> <init>
     1:1:com.android.tools.r8.graph.DexType getFrontier(com.android.tools.r8.graph.DexType):117:117 -> a
-com.android.tools.r8.naming.MethodNamingState -> com.android.tools.r8.naming.I:
+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
@@ -93760,8 +92693,7 @@
     1:3:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):71:73 -> b
     4:15:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):83:94 -> b
     1:6:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):111:116 -> d
-com.android.tools.r8.naming.MethodNamingState$1 -> com.android.tools.r8.naming.G:
-com.android.tools.r8.naming.MethodNamingState$InternalNewNameState -> com.android.tools.r8.naming.H:
+com.android.tools.r8.naming.MethodNamingState$InternalNewNameState -> com.android.tools.r8.naming.C:
     java.util.Map originalToRenamedNames -> c
     java.util.Map usedBy -> d
     int dictionaryIndex -> f
@@ -93782,7 +92714,7 @@
     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.J:
+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>
@@ -93790,7 +92722,7 @@
     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 getInternalState(com.android.tools.r8.graph.DexMethod):23:24 -> b
     1:2:java.lang.Object getOrCreateInternalState(com.android.tools.r8.graph.DexMethod):28:29 -> c
-com.android.tools.r8.naming.MethodReservationState -> com.android.tools.r8.naming.L:
+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:1:com.android.tools.r8.naming.MethodReservationState createRoot(java.util.function.Function):33:33 -> a
@@ -93799,7 +92731,7 @@
     9:9:com.android.tools.r8.naming.MethodReservationState$InternalReservationState createInternalState(com.android.tools.r8.graph.DexMethod):77:77 -> a
     9:9:java.lang.Object createInternalState(com.android.tools.r8.graph.DexMethod):19 -> a
     1:7:java.util.Set getReservedNamesFor(com.android.tools.r8.graph.DexMethod):64:70 -> d
-com.android.tools.r8.naming.MethodReservationState$InternalReservationState -> com.android.tools.r8.naming.K:
+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
@@ -93809,7 +92741,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.M:
+com.android.tools.r8.naming.MinifiedRenaming -> com.android.tools.r8.naming.H:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> g
     java.util.Map packageRenaming -> e
@@ -93829,7 +92761,7 @@
     41:51:void lambda$toString$1(java.lang.StringBuilder,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexString):150:160 -> a
     1:35:boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod):104:138 -> b
     1:16:java.lang.String toString():147:162 -> toString
-com.android.tools.r8.naming.Minifier -> com.android.tools.r8.naming.T:
+com.android.tools.r8.naming.Minifier -> com.android.tools.r8.naming.N:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():38:38 -> <clinit>
@@ -93842,7 +92774,7 @@
     45:45:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReachableInterface(java.util.function.Consumer):843:843 -> 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.N:
+com.android.tools.r8.naming.Minifier$BaseMinificationNamingStrategy -> com.android.tools.r8.naming.I:
     java.util.List obfuscationDictionary -> a
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing mixedCasing -> c
     java.util.Set obfuscationDictionaryForLookup -> b
@@ -93850,7 +92782,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.O:
+com.android.tools.r8.naming.Minifier$MinificationClassNamingStrategy -> com.android.tools.r8.naming.J:
     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>
@@ -93871,20 +92803,20 @@
     180:180: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
     181:181: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.Q:
+com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy -> com.android.tools.r8.naming.L:
     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.P:
+com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy$1 -> com.android.tools.r8.naming.K:
     int dictionaryIndex -> b
     int nameIndex -> c
     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.S:
+com.android.tools.r8.naming.Minifier$MinifierMemberNamingStrategy -> com.android.tools.r8.naming.M:
     com.android.tools.r8.graph.DexItemFactory factory -> f
     com.android.tools.r8.graph.AppView appView -> e
     boolean desugaredLibraryRenaming -> g
@@ -93911,7 +92843,7 @@
     27:27:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):295 -> a
     28:30:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):295:297 -> a
     31:31:boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass):304:304 -> a
-com.android.tools.r8.naming.NamingLens -> com.android.tools.r8.naming.X:
+com.android.tools.r8.naming.NamingLens -> com.android.tools.r8.naming.Q:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>():37:37 -> <init>
@@ -93976,8 +92908,7 @@
     1:1:boolean isIdentityLens():137:137 -> c
     1:2:java.lang.String lookupInternalName(com.android.tools.r8.graph.DexType):141:142 -> d
     com.android.tools.r8.graph.DexString prefixRewrittenType(com.android.tools.r8.graph.DexType) -> e
-com.android.tools.r8.naming.NamingLens$1 -> com.android.tools.r8.naming.U:
-com.android.tools.r8.naming.NamingLens$IdentityLens -> com.android.tools.r8.naming.V:
+com.android.tools.r8.naming.NamingLens$IdentityLens -> com.android.tools.r8.naming.O:
     1:1:void <init>(com.android.tools.r8.naming.NamingLens$1):208:208 -> <init>
     2:2:void <init>():210:210 -> <init>
     java.lang.String lookupPackageName(java.lang.String) -> a
@@ -93987,7 +92918,7 @@
     4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):236:236 -> a
     boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod) -> b
     1:1:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):216:216 -> c
-com.android.tools.r8.naming.NamingLens$NonIdentityNamingLens -> com.android.tools.r8.naming.W:
+com.android.tools.r8.naming.NamingLens$NonIdentityNamingLens -> com.android.tools.r8.naming.P:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():181:181 -> <clinit>
@@ -93995,10 +92926,9 @@
     1:7:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):195:201 -> c
     8:11:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):536:539 -> c
     8:11:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):201 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:13:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):203:204 -> c
     14:14:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):196:196 -> c
-com.android.tools.r8.naming.PrefixRewritingNamingLens -> com.android.tools.r8.naming.Y:
+com.android.tools.r8.naming.PrefixRewritingNamingLens -> com.android.tools.r8.naming.S:
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> f
     int $r8$clinit -> g
@@ -94030,16 +92960,16 @@
     2:2:boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod):118:118 -> b
     1:2:com.android.tools.r8.graph.DexString getRenaming(com.android.tools.r8.graph.DexType):48:49 -> e
     1:2:com.android.tools.r8.graph.DexString prefixRewrittenType(com.android.tools.r8.graph.DexType):61 -> e
-com.android.tools.r8.naming.ProguardMap$Builder -> com.android.tools.r8.naming.Z:
+com.android.tools.r8.naming.ProguardMap$Builder -> com.android.tools.r8.naming.T:
     1:1:void <init>():12:12 -> <init>
     com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position) -> a
     com.android.tools.r8.naming.ProguardMap$Builder setCurrentMapVersion(com.android.tools.r8.naming.mappinginformation.MapVersionMappingInformation) -> a
-com.android.tools.r8.naming.ProguardMapError -> com.android.tools.r8.naming.a0:
+com.android.tools.r8.naming.ProguardMapError -> com.android.tools.r8.naming.U:
     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.e0:
+com.android.tools.r8.naming.ProguardMapMinifier -> com.android.tools.r8.naming.Y:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.SeedMapper seedMapper -> c
@@ -94058,7 +92988,7 @@
     3:3:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):97 -> a
     4:18:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):99:113 -> a
     19:33:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):105:119 -> a
-    34:34:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):189:189 -> a
+    34:34:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):193:193 -> a
     34:34:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):119 -> a
     35:38:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):127:130 -> a
     39:48:void computeDefaultInterfaceMethodMethods():331:340 -> a
@@ -94125,7 +93055,7 @@
     265:268:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):309:312 -> a
     1:1:void lambda$computeMapping$2(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):197:197 -> 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):258:258 -> b
-com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.b0:
+com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.V:
     java.util.Set mappedNames -> h
     boolean $assertionsDisabled -> i
     java.util.Map mappings -> g
@@ -94135,7 +93065,7 @@
     4:7:boolean lambda$next$0(java.util.function.Predicate,java.lang.String):406:409 -> a
     8:8:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):437:437 -> a
     1:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):418:432 -> b
-com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.c0:
+com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.W:
     boolean $assertionsDisabled -> k
     java.util.Map mappedNames -> i
     com.android.tools.r8.graph.DexItemFactory factory -> j
@@ -94166,7 +93096,7 @@
     44:44:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
     44:44: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):510 -> a
     45:63: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):510:528 -> a
-com.android.tools.r8.naming.ProguardMapMinifier$ProguardMapMinifiedRenaming -> com.android.tools.r8.naming.d0:
+com.android.tools.r8.naming.ProguardMapMinifier$ProguardMapMinifiedRenaming -> com.android.tools.r8.naming.X:
     java.util.Set unmappedReferences -> h
     java.util.Map classRenamingsMappingToDifferentName -> i
     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):562:565 -> <init>
@@ -94178,7 +93108,7 @@
     15:19:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):588:592 -> a
     15:19:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):575 -> a
     20:20:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):576:576 -> a
-com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.naming.g0:
+com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.naming.a0:
     java.lang.String line -> i
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> d
     com.android.tools.r8.naming.MapVersion version -> j
@@ -94405,7 +93335,7 @@
     1:1:boolean hasNext():106:106 -> f
     1:1:void skipWhitespace():192 -> f
     2:3:void skipWhitespace():192:193 -> f
-com.android.tools.r8.naming.ProguardMapReader$ParseException -> com.android.tools.r8.naming.f0:
+com.android.tools.r8.naming.ProguardMapReader$ParseException -> com.android.tools.r8.naming.Z:
     int lineNo -> b
     int lineOffset -> c
     java.lang.String msg -> e
@@ -94424,7 +93354,7 @@
     1223:1223:java.lang.String toString():610:610 -> toString
     1224:1224:java.lang.String toString():610:610 -> toString
     1221:1221:java.lang.String toString():610:610 -> toString
-com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.dO:
+com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.SM:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     com.android.tools.r8.utils.InternalOptions options -> c
     com.android.tools.r8.utils.Reporter reporter -> d
@@ -94469,7 +93399,7 @@
     13:15:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():82 -> a
     19:21:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):119:121 -> a
     19:21:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():82 -> a
-    22:24:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1759:1761 -> a
+    22:24:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1781:1783 -> a
     22:24:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):121 -> a
     22:24:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():82 -> a
     25:29:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):122:126 -> a
@@ -94488,8 +93418,7 @@
     42:42:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():83 -> a
     43:43:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():84:84 -> a
     1:1:com.android.tools.r8.StringConsumer access$200(com.android.tools.r8.naming.ProguardMapSupplier):23:23 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$1 -> com.android.tools.r8.internal.cO:
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.dO$a:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.SM$a:
     java.lang.StringBuilder contents -> b
     com.android.tools.r8.StringConsumer inner -> a
     boolean $assertionsDisabled -> c
@@ -94503,7 +93432,7 @@
     4:6:boolean com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker.validateProguardMapParses(java.lang.String):211:213 -> finished
     4:6:void finished(com.android.tools.r8.DiagnosticsHandler):205 -> finished
     7:8:void finished(com.android.tools.r8.DiagnosticsHandler):205:206 -> finished
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker$VerifyMappingFileHashResult -> com.android.tools.r8.internal.dO$a$a:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker$VerifyMappingFileHashResult -> com.android.tools.r8.internal.SM$a$a:
     boolean error -> a
     java.lang.String message -> b
     boolean $assertionsDisabled -> c
@@ -94515,7 +93444,7 @@
     2:3:java.lang.String getMessage():249:250 -> b
     1:1:boolean isError():245:245 -> c
     1:1:boolean isOk():241:241 -> d
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.eO:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.TM:
     java.lang.String id -> a
     java.lang.String hash -> b
     boolean $assertionsDisabled -> c
@@ -94524,7 +93453,7 @@
     2:6:void <init>(java.lang.String,java.lang.String):41:45 -> <init>
     1:1:java.lang.String getHash():55:55 -> a
     1:1:java.lang.String getId():50:50 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.gO:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.VM:
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
     1:3:void <init>():141:143 -> <init>
     1:1:java.lang.String lambda$getProviderOrDefault$0(com.android.tools.r8.MapIdEnvironment):148:148 -> a
@@ -94535,16 +93464,16 @@
     5:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build(com.android.tools.r8.MapIdProvider):168 -> a
     6:7:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build(com.android.tools.r8.MapIdProvider):168:169 -> a
     1:1:com.android.tools.r8.MapIdProvider getProviderOrDefault(com.android.tools.r8.MapIdProvider):148:148 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder$1 -> com.android.tools.r8.internal.fO:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder$1 -> com.android.tools.r8.internal.UM:
     java.lang.String val$hash -> a
     1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder,java.lang.String):152:152 -> <init>
     1:1:java.lang.String getMapHash():155:155 -> getMapHash
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.hO:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.WM:
     com.android.tools.r8.naming.ProguardMapSupplier this$0 -> a
     1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier):173:173 -> <init>
     1:1:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter.accept(java.lang.String):177:177 -> a
     1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):173 -> a
-com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.pQ:
+com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.ZO:
     int to -> b
     boolean isCardinal -> c
     int from -> a
@@ -94562,7 +93491,7 @@
     40:40:java.lang.String toString():36:36 -> toString
     41:41:java.lang.String toString():36:36 -> toString
     38:38:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.naming.RecordRewritingNamingLens -> com.android.tools.r8.naming.h0:
+com.android.tools.r8.naming.RecordRewritingNamingLens -> com.android.tools.r8.naming.b0:
     com.android.tools.r8.graph.DexItemFactory factory -> e
     boolean $assertionsDisabled -> f
     int $r8$clinit -> g
@@ -94583,7 +93512,7 @@
     1:1:boolean hasPrefixRewritingLogic():78:78 -> b
     2:2:boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod):93:93 -> b
     1:1:com.android.tools.r8.graph.DexString prefixRewrittenType(com.android.tools.r8.graph.DexType):83:83 -> e
-com.android.tools.r8.naming.ReservedFieldNamingState -> com.android.tools.r8.naming.j0:
+com.android.tools.r8.naming.ReservedFieldNamingState -> com.android.tools.r8.naming.d0:
     com.android.tools.r8.naming.ReservedFieldNamingState interfaceMinificationState -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():15:15 -> <clinit>
@@ -94612,13 +93541,13 @@
     17:17:com.android.tools.r8.naming.ReservedFieldNamingState$InternalState createInternalState():73:73 -> a
     17:17:java.lang.Object createInternalState():15 -> a
     1:3:void setInterfaceMinificationState(com.android.tools.r8.naming.ReservedFieldNamingState):66:68 -> b
-com.android.tools.r8.naming.ReservedFieldNamingState$InternalState -> com.android.tools.r8.naming.i0:
+com.android.tools.r8.naming.ReservedFieldNamingState$InternalState -> com.android.tools.r8.naming.c0:
     java.util.Map reservedNames -> a
     1:3:void <init>():76:78 -> <init>
     1:2:com.android.tools.r8.graph.DexString getReservedByName(com.android.tools.r8.graph.DexString):81:82 -> a
     3:3:void markReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):86:86 -> a
     4:4:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState$InternalState):90:90 -> a
-com.android.tools.r8.naming.SeedMapper -> com.android.tools.r8.naming.m0:
+com.android.tools.r8.naming.SeedMapper -> com.android.tools.r8.naming.f0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap mappings -> a
     java.util.Set mappedToDescriptorNames -> b
     com.android.tools.r8.utils.Reporter reporter -> c
@@ -94642,8 +93571,7 @@
     1:10:void verifyMappingsAreConflictFree():115:124 -> c
     11:11:void verifyMappingsAreConflictFree():121:121 -> c
     12:35:void verifyMappingsAreConflictFree():120:143 -> c
-com.android.tools.r8.naming.SeedMapper$1 -> com.android.tools.r8.naming.k0:
-com.android.tools.r8.naming.SeedMapper$Builder -> com.android.tools.r8.naming.l0:
+com.android.tools.r8.naming.SeedMapper$Builder -> com.android.tools.r8.naming.e0:
     java.util.Map map -> a
     java.util.Set mappedToDescriptorNames -> b
     com.android.tools.r8.utils.Reporter reporter -> c
@@ -94659,7 +93587,7 @@
     6:7:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):59:60 -> a
     6:7:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):40 -> a
     8:9:com.android.tools.r8.naming.SeedMapper build():73:74 -> a
-com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.oW:
+com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.NU:
     1:2:com.android.tools.r8.SourceFileProvider computeSourceFileProvider(com.android.tools.r8.SourceFileProvider,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.InternalOptions):20:21 -> a
     3:3:com.android.tools.r8.SourceFileProvider com.android.tools.r8.naming.SourceFileRewriter.rewriteToDefaultSourceFile(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     3:3:com.android.tools.r8.SourceFileProvider computeSourceFileProvider(com.android.tools.r8.SourceFileProvider,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.InternalOptions):21 -> a
@@ -94696,13 +93624,13 @@
     18:18:com.android.tools.r8.SourceFileProvider com.android.tools.r8.naming.SourceFileRewriter.rewriteToDefaultSourceFile(com.android.tools.r8.graph.DexItemFactory):61 -> a
     18:18:com.android.tools.r8.SourceFileProvider com.android.tools.r8.naming.SourceFileRewriter.computeNonCompatProvider(com.android.tools.r8.utils.InternalOptions):46 -> a
     18:18:com.android.tools.r8.SourceFileProvider computeSourceFileProvider(com.android.tools.r8.SourceFileProvider,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.InternalOptions):26 -> a
-com.android.tools.r8.naming.SourceFileRewriter$1 -> com.android.tools.r8.internal.nW:
+com.android.tools.r8.naming.SourceFileRewriter$1 -> com.android.tools.r8.internal.MU:
     java.lang.String val$renaming -> a
     boolean val$allowDiscard -> b
     1:1:void <init>(java.lang.String,boolean):65:65 -> <init>
     1:1:boolean allowDiscardingSourceFile():73:73 -> allowDiscardingSourceFile
     1:1:java.lang.String get(com.android.tools.r8.SourceFileEnvironment):68:68 -> get
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.Da:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.pa:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo TYPE_NAME_INSTANCE -> g
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo SIMPLE_NAME_INSTANCE -> f
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping mapping -> b
@@ -94743,7 +93671,7 @@
     2:2:boolean needsToRegisterReference():149 -> f
     1:1:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo none():139:139 -> g
     1:1:int hashCode():183:183 -> hashCode
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.Ca:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.oa:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NONE -> b
     boolean $assertionsDisabled -> h
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NAME -> c
@@ -94771,7 +93699,7 @@
     190:190:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):63:63 -> a
     191:191:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):54:54 -> a
     192:230:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):46:84 -> a
-com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.Pj:
+com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.wj:
     com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo FIELD_NAME_INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -94779,7 +93707,7 @@
     boolean needsToComputeName() -> e
     boolean needsToRegisterReference() -> f
     1:1:com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo forFieldName():21:21 -> g
-com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.KG:
+com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.HF:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo asClassNameComputationInfo() -> a
     1:2:com.android.tools.r8.graph.DexString computeNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):20:21 -> a
@@ -94797,7 +93725,7 @@
     boolean isRecordFieldNamesComputationInfo() -> d
     boolean needsToComputeName() -> e
     boolean needsToRegisterReference() -> f
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo -> com.android.tools.r8.internal.PQ:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo -> com.android.tools.r8.internal.yP:
     com.android.tools.r8.graph.DexField[] fields -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():38:38 -> <clinit>
@@ -94807,46 +93735,51 @@
     5:6:boolean com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo.fieldsMatchNames(java.lang.String[],com.android.tools.r8.graph.DexField[]):109:110 -> a
     5:6:com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo forFieldNamesAndFields(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[]):102 -> a
     7:9:com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo forFieldNamesAndFields(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[]):103:105 -> a
-    10:21:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction):122:133 -> a
-    22:22:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo.dexStringFromFieldNames(java.util.List,com.android.tools.r8.graph.DexItemFactory):93:93 -> a
-    22:22:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction):133 -> a
-    23:23:boolean lambda$internalComputeNameFor$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):122:122 -> a
+    10:16:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction):122:128 -> a
+    17:17:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    17:17:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction):128 -> a
+    18:23:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction):128:133 -> a
+    24:24:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo.dexStringFromFieldNames(java.util.List,com.android.tools.r8.graph.DexItemFactory):93:93 -> a
+    24:24:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction):133 -> a
+    25:25:boolean lambda$internalComputeNameFor$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):122:122 -> a
     com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo asRecordFieldNamesComputationInfo() -> c
     boolean isRecordFieldNamesComputationInfo() -> d
     boolean needsToComputeName() -> e
     boolean needsToRegisterReference() -> f
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$1 -> com.android.tools.r8.internal.MQ:
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.NQ:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.wP:
     1:1:void <init>(com.android.tools.r8.graph.DexField[]):70:70 -> <init>
     1:1:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):79:79 -> a
     2:4:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):84:86 -> a
-    5:5:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):85:85 -> a
-    6:10:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.NamingLens.lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):91:91 -> a
-    6:10:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):85 -> a
-    11:14:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):85:88 -> a
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.OQ:
+    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    5:5:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):86 -> a
+    6:6:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):86:86 -> a
+    7:7:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):85:85 -> a
+    8:12:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.NamingLens.lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):91:91 -> a
+    8:12:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):85 -> a
+    13:16:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):85:88 -> a
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.xP:
     java.lang.String[] fieldNames -> c
     1:1:void <init>(java.lang.String[],com.android.tools.r8.graph.DexField[],com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$1):46:46 -> <init>
     2:3:void <init>(java.lang.String[],com.android.tools.r8.graph.DexField[]):52:53 -> <init>
     1:1:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):62:62 -> a
     2:2:java.lang.String lambda$internalComputeNameFor$0(int):62:62 -> a
-com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.R9:
+com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.G9:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> a
-    1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24:24 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():628:628 -> a
+    2:2:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24 -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Ba:
+com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.na:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
     boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Zg:
+com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Hg:
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
-com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.eh:
+com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Mg:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
     boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.In:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.nn:
     com.android.tools.r8.graph.DexReference reference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -94859,17 +93792,17 @@
     3:3:com.android.tools.r8.graph.DexReference getReference():56:56 -> b
     boolean isTypeResult() -> c
     1:1:com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult fromDexTypeBasedConstString(com.android.tools.r8.graph.DexType):33:33 -> c
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.Kn:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.pn:
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult -> com.android.tools.r8.internal.Ln:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult -> com.android.tools.r8.internal.qn:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
     com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult asTypeResult() -> a
     boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isTypeResult() -> c
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.x10:
+com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.NZ:
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
-com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.internal.Qc:
+com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.internal.sc:
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>(com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$1):12:12 -> <init>
@@ -94878,12 +93811,14 @@
     1:1:void deserialize(com.android.tools.r8.naming.MapVersion,java.util.function.Consumer):64 -> a
     2:2:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder.build():20:20 -> a
     2:2:void deserialize(com.android.tools.r8.naming.MapVersion,java.util.function.Consumer):65 -> a
-    3:3:void deserialize(com.android.tools.r8.naming.MapVersion,java.util.function.Consumer):65:65 -> a
-    4:4:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):51:51 -> a
+    3:3:void com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.<init>(com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$1):12:12 -> a
+    3:3:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder.build():20 -> a
+    3:3:void deserialize(com.android.tools.r8.naming.MapVersion,java.util.function.Consumer):65 -> a
+    4:4:void deserialize(com.android.tools.r8.naming.MapVersion,java.util.function.Consumer):65:65 -> a
+    5:5:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):51:51 -> a
     boolean isCompilerSynthesizedMappingInformation() -> f
     1:3:java.lang.String serialize():56:58 -> i
-com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$1 -> com.android.tools.r8.internal.Oc:
-com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder -> com.android.tools.r8.internal.Pc:
+com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder -> com.android.tools.r8.internal.rc:
     1:1:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation build():20:20 -> a
 com.android.tools.r8.naming.mappinginformation.FileNameInformation -> com.android.tools.r8.naming.mappinginformation.a:
     java.lang.String fileName -> a
@@ -94949,7 +93884,7 @@
     1:1:com.android.tools.r8.origin.Origin getOrigin():21:21 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():26:26 -> getPosition
     1:1:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notAllowedCombination(com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.naming.mappinginformation.MappingInformation,int):98:98 -> notAllowedCombination
-com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation -> com.android.tools.r8.internal.uL:
+com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation -> com.android.tools.r8.internal.qK:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap positions -> a
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> b
     1:1:void <clinit>():17:17 -> <clinit>
@@ -94962,7 +93897,10 @@
     5:5:com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation create(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap):66:66 -> a
     6:6:boolean com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation.isSupported(com.android.tools.r8.naming.MapVersion):70:70 -> a
     6:6:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):75 -> a
-    7:15:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):76:84 -> a
+    7:12:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):76:81 -> a
+    13:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.<init>():176:176 -> a
+    13:13:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):81 -> a
+    14:15:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):83:84 -> a
     16:16:com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation.create(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap):66:66 -> a
     16:16:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):95 -> a
     17:17:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):95:95 -> a
@@ -94979,7 +93917,7 @@
     120:120:void lambda$deserialize$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.util.Map$Entry):92:92 -> a
     com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation asOutlineCallsiteInformation() -> c
     1:9:java.lang.String serialize():35:43 -> i
-com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation -> com.android.tools.r8.internal.wL:
+com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation -> com.android.tools.r8.internal.sK:
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -94988,7 +93926,7 @@
     1:1:void deserialize(com.android.tools.r8.naming.MapVersion,java.util.function.Consumer):44 -> a
     2:2:void deserialize(com.android.tools.r8.naming.MapVersion,java.util.function.Consumer):45:45 -> a
     1:3:java.lang.String serialize():24:26 -> i
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation -> com.android.tools.r8.internal.GU:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation -> com.android.tools.r8.internal.ZS:
     java.util.List actions -> b
     java.util.List conditions -> a
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> c
@@ -95190,18 +94128,18 @@
     1:9:java.lang.String serialize():57:65 -> i
     1:1:java.util.List getActions():47:47 -> j
     1:1:java.util.List getConditions():43:43 -> k
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder -> com.android.tools.r8.internal.BU:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder -> com.android.tools.r8.internal.US:
     java.util.List actions -> b
     java.util.List conditions -> a
     1:4:void <init>():112:115 -> <init>
     1:1:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder addCondition(com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition):118:118 -> a
     2:2:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder addRewriteAction(com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction):123:123 -> a
     3:3:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation build():128:128 -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition -> com.android.tools.r8.internal.CU:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition -> com.android.tools.r8.internal.VS:
     1:1:void <init>():132:132 -> <init>
     boolean evaluate(com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl) -> a
     com.android.tools.r8.com.google.gson.JsonPrimitive serialize() -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction -> com.android.tools.r8.internal.DU:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction -> com.android.tools.r8.internal.WS:
     int numberOfFrames -> b
     1:2:void <init>(int):240:241 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonElement serialize():250:250 -> a
@@ -95218,13 +94156,13 @@
     509:509:com.android.tools.r8.com.google.gson.JsonElement serialize():250:250 -> a
     503:503:com.android.tools.r8.com.google.gson.JsonElement serialize():250:250 -> a
     510:510:void evaluate(com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder):265:265 -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction -> com.android.tools.r8.internal.EU:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction -> com.android.tools.r8.internal.XS:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():203:203 -> <clinit>
     1:1:void <init>():203:203 -> <init>
     void evaluate(com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder) -> a
     com.android.tools.r8.com.google.gson.JsonElement serialize() -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition -> com.android.tools.r8.internal.FU:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition -> com.android.tools.r8.internal.YS:
     com.android.tools.r8.references.ClassReference classReference -> a
     1:2:void <init>(com.android.tools.r8.references.ClassReference):167:168 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonPrimitive serialize():173:173 -> a
@@ -95248,7 +94186,7 @@
     186:186:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition deserialize(java.lang.String):193 -> a
     187:187:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition deserialize(java.lang.String):193:193 -> a
     193:193:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition create(com.android.tools.r8.references.ClassReference):199:199 -> a
-com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation -> com.android.tools.r8.internal.H10:
+com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation -> com.android.tools.r8.internal.XZ:
     java.lang.String id -> a
     java.lang.String payload -> b
     1:3:void <init>(java.lang.String,java.lang.String):16:18 -> <init>
@@ -95258,20 +94196,20 @@
     1:1:java.lang.String serialize():32:32 -> i
     1:1:java.lang.String getId():23:23 -> j
     1:1:java.lang.String getPayload():27:27 -> k
-com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Xl:
+com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Al:
     void parsedIdentifier(java.lang.String) -> a
     java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String) -> a
     void parsedSymbol(char) -> a
     java.lang.Object parsedTypeName(java.lang.String,com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition) -> a
     void stop() -> a
     void start() -> b
-com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Xl$a:
+com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Al$a:
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition MEMBER_ANNOTATION -> d
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition ENCLOSING_INNER_OR_TYPE_ANNOTATION -> c
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition CLASS_SUPER_OR_INTERFACE_ANNOTATION -> b
     1:3:void <clinit>():15:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):14:14 -> <init>
-com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.Zl:
+com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.Cl:
     com.android.tools.r8.naming.signature.GenericSignatureAction actions -> a
     char[] buffer -> e
     int pos -> f
@@ -95387,7 +94325,7 @@
     123:123:void parseMethodSignature(java.lang.String):103:103 -> c
     128:138:void scanSymbol():364:374 -> c
     1:17:void updateFormalTypeParameter():175:191 -> d
-com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.am:
+com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.Dl:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens namingLens -> b
     com.android.tools.r8.graph.GenericSignatureContextBuilder contextBuilder -> c
@@ -95395,7 +94333,6 @@
     1:11:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):45:55 -> a
     12:12:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
     12:12:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):55 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:22:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):55:64 -> a
     23:23:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):61:61 -> a
     24:24:boolean lambda$run$0(java.util.function.Predicate,com.android.tools.r8.graph.DexType):57:57 -> a
@@ -95417,7 +94354,7 @@
     73:76:void lambda$run$4(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):99:102 -> a
     77:77:void lambda$run$4(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):96:96 -> a
     78:78:void lambda$run$4(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
-com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.I9:
+com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.y9:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -95427,63 +94364,62 @@
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):52:52 -> <init>
     2:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):47:57 -> <init>
-    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMember.getContextType():36:36 -> a
-    1:1:java.lang.Boolean lambda$publicizeMethod$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass,java.lang.Boolean):181 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:java.lang.Boolean lambda$publicizeMethod$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass,java.lang.Boolean):181:181 -> a
-    3:4:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):76:77 -> a
-    5:9:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):82:86 -> a
-    10:10:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReachableInterface(java.util.function.Consumer):843:843 -> a
-    10:10:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):86 -> a
-    11:14:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):87:90 -> a
-    15:15:void lambda$run$0(com.android.tools.r8.graph.DexClass):86:86 -> a
-    16:20:void publicizeType(com.android.tools.r8.graph.DexType):98:102 -> a
-    21:21:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):106:106 -> a
-    22:22:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():43:43 -> a
-    22:22:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94 -> a
-    22:22:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):107 -> a
-    23:23:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
-    23:23:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):107 -> a
-    24:24:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):111:111 -> a
-    25:25:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
-    25:25:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):111 -> a
-    26:43:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):114:131 -> a
-    44:52:void com.android.tools.r8.graph.DexClass.replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):1051:1059 -> a
-    44:52:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):129 -> a
-    53:54:void lambda$publicizeClass$1(java.util.Set,com.android.tools.r8.graph.ProgramMethod):117:118 -> a
-    55:55:void publicizeField(com.android.tools.r8.graph.ProgramField):136:136 -> a
-    56:56:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():225:225 -> a
-    56:56:void publicizeField(com.android.tools.r8.graph.ProgramField):137 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    57:60:void publicizeField(com.android.tools.r8.graph.ProgramField):140:143 -> a
-    61:61:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
-    61:61:void publicizeField(com.android.tools.r8.graph.ProgramField):147 -> a
-    62:90:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):151:179 -> a
-    91:91:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):176:176 -> a
-    92:92:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.DexClassAndMethod.getAccessFlags():11:11 -> a
-    92:92:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94 -> a
+    1:2:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):76:77 -> a
+    3:7:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):82:86 -> a
+    8:8:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReachableInterface(java.util.function.Consumer):843:843 -> a
+    8:8:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):86 -> a
+    9:12:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):87:90 -> a
+    13:13:void lambda$run$0(com.android.tools.r8.graph.DexClass):86:86 -> a
+    14:18:void publicizeType(com.android.tools.r8.graph.DexType):98:102 -> a
+    19:19:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):106:106 -> a
+    20:20:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():43:43 -> a
+    20:20:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94 -> a
+    20:20:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):107 -> a
+    21:21:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
+    21:21:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):107 -> a
+    22:22:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):111:111 -> a
+    23:23:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
+    23:23:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):111 -> a
+    24:41:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):114:131 -> a
+    42:50:void com.android.tools.r8.graph.DexClass.replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):1060:1068 -> a
+    42:50:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):129 -> a
+    51:52:void lambda$publicizeClass$1(java.util.Set,com.android.tools.r8.graph.ProgramMethod):117:118 -> a
+    53:54:void publicizeField(com.android.tools.r8.graph.ProgramField):136:137 -> a
+    55:55:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():225:225 -> a
+    55:55:void publicizeField(com.android.tools.r8.graph.ProgramField):137 -> a
+    56:59:void publicizeField(com.android.tools.r8.graph.ProgramField):140:143 -> a
+    60:60:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
+    60:60:void publicizeField(com.android.tools.r8.graph.ProgramField):147 -> a
+    61:89:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):151:179 -> a
+    90:90:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):176:176 -> a
+    91:91:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.DexClassAndMethod.getAccessFlags():11:11 -> a
+    91:91:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94 -> a
+    91:91:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    92:92:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
     92:92:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):184 -> a
-    93:93:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
-    93:93:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):184 -> a
-    94:96:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):188:190 -> a
-    97:97:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.DexClassAndMethod.getAccessFlags():11:11 -> a
-    97:97:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94 -> a
+    93:95:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):188:190 -> a
+    96:96:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.DexClassAndMethod.getAccessFlags():11:11 -> a
+    96:96:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94 -> a
+    96:96:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):195 -> a
+    97:97:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
     97:97:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):195 -> a
-    98:98:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
-    98:98:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):195 -> a
-    99:113:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):202:216 -> a
-    114:114:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.DexClassAndMethod.getAccessFlags():11:11 -> a
-    114:114:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94 -> a
+    98:112:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):202:216 -> a
+    113:113:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.DexClassAndMethod.getAccessFlags():11:11 -> a
+    113:113:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94 -> a
+    113:113:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):217 -> a
+    114:114:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
     114:114:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):217 -> a
-    115:115:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
-    115:115:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):217 -> a
-    116:116:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):219:219 -> a
-    117:117:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.DexClassAndMethod.getAccessFlags():11:11 -> a
-    117:117:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94 -> a
+    115:115:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):219:219 -> a
+    116:116:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.DexClassAndMethod.getAccessFlags():11:11 -> a
+    116:116:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94 -> a
+    116:116:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):166 -> a
+    117:117:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
     117:117:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):166 -> a
-    118:118:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
-    118:118:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):166 -> a
-com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.bk:
+    118:118:java.lang.Boolean lambda$publicizeMethod$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass,java.lang.Boolean):181:181 -> a
+    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMember.getContextType():36:36 -> a
+    119:119:java.lang.Boolean lambda$publicizeMethod$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass,java.lang.Boolean):181 -> a
+    120:120:java.lang.Boolean lambda$publicizeMethod$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass,java.lang.Boolean):181:181 -> a
+com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.Hj:
     boolean $assertionsDisabled -> g
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
     1:1:void <clinit>():23:23 -> <clinit>
@@ -95492,27 +94428,28 @@
     com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod) -> a
     1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):60:60 -> a
     2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):70:70 -> a
+    3:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):78:78 -> a
+    4:4:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    4:4:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):78 -> a
     1:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):46:50 -> b
     6:6:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.FieldRebindingIdentityLens.getReboundFieldReference(com.android.tools.r8.graph.DexField):55:55 -> b
     6:6:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):50 -> b
     7:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):50:51 -> b
     9:9:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):65:65 -> b
-    10:10:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):75:75 -> b
-    11:11:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):80:80 -> b
+    10:10:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):83:83 -> b
+    1:3:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):106:108 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):101:101 -> d
+    com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
     boolean hasCodeRewritings() -> e
-    com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-    1:1:boolean isContextFreeForMethods():106:106 -> f
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$1 -> com.android.tools.r8.internal.Zj:
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.ak:
+    1:1:boolean isContextFreeForMethods():113:113 -> g
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Gj:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> a
-    1:1:void <init>(com.android.tools.r8.optimize.FieldRebindingIdentityLens$1):109:109 -> <init>
-    2:2:void <init>():114:114 -> <init>
-    3:3:void <init>():111:111 -> <init>
-    1:1:void recordDefinitionForNonReboundFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):118:118 -> a
-    2:3:com.android.tools.r8.optimize.FieldRebindingIdentityLens build(com.android.tools.r8.graph.DexItemFactory):125:126 -> a
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.Qu:
+    1:1:void <init>(com.android.tools.r8.optimize.FieldRebindingIdentityLens$1):116:116 -> <init>
+    2:2:void <init>():121:121 -> <init>
+    3:3:void <init>():118:118 -> <init>
+    1:1:void recordDefinitionForNonReboundFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):125:125 -> a
+    2:3:com.android.tools.r8.optimize.FieldRebindingIdentityLens build(com.android.tools.r8.graph.DexItemFactory):132:133 -> a
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.ku:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> e
     com.android.tools.r8.graph.DexMethod target -> f
     boolean $assertionsDisabled -> g
@@ -95545,7 +94482,7 @@
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):98 -> g
     2:2:com.android.tools.r8.graph.DexMethod getTarget():39:39 -> g
     3:3:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):53:53 -> g
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.iE:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.pD:
     com.android.tools.r8.optimize.MemberRebindingLens$Builder lensBuilder -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -95554,12 +94491,9 @@
     1:1:void <clinit>():48:48 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView):56:61 -> <init>
     1:1:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    1:1:com.android.tools.r8.graph.DexField validMemberRebindingTargetFor(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexField):157 -> a
-    2:8:com.android.tools.r8.graph.DexField validMemberRebindingTargetFor(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexField):158:164 -> a
-    9:11:com.android.tools.r8.graph.DexField validMemberRebindingTargetFor(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexField):163:165 -> a
-    12:17:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.MemberRebindingAnalysis.firstLibraryClass(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):205:210 -> a
-    12:17:com.android.tools.r8.graph.DexField validMemberRebindingTargetFor(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexField):165 -> a
-    18:18:com.android.tools.r8.graph.DexField validMemberRebindingTargetFor(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexField):167:167 -> a
+    1:1:com.android.tools.r8.graph.DexField validMemberRebindingTargetFor(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexField):178 -> a
+    2:10:com.android.tools.r8.graph.DexField validMemberRebindingTargetFor(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexField):179:187 -> a
+    11:18:com.android.tools.r8.graph.DexField validMemberRebindingTargetFor(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexField):183:190 -> a
     19:19:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.optimize.MemberRebindingAnalysis):48:48 -> a
     20:20:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):70:70 -> a
     21:21:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
@@ -95567,129 +94501,133 @@
     22:24:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):70:72 -> a
     25:25:boolean com.android.tools.r8.ir.code.Invoke$Type.isDirect():181:181 -> a
     25:25:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):72 -> a
-    26:30:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):79:83 -> a
-    31:31:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):82:82 -> a
-    32:32:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
-    32:32:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):127 -> a
-    32:32:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):80 -> a
-    33:33:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):128:128 -> a
-    33:33:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):80 -> a
-    34:34:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):148:148 -> a
-    34:34:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):129 -> a
-    34:34:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):80 -> a
-    35:35:boolean com.android.tools.r8.ir.code.Invoke$Type.isSuper():193:193 -> a
-    35:35:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):148 -> a
-    35:35:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):129 -> a
-    35:35:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):80 -> a
-    36:36:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToAbstractMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):152:152 -> a
-    36:36:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):130 -> a
-    36:36:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):80 -> a
-    37:37:boolean com.android.tools.r8.ir.code.Invoke$Type.isSuper():193:193 -> a
-    37:37:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToAbstractMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):152 -> a
-    37:37:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):130 -> a
-    37:37:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):80 -> a
-    38:38:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):132:132 -> a
-    38:38:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):80 -> a
-    39:39:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):131:131 -> a
-    39:39:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):80 -> a
-    40:42:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):86:88 -> a
-    43:43:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):798:798 -> a
-    43:43:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):790 -> a
-    43:43:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):88 -> a
-    44:44:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):794:794 -> a
-    44:44:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):798 -> a
-    44:44:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):790 -> a
-    44:44:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):88 -> a
-    45:45:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeValuesMethod(com.android.tools.r8.graph.DexClassAndMethod):806:806 -> a
-    45:45:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):790 -> a
-    45:45:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):88 -> a
-    46:46:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeValuesMethod(com.android.tools.r8.graph.DexMethod):802:802 -> a
-    46:46:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeValuesMethod(com.android.tools.r8.graph.DexClassAndMethod):806 -> a
-    46:46:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):790 -> a
-    46:46:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):88 -> a
-    47:69:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):91:113 -> a
-    70:75:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):110:115 -> a
-    76:81:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.MemberRebindingAnalysis.firstLibraryClass(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):205:210 -> a
-    76:81:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):115 -> a
-    82:82:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):116:116 -> a
-    83:83:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):139:139 -> a
-    84:84:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
-    84:84:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    85:85:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):139:139 -> a
-    86:86:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> a
-    86:86:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    87:87:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):142:142 -> a
-    88:88:boolean lambda$isAccessibleInAllContexts$0(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):144:144 -> a
-    89:111:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):176:198 -> a
-    112:112:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod):222:222 -> a
-    113:124:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):227:238 -> a
-    125:189:void computeMethodRebinding(com.android.tools.r8.utils.BiForEachable,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):246:310 -> a
-    190:190:java.util.List lambda$computeMethodRebinding$1(com.android.tools.r8.graph.DexProgramClass):251:251 -> a
-    191:192:void lambda$computeMethodRebinding$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod):251:252 -> a
-    193:207:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):256:270 -> a
-    208:208:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):332:332 -> a
-    208:208:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):277 -> a
-    209:209:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    209:209:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):332 -> a
-    209:209:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):277 -> a
-    210:213:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):332:335 -> a
-    210:213:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):277 -> a
-    214:214:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):281:281 -> a
-    215:219:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.TriConsumer):352:356 -> a
-    215:219:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):280 -> a
-    220:221:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):285:286 -> a
-    222:231:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):399:408 -> a
-    222:231:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):288 -> a
-    232:235:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):403:406 -> a
-    232:235:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):288 -> a
-    236:236:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):294:294 -> a
-    237:237:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    237:237:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):295 -> a
-    238:244:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):296:302 -> a
-    245:245:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):300:300 -> a
-    246:246:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):298:298 -> a
-    247:247:int lambda$computeMethodRebinding$5(com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.Pair):314:314 -> a
-    248:259:void lambda$computeMethodRebinding$6(java.util.function.Function,com.android.tools.r8.graph.DexProgramClass,java.util.List):314:325 -> a
-    260:269:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):360:369 -> a
-    270:277:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):373:380 -> a
-    270:277:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):286 -> a
-    278:282:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):379:383 -> a
-    278:282:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):286 -> a
-    283:287:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):382:386 -> a
-    283:287:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):286 -> a
-    288:310:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):413:435 -> a
-    311:312:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$8(java.util.Set,com.android.tools.r8.graph.FieldAccessInfo):463:464 -> a
-    313:318:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):466:471 -> a
-    319:324:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):467:472 -> a
-    325:327:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):481:483 -> a
-    328:328:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):482:482 -> a
-    329:330:void lambda$computeNonReboundFieldReferences$9(java.util.Set,com.android.tools.r8.graph.ProgramMethod):485:486 -> a
-    1:1:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod):214:214 -> b
-    2:5:void recordNonReboundFieldAccesses(java.util.concurrent.ExecutorService):442:445 -> b
-    1:1:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):218:218 -> c
-    2:6:com.android.tools.r8.optimize.MemberRebindingLens run(java.util.concurrent.ExecutorService):449:453 -> c
-    1:18:boolean verifyFieldAccessCollectionContainsAllNonReboundFieldReferences(java.util.concurrent.ExecutorService):458:475 -> d
-com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.hE:
+    26:26:boolean com.android.tools.r8.ir.code.Invoke$Type.isSuper():193:193 -> a
+    26:26:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):76 -> a
+    27:34:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):76:83 -> a
+    35:51:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):79:95 -> a
+    52:52:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):309:309 -> a
+    52:52:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):95 -> a
+    53:57:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):101:105 -> a
+    58:58:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):104:104 -> a
+    59:59:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
+    59:59:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):148 -> a
+    59:59:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):102 -> a
+    60:60:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):149:149 -> a
+    60:60:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):102 -> a
+    61:61:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):169:169 -> a
+    61:61:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):150 -> a
+    61:61:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):102 -> a
+    62:62:boolean com.android.tools.r8.ir.code.Invoke$Type.isSuper():193:193 -> a
+    62:62:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):169 -> a
+    62:62:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):150 -> a
+    62:62:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):102 -> a
+    63:63:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToAbstractMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):173:173 -> a
+    63:63:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):151 -> a
+    63:63:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):102 -> a
+    64:64:boolean com.android.tools.r8.ir.code.Invoke$Type.isSuper():193:193 -> a
+    64:64:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToAbstractMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):173 -> a
+    64:64:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):151 -> a
+    64:64:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):102 -> a
+    65:65:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):153:153 -> a
+    65:65:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):102 -> a
+    66:66:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):152:152 -> a
+    66:66:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):102 -> a
+    67:69:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):108:110 -> a
+    70:70:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):798:798 -> a
+    70:70:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):790 -> a
+    70:70:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):110 -> a
+    71:71:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):794:794 -> a
+    71:71:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):798 -> a
+    71:71:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):790 -> a
+    71:71:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):110 -> a
+    72:72:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeValuesMethod(com.android.tools.r8.graph.DexClassAndMethod):806:806 -> a
+    72:72:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):790 -> a
+    72:72:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):110 -> a
+    73:73:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeValuesMethod(com.android.tools.r8.graph.DexMethod):802:802 -> a
+    73:73:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeValuesMethod(com.android.tools.r8.graph.DexClassAndMethod):806 -> a
+    73:73:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):790 -> a
+    73:73:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):110 -> a
+    74:96:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):113:135 -> a
+    97:103:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):131:137 -> a
+    104:104:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):160:160 -> a
+    105:105:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
+    105:105:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):160 -> a
+    106:106:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):160:160 -> a
+    107:107:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> a
+    107:107:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):160 -> a
+    108:108:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):163:163 -> a
+    109:109:boolean lambda$isAccessibleInAllContexts$0(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):165:165 -> a
+    110:111:com.android.tools.r8.graph.DexType firstLibraryClassOrFirstInterfaceTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):200:201 -> a
+    112:117:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.MemberRebindingAnalysis.firstLibraryClass(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):239:244 -> a
+    112:117:com.android.tools.r8.graph.DexType firstLibraryClassOrFirstInterfaceTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):202 -> a
+    118:140:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):210:232 -> a
+    141:141:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod):256:256 -> a
+    142:153:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):261:272 -> a
+    154:218:void computeMethodRebinding(com.android.tools.r8.utils.BiForEachable,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):280:344 -> a
+    219:219:java.util.List lambda$computeMethodRebinding$1(com.android.tools.r8.graph.DexProgramClass):285:285 -> a
+    220:221:void lambda$computeMethodRebinding$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod):285:286 -> a
+    222:236:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):290:304 -> a
+    237:237:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):366:366 -> a
+    237:237:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):311 -> a
+    238:238:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    238:238:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):366 -> a
+    238:238:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):311 -> a
+    239:242:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):366:369 -> a
+    239:242:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):311 -> a
+    243:243:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):315:315 -> a
+    244:248:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.TriConsumer):386:390 -> a
+    244:248:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):314 -> a
+    249:250:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):319:320 -> a
+    251:260:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):433:442 -> a
+    251:260:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):322 -> a
+    261:264:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):437:440 -> a
+    261:264:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):322 -> a
+    265:265:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):328:328 -> a
+    266:266:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    266:266:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):329 -> a
+    267:273:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):330:336 -> a
+    274:274:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):334:334 -> a
+    275:275:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):332:332 -> a
+    276:276:int lambda$computeMethodRebinding$5(com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.Pair):348:348 -> a
+    277:288:void lambda$computeMethodRebinding$6(java.util.function.Function,com.android.tools.r8.graph.DexProgramClass,java.util.List):348:359 -> a
+    289:298:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):394:403 -> a
+    299:306:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):407:414 -> a
+    299:306:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):320 -> a
+    307:311:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):413:417 -> a
+    307:311:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):320 -> a
+    312:316:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):416:420 -> a
+    312:316:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):320 -> a
+    317:339:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):447:469 -> a
+    340:341:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$8(java.util.Set,com.android.tools.r8.graph.FieldAccessInfo):497:498 -> a
+    342:347:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):500:505 -> a
+    348:353:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):501:506 -> a
+    354:356:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):515:517 -> a
+    357:357:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):516:516 -> a
+    358:359:void lambda$computeNonReboundFieldReferences$9(java.util.Set,com.android.tools.r8.graph.ProgramMethod):519:520 -> a
+    1:1:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod):248:248 -> b
+    2:5:void recordNonReboundFieldAccesses(java.util.concurrent.ExecutorService):476:479 -> b
+    1:1:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):252:252 -> c
+    2:6:com.android.tools.r8.optimize.MemberRebindingLens run(java.util.concurrent.ExecutorService):483:487 -> c
+    1:18:boolean verifyFieldAccessCollectionContainsAllNonReboundFieldReferences(java.util.concurrent.ExecutorService):492:509 -> d
+com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.oD:
     com.android.tools.r8.optimize.MemberRebindingAnalysis this$0 -> f
     java.util.Set val$nonReboundFieldReferences -> e
-    1:1:void <init>(com.android.tools.r8.optimize.MemberRebindingAnalysis,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.Set):487:487 -> <init>
+    1:1:void <init>(com.android.tools.r8.optimize.MemberRebindingAnalysis,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.Set):521:521 -> <init>
     void registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
-    1:1:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):491:491 -> a
+    1:1:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):525:525 -> a
     void registerInitClass(com.android.tools.r8.graph.DexType) -> b
     void registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
     void registerInstanceOf(com.android.tools.r8.graph.DexType) -> c
-    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):496:496 -> c
+    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):530:530 -> c
     void registerInvokeStatic(com.android.tools.r8.graph.DexMethod) -> d
     void registerNewInstance(com.android.tools.r8.graph.DexType) -> d
-    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):501:501 -> e
+    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):535:535 -> e
     void registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> f
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):506:506 -> g
-    1:5:void registerFieldReference(com.android.tools.r8.graph.DexField):510:514 -> i
-com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.lE:
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):540:540 -> g
+    1:5:void registerFieldReference(com.android.tools.r8.graph.DexField):544:548 -> i
+com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.rD:
     boolean $assertionsDisabled -> h
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> g
@@ -95703,60 +94641,61 @@
     6:9:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):77:80 -> a
     10:10:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):89:89 -> a
     11:11:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):99:99 -> a
-    12:13:com.android.tools.r8.optimize.MemberRebindingIdentityLens toRewrittenMemberRebindingIdentityLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):144:145 -> a
-    14:14:com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder com.android.tools.r8.optimize.MemberRebindingIdentityLens.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):49:49 -> a
-    14:14:com.android.tools.r8.optimize.MemberRebindingIdentityLens toRewrittenMemberRebindingIdentityLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):145 -> a
-    15:34:com.android.tools.r8.optimize.MemberRebindingIdentityLens toRewrittenMemberRebindingIdentityLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):146:165 -> a
-    35:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    35:35:void lambda$toRewrittenMemberRebindingIdentityLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):158 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:36:void lambda$toRewrittenMemberRebindingIdentityLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):161:161 -> a
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    37:37:void lambda$toRewrittenMemberRebindingIdentityLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):161 -> a
-    38:40:void lambda$toRewrittenMemberRebindingIdentityLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):160:162 -> a
-    41:41:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
-    41:41:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):148 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    42:42:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):151:151 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    43:43:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):151 -> a
-    44:46:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):150:152 -> a
+    12:12:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):107:107 -> a
+    13:13:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    13:13:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):107 -> a
+    14:15:com.android.tools.r8.optimize.MemberRebindingIdentityLens toRewrittenMemberRebindingIdentityLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):151:152 -> a
+    16:16:com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder com.android.tools.r8.optimize.MemberRebindingIdentityLens.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):49:49 -> a
+    16:16:com.android.tools.r8.optimize.MemberRebindingIdentityLens toRewrittenMemberRebindingIdentityLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):152 -> a
+    17:36:com.android.tools.r8.optimize.MemberRebindingIdentityLens toRewrittenMemberRebindingIdentityLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):153:172 -> a
+    37:37:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):155:155 -> a
+    38:38:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
+    38:38:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):155 -> a
+    39:39:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):158:158 -> a
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    40:40:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):158 -> a
+    41:43:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):157:159 -> a
+    44:44:void lambda$toRewrittenMemberRebindingIdentityLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):165:165 -> a
+    45:45:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
+    45:45:void lambda$toRewrittenMemberRebindingIdentityLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):165 -> a
+    46:46:void lambda$toRewrittenMemberRebindingIdentityLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):168:168 -> a
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    47:47:void lambda$toRewrittenMemberRebindingIdentityLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):168 -> a
+    48:50:void lambda$toRewrittenMemberRebindingIdentityLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):167:169 -> a
     1:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):59:63 -> b
     6:6:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.MemberRebindingIdentityLens.getReboundFieldReference(com.android.tools.r8.graph.DexField):68:68 -> b
     6:6:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):63 -> b
     7:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):63:64 -> b
     9:9:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):94:94 -> b
-    10:10:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):104:104 -> b
-    11:11:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):109:109 -> b
+    10:10:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):112:112 -> b
+    1:3:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):129:131 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):124:124 -> d
+    com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
     boolean hasCodeRewritings() -> e
-    com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-    1:1:boolean isContextFreeForMethods():129:129 -> f
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$1 -> com.android.tools.r8.internal.jE:
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.kE:
+    1:1:boolean isContextFreeForMethods():136:136 -> g
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.qD:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> d
     com.android.tools.r8.graph.GraphLens previousLens -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.optimize.MemberRebindingIdentityLens$1):168:168 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):178:178 -> <init>
-    3:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):173:180 -> <init>
-    1:1:void recordNonReboundFieldAccesses(com.android.tools.r8.graph.FieldAccessInfo):184:184 -> a
-    2:2:void lambda$recordNonReboundFieldAccesses$0(com.android.tools.r8.graph.FieldAccessInfo,com.android.tools.r8.graph.DexField):186:186 -> a
-    3:3:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):191:191 -> a
-    3:3:void lambda$recordNonReboundFieldAccesses$0(com.android.tools.r8.graph.FieldAccessInfo,com.android.tools.r8.graph.DexField):186 -> a
-    4:4:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):191:191 -> a
-    4:4:void access$300(com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):168 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundMethodAccess(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):196:196 -> a
-    5:5:void access$200(com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):168 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:15:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):201:210 -> a
-    16:16:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundMethodAccess(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):196:196 -> a
-    16:16:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):209 -> a
-    17:20:com.android.tools.r8.optimize.MemberRebindingIdentityLens build():219:222 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.nE:
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.optimize.MemberRebindingIdentityLens$1):175:175 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):185:185 -> <init>
+    3:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):180:187 -> <init>
+    1:1:void access$200(com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):175:175 -> a
+    2:2:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundMethodAccess(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):203:203 -> a
+    2:2:void access$200(com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):175 -> a
+    3:3:void access$300(com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):175:175 -> a
+    4:4:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):198:198 -> a
+    4:4:void access$300(com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):175 -> a
+    5:5:void recordNonReboundFieldAccesses(com.android.tools.r8.graph.FieldAccessInfo):191:191 -> a
+    6:6:void lambda$recordNonReboundFieldAccesses$0(com.android.tools.r8.graph.FieldAccessInfo,com.android.tools.r8.graph.DexField):193:193 -> a
+    7:7:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):198:198 -> a
+    7:7:void lambda$recordNonReboundFieldAccesses$0(com.android.tools.r8.graph.FieldAccessInfo,com.android.tools.r8.graph.DexField):193 -> a
+    8:17:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):208:217 -> a
+    18:18:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundMethodAccess(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):203:203 -> a
+    18:18:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):216 -> a
+    19:22:com.android.tools.r8.optimize.MemberRebindingIdentityLens build():226:229 -> a
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.tD:
     1:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):47:65 -> a
     20:20:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.MethodAccessInfoCollection):72:72 -> a
     21:21:com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder com.android.tools.r8.optimize.MemberRebindingIdentityLens.builder(com.android.tools.r8.graph.AppView):44:44 -> a
@@ -95770,7 +94709,7 @@
     31:31:void lambda$initializeMemberAccessInfoCollectionsForMemberRebinding$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):93:93 -> a
     32:32:void com.android.tools.r8.graph.UseRegistry.accept(com.android.tools.r8.graph.ProgramMethod):31:31 -> a
     32:32:void lambda$initializeMemberAccessInfoCollectionsForMemberRebinding$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):100 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.mE:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.sD:
     java.util.Set seenFieldReferences -> h
     java.util.Set seenMethodReferences -> i
     com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder methodAccessInfoCollectionBuilder -> g
@@ -95803,7 +94742,7 @@
     24:24:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> i
     24:24:void registerFieldAccess(com.android.tools.r8.graph.DexField):169 -> i
     25:31:void registerFieldAccess(com.android.tools.r8.graph.DexField):169:175 -> i
-com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.qE:
+com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.vD:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppView appView -> f
     java.util.Map methodMaps -> g
@@ -95813,46 +94752,50 @@
     1:1:com.android.tools.r8.optimize.MemberRebindingLens$Builder builder(com.android.tools.r8.graph.AppView):42:42 -> a
     2:2:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):57:57 -> a
     3:3:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):67:67 -> a
-    4:15:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):114:125 -> a
-    16:16:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):124:124 -> a
-    17:20:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):123:126 -> a
-    21:21:com.android.tools.r8.optimize.FieldRebindingIdentityLens toRewrittenFieldRebindingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):136:136 -> a
-    22:22:com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder com.android.tools.r8.optimize.FieldRebindingIdentityLens.builder():36:36 -> a
-    22:22:com.android.tools.r8.optimize.FieldRebindingIdentityLens toRewrittenFieldRebindingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):137 -> a
-    23:33:com.android.tools.r8.optimize.FieldRebindingIdentityLens toRewrittenFieldRebindingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):138:148 -> a
-    34:37:void lambda$toRewrittenFieldRebindingLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):141:144 -> a
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    38:38:void lambda$toRewrittenFieldRebindingLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):144 -> a
-    39:41:void lambda$toRewrittenFieldRebindingLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):143:145 -> a
+    4:4:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):75:75 -> a
+    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    5:5:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):75 -> a
+    6:17:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):121:132 -> a
+    18:18:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):131:131 -> a
+    19:22:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):130:133 -> a
+    23:23:com.android.tools.r8.optimize.FieldRebindingIdentityLens toRewrittenFieldRebindingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):143:143 -> a
+    24:24:com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder com.android.tools.r8.optimize.FieldRebindingIdentityLens.builder():36:36 -> a
+    24:24:com.android.tools.r8.optimize.FieldRebindingIdentityLens toRewrittenFieldRebindingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):144 -> a
+    25:35:com.android.tools.r8.optimize.FieldRebindingIdentityLens toRewrittenFieldRebindingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):145:155 -> a
+    36:36:void lambda$toRewrittenFieldRebindingLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):148:148 -> a
+    37:37:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    37:37:void lambda$toRewrittenFieldRebindingLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):148 -> a
+    38:38:void lambda$toRewrittenFieldRebindingLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):151:151 -> a
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    39:39:void lambda$toRewrittenFieldRebindingLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):151 -> a
+    40:42:void lambda$toRewrittenFieldRebindingLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):150:152 -> a
     com.android.tools.r8.optimize.MemberRebindingLens asMemberRebindingLens() -> b
     1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):62:62 -> b
-    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):72:72 -> b
-    3:3:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):78:78 -> b
-    4:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):99:103 -> b
-    9:9:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.MemberRebindingLens.getReboundFieldReference(com.android.tools.r8.graph.DexField):108:108 -> b
-    9:9:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):103 -> b
-    10:11:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):103:104 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):81:81 -> b
+    3:7:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):106:110 -> b
+    8:8:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.MemberRebindingLens.getReboundFieldReference(com.android.tools.r8.graph.DexField):115:115 -> b
+    8:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):110 -> b
+    9:10:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):110:111 -> b
+    1:3:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):89:91 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):84:84 -> d
-    com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-    1:1:boolean isContextFreeForMethods():89:89 -> f
-com.android.tools.r8.optimize.MemberRebindingLens$1 -> com.android.tools.r8.internal.oE:
-com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.pE:
+    com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
+    1:1:boolean isContextFreeForMethods():96:96 -> g
+com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.uD:
     java.util.Map methodMaps -> b
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():151:151 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.MemberRebindingLens$1):151:151 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView):158:158 -> <init>
-    3:8:void <init>(com.android.tools.r8.graph.AppView):154:159 -> <init>
-    1:7:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):164:170 -> a
-    8:8:java.util.Map lambda$map$0(com.android.tools.r8.ir.code.Invoke$Type):168:168 -> a
-    9:10:void recordNonReboundFieldAccesses(com.android.tools.r8.graph.FieldAccessInfo):174:175 -> a
-    11:11:void com.android.tools.r8.optimize.MemberRebindingLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):182:182 -> a
-    11:11:void lambda$recordNonReboundFieldAccesses$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):177 -> a
-    12:12:com.android.tools.r8.optimize.MemberRebindingLens build():186:186 -> a
-com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.oQ:
+    1:1:void <clinit>():158:158 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.MemberRebindingLens$1):158:158 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView):165:165 -> <init>
+    3:8:void <init>(com.android.tools.r8.graph.AppView):161:166 -> <init>
+    1:7:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):171:177 -> a
+    8:8:java.util.Map lambda$map$0(com.android.tools.r8.ir.code.Invoke$Type):175:175 -> a
+    9:10:void recordNonReboundFieldAccesses(com.android.tools.r8.graph.FieldAccessInfo):181:182 -> a
+    11:11:void com.android.tools.r8.optimize.MemberRebindingLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):189:189 -> a
+    11:11:void lambda$recordNonReboundFieldAccesses$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):184 -> a
+    12:12:com.android.tools.r8.optimize.MemberRebindingLens build():193:193 -> a
+com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.YO:
     com.android.tools.r8.graph.AppView appView -> n
     boolean $assertionsDisabled -> p
     java.util.Set publicizedMethods -> o
@@ -95860,26 +94803,30 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.optimize.PublicizerLens$1):16:16 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):22:24 -> <init>
     1:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):42:43 -> a
-    3:8:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):54:59 -> a
-    3:8:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):43 -> a
-    9:9:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> a
-    9:9:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):60 -> a
-    9:9:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):43 -> a
-    10:10:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):60:60 -> a
-    10:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):43 -> a
-    11:15:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):44:48 -> a
+    3:3:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):54:54 -> a
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):43 -> a
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    4:4:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):54 -> a
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):43 -> a
+    5:10:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):55:60 -> a
+    5:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):43 -> a
+    11:11:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> a
+    11:11:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):60 -> a
+    11:11:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):43 -> a
+    12:12:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):60:60 -> a
+    12:12:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):43 -> a
+    13:17:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):44:48 -> a
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
-    boolean isLegitimateToHaveEmptyMappings() -> k
-    1:1:com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder createBuilder():65:65 -> l
-com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.mQ:
-com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.nQ:
+    boolean isLegitimateToHaveEmptyMappings() -> m
+    1:1:com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder createBuilder():65:65 -> n
+com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.XO:
     java.util.Set publicizedMethods -> a
     1:1:void <init>(com.android.tools.r8.optimize.PublicizerLens$1):68:68 -> <init>
     2:2:void <init>():71:71 -> <init>
     3:3:void <init>():69:69 -> <init>
     1:4:com.android.tools.r8.graph.GraphLens build(com.android.tools.r8.graph.AppView):74:77 -> a
     5:5:void add(com.android.tools.r8.graph.DexMethod):81:81 -> a
-com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.t30:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.F10:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -95902,91 +94849,96 @@
     57:65:void lambda$run$1(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexProgramClass):88:96 -> a
     66:67:void lambda$run$3(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):104:105 -> a
     68:68:void lambda$run$2(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexEncodedMethod):105:105 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator -> com.android.tools.r8.internal.H2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator -> com.android.tools.r8.internal.G2:
     com.android.tools.r8.graph.AppView appView -> a
+    boolean $assertionsDisabled -> e
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner codeScanner -> b
-    com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection reprocessingCriteriaCollection -> c
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():35:35 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView):53:57 -> <init>
-    1:31:void initializeCodeScanner(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):66:96 -> a
-    32:39:void lambda$initializeCodeScanner$0(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Set):84:91 -> a
-    40:48:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):102:110 -> a
-    49:49:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isPostMethodProcessor():0:0 -> a
-    49:49:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):110 -> a
-    50:50:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):110:110 -> a
-    51:52:void publishDelayedReprocessingCriteria():115:116 -> a
-    53:54:void transferArgumentInformation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):120:121 -> a
-    55:55:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState.bottom():15:15 -> a
-    55:55:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.remove(com.android.tools.r8.graph.ProgramMethod):108 -> a
-    55:55:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.remove(com.android.tools.r8.graph.ProgramMethod):14 -> a
-    55:55:void transferArgumentInformation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):122 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    56:56:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.remove(com.android.tools.r8.graph.ProgramMethod):108:108 -> a
-    56:56:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.remove(com.android.tools.r8.graph.ProgramMethod):14 -> a
-    56:56:void transferArgumentInformation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):122 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    57:58:void transferArgumentInformation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):123:124 -> a
-    59:76:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):134:151 -> a
-    77:79:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.function.BiConsumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):199:201 -> a
-    77:79:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):151 -> a
-    80:80:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
-    80:80:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.function.BiConsumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):201 -> a
-    80:80:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):151 -> a
-    81:93:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.function.BiConsumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):201:213 -> a
-    81:93:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):151 -> a
-    94:111:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):166:183 -> a
-    112:115:void lambda$tearDownCodeScanner$2(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexMethodSignature):156:159 -> a
-    116:116:com.android.tools.r8.utils.collections.DexMethodSignatureSet lambda$tearDownCodeScanner$1(java.util.Set):158:158 -> a
-    117:119:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):227:229 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer -> com.android.tools.r8.internal.J2:
+    com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis effectivelyUnusedArgumentsAnalysis -> c
+    com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection reprocessingCriteriaCollection -> d
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView):57:61 -> <init>
+    1:36:void initializeCodeScanner(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):70:105 -> a
+    37:48:void lambda$initializeCodeScanner$0(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Set):89:100 -> a
+    49:61:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):111:123 -> a
+    62:62:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isPostMethodProcessor():0:0 -> a
+    62:62:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):123 -> a
+    63:63:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):123:123 -> a
+    64:65:void publishDelayedReprocessingCriteria():128:129 -> a
+    66:68:void transferArgumentInformation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):133:135 -> a
+    69:69:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState.bottom():15:15 -> a
+    69:69:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.remove(com.android.tools.r8.graph.ProgramMethod):108 -> a
+    69:69:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.remove(com.android.tools.r8.graph.ProgramMethod):14 -> a
+    69:69:void transferArgumentInformation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):135 -> a
+    70:70:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.remove(com.android.tools.r8.graph.ProgramMethod):108:108 -> a
+    70:70:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.remove(com.android.tools.r8.graph.ProgramMethod):14 -> a
+    70:70:void transferArgumentInformation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):135 -> a
+    71:72:void transferArgumentInformation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):136:137 -> a
+    73:90:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):147:164 -> a
+    91:93:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.function.BiConsumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):212:214 -> a
+    91:93:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):164 -> a
+    94:94:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
+    94:94:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.function.BiConsumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):214 -> a
+    94:94:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):164 -> a
+    95:111:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.function.BiConsumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):214:230 -> a
+    95:111:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):164 -> a
+    112:129:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):179:196 -> a
+    130:133:void lambda$tearDownCodeScanner$2(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexMethodSignature):169:172 -> a
+    134:134:com.android.tools.r8.utils.collections.DexMethodSignatureSet lambda$tearDownCodeScanner$1(java.util.Set):171:171 -> a
+    135:140:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):244:249 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer -> com.android.tools.r8.internal.I2:
     com.android.tools.r8.graph.AppView appView -> f
     boolean $assertionsDisabled -> h
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens graphLens -> g
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):43:45 -> <init>
+    1:1:void <clinit>():39:39 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):46:48 -> <init>
     void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField) -> a
     void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod) -> a
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer):36:36 -> a
-    2:14:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):53:65 -> a
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer):39:39 -> a
+    2:14:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):56:68 -> a
     15:19:void com.android.tools.r8.utils.Timing.time(java.lang.String,com.android.tools.r8.utils.ThrowingAction):379:383 -> a
-    15:19:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):65 -> a
-    20:22:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):67:69 -> a
+    15:19:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):68 -> a
+    20:22:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):70:72 -> a
     23:23:void com.android.tools.r8.utils.Timing.time(java.lang.String,com.android.tools.r8.utils.ThrowingAction):383:383 -> a
-    23:23:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):65 -> a
-    24:25:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupFields(com.android.tools.r8.graph.DexProgramClass):78:79 -> a
-    24:25:void fixupClass(com.android.tools.r8.graph.DexProgramClass):73 -> a
-    26:26:void fixupClass(com.android.tools.r8.graph.DexProgramClass):74:74 -> a
-    27:36:void lambda$fixupMethods$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):97:106 -> a
-    37:37:void lambda$fixupMethods$1(com.android.tools.r8.graph.MethodAccessFlags):105:105 -> a
-    38:38:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupOptimizationInfos(java.util.concurrent.ExecutorService):114:114 -> a
-    38:38:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):65 -> a
-    39:39:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.AppView.app():220:220 -> a
-    39:39:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupOptimizationInfos(java.util.concurrent.ExecutorService):114 -> a
-    39:39:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):65 -> a
-    40:42:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupOptimizationInfos(java.util.concurrent.ExecutorService):114:116 -> a
-    40:42:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):65 -> a
-    43:43:void com.android.tools.r8.ir.optimize.info.OptimizationFeedback.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):54:54 -> a
-    43:43:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupOptimizationInfos(java.util.concurrent.ExecutorService):116 -> a
-    43:43:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):65 -> a
-    44:44:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):149:149 -> a
-    45:45:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):154:154 -> a
-    46:46:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):159:159 -> a
-    47:47:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):179:179 -> a
+    23:23:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):68 -> a
+    24:25:void fixupClass(com.android.tools.r8.graph.DexProgramClass):76:77 -> a
+    26:26:void lambda$fixupFields$1(com.android.tools.r8.graph.DexEncodedField$Builder):84:84 -> a
+    27:37:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):106:116 -> a
+    38:38:void lambda$fixupMethods$3(com.android.tools.r8.graph.MethodAccessFlags):115:115 -> a
+    39:40:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupOptimizationInfos(java.util.concurrent.ExecutorService):124:125 -> a
+    39:40:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):68 -> a
+    41:41:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.AppView.app():220:220 -> a
+    41:41:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupOptimizationInfos(java.util.concurrent.ExecutorService):125 -> a
+    41:41:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):68 -> a
+    42:44:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupOptimizationInfos(java.util.concurrent.ExecutorService):125:127 -> a
+    42:44:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):68 -> a
+    45:45:void com.android.tools.r8.ir.optimize.info.OptimizationFeedback.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):54:54 -> a
+    45:45:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupOptimizationInfos(java.util.concurrent.ExecutorService):127 -> a
+    45:45:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):68 -> a
+    46:46:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):160:160 -> a
+    47:47:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):165:165 -> a
+    48:48:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):170:170 -> a
+    49:49:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):190:190 -> a
     com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType) -> b
-    1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens access$100(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer):36:36 -> b
-    2:3:void fixupMethods(com.android.tools.r8.graph.DexProgramClass):83:84 -> b
-    4:12:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupMethods$3(com.android.tools.r8.graph.DexEncodedMethod):86:94 -> b
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer$1 -> com.android.tools.r8.internal.I2:
-    com.android.tools.r8.graph.PrunedItems val$prunedItems -> a
-    com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer this$0 -> b
-    1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer,com.android.tools.r8.graph.PrunedItems):119:119 -> <init>
-    1:1:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):123:123 -> a
-    2:11:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):131:140 -> a
-    12:12:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.RewrittenPrototypeDescription.createMethodOptimizationInfoFixer():705:705 -> a
-    12:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):140 -> a
-    13:13:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):141:141 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner -> com.android.tools.r8.internal.K2:
+    1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens access$100(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer):39:39 -> b
+    2:2:void fixupFields(com.android.tools.r8.graph.DexProgramClass):83:83 -> b
+    3:3:void fixupFields(com.android.tools.r8.graph.DexProgramClass):82:82 -> b
+    4:10:void fixupFields(com.android.tools.r8.graph.DexProgramClass):81:87 -> b
+    11:11:void fixupFields(com.android.tools.r8.graph.DexProgramClass):86:86 -> b
+    12:12:void fixupFields(com.android.tools.r8.graph.DexProgramClass):85:85 -> b
+    13:13:void lambda$fixupFields$2(com.android.tools.r8.graph.DexEncodedField$Builder):88:88 -> b
+    14:22:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupMethods$5(com.android.tools.r8.graph.DexEncodedMethod):95:103 -> b
+    1:2:void fixupMethods(com.android.tools.r8.graph.DexProgramClass):92:93 -> c
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer$1 -> com.android.tools.r8.internal.H2:
+    com.android.tools.r8.graph.PrunedItems val$prunedItems -> b
+    com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer this$0 -> c
+    com.android.tools.r8.graph.GraphLens val$codeLens -> a
+    1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):130:130 -> <init>
+    1:1:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):134:134 -> a
+    2:11:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):142:151 -> a
+    12:12:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.RewrittenPrototypeDescription.createMethodOptimizationInfoFixer():677:677 -> a
+    12:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):151 -> a
+    13:13:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):152:152 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner -> com.android.tools.r8.internal.J2:
     com.android.tools.r8.ir.code.AliasedValueConfiguration aliasedValueConfiguration -> g
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory methodParameterFactory -> b
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> f
@@ -96134,255 +95086,257 @@
     164:171:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computePolymorphicMethodState(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom):313:320 -> a
     164:171:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):262 -> a
     164:171:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
-    172:173:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):268:269 -> a
-    172:173:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
-    174:174:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:119 -> a
-    174:174:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):273 -> a
-    174:174:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
-    175:175:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):275:275 -> a
-    175:175:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
-    176:176:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):370:370 -> a
-    176:176:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):270 -> a
-    176:176:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
-    177:177:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
-    177:177:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):371 -> a
-    177:177:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):270 -> a
-    177:177:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
-    178:178:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):371:371 -> a
-    178:178:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):270 -> a
+    172:177:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):268:273 -> a
+    172:177:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
+    178:178:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:119 -> a
+    178:178:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):273 -> a
     178:178:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
-    179:179:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
-    179:179:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):371 -> a
-    179:179:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):270 -> a
+    179:179:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):275:275 -> a
     179:179:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
-    180:180:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):364:364 -> a
+    180:180:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):370:370 -> a
     180:180:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):270 -> a
     180:180:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
-    181:181:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):277:277 -> a
+    181:181:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
+    181:181:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):371 -> a
+    181:181:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):270 -> a
     181:181:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
-    182:186:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):382:386 -> a
-    187:187:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria.alwaysReprocess():34:34 -> a
-    187:187:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):387 -> a
-    188:196:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):390:398 -> a
-    197:197:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):433:433 -> a
-    197:197:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
-    198:198:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
-    198:198:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):433 -> a
-    198:198:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
-    199:199:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):434:434 -> a
-    199:199:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
-    200:200:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.isUnknown():0:0 -> a
-    200:200:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):434 -> a
-    200:200:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
-    201:201:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    201:201:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):435 -> a
+    182:182:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):371:371 -> a
+    182:182:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):270 -> a
+    182:182:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
+    183:183:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    183:183:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):371 -> a
+    183:183:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):270 -> a
+    183:183:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
+    184:184:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):364:364 -> a
+    184:184:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):270 -> a
+    184:184:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
+    185:185:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):277:277 -> a
+    185:185:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):240 -> a
+    186:190:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):382:386 -> a
+    191:191:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria.alwaysReprocess():34:34 -> a
+    191:191:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):387 -> a
+    192:200:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):390:398 -> a
+    201:201:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):433:433 -> a
     201:201:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
-    202:202:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):440:440 -> a
+    202:202:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
+    202:202:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):433 -> a
     202:202:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
-    203:203:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    203:203:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):441 -> a
+    203:203:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):434:434 -> a
     203:203:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
-    204:206:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):444:446 -> a
-    204:206:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
+    204:204:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.isUnknown():0:0 -> a
+    204:204:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):434 -> a
+    204:204:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
+    205:205:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
+    205:205:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):435 -> a
+    205:205:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
+    206:206:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):440:440 -> a
+    206:206:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
     207:207:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    207:207:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):447 -> a
+    207:207:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):441 -> a
     207:207:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
-    208:208:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):448:448 -> a
-    208:208:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
-    209:209:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverParameterState.<init>(com.android.tools.r8.ir.analysis.type.DynamicType):22:22 -> a
-    209:209:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):448 -> a
-    209:209:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
-    210:228:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):392:410 -> a
-    229:229:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):459:459 -> a
-    229:229:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    230:230:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
-    230:230:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):459 -> a
-    230:230:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    231:231:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):460:460 -> a
-    231:231:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    232:232:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.isUnknown():0:0 -> a
-    232:232:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):460 -> a
-    232:232:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    233:233:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    233:233:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):461 -> a
+    208:210:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):444:446 -> a
+    208:210:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
+    211:211:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
+    211:211:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):447 -> a
+    211:211:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
+    212:212:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):448:448 -> a
+    212:212:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
+    213:213:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverParameterState.<init>(com.android.tools.r8.ir.analysis.type.DynamicType):22:22 -> a
+    213:213:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):448 -> a
+    213:213:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):393 -> a
+    214:232:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):392:410 -> a
+    233:233:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):459:459 -> a
     233:233:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    234:234:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):464:464 -> a
+    234:234:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
+    234:234:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):459 -> a
     234:234:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    235:235:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
-    235:235:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):464 -> a
+    235:235:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):460:460 -> a
     235:235:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    236:237:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):466:467 -> a
-    236:237:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    238:238:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    238:238:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):467 -> a
+    236:236:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.isUnknown():0:0 -> a
+    236:236:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):460 -> a
+    236:236:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    237:237:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
+    237:237:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):461 -> a
+    237:237:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    238:238:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):464:464 -> a
     238:238:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    239:239:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    239:239:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    239:239:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):467 -> a
+    239:239:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    239:239:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):464 -> a
     239:239:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    240:243:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):474:477 -> a
-    240:243:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    244:244:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):476:476 -> a
-    244:244:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    245:247:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):115:117 -> a
-    245:247:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
-    245:247:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    248:248:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.getVirtualRootMethod(com.android.tools.r8.graph.ProgramMethod):111:111 -> a
-    248:248:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):119 -> a
-    248:248:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
+    240:241:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):466:467 -> a
+    240:241:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    242:242:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    242:242:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):467 -> a
+    242:242:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    243:243:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    243:243:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    243:243:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):467 -> a
+    243:243:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    244:247:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):474:477 -> a
+    244:247:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    248:248:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):476:476 -> a
     248:248:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    249:249:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):118:118 -> a
-    249:249:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
-    249:249:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    250:260:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):116:126 -> a
-    250:260:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
-    250:260:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    261:261:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.isUnknown():0:0 -> a
-    261:261:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):126 -> a
-    261:261:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
-    261:261:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    262:263:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):128:129 -> a
-    262:263:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
-    262:263:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    264:264:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    264:264:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):479 -> a
-    264:264:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    265:266:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):481:482 -> a
-    265:266:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    267:267:com.android.tools.r8.ir.analysis.value.BottomValue com.android.tools.r8.ir.analysis.value.AbstractValue.bottom():16:16 -> a
-    267:267:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):25 -> a
-    267:267:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):482 -> a
-    267:267:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    268:268:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):25:25 -> a
-    268:268:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):482 -> a
+    249:251:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):115:117 -> a
+    249:251:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
+    249:251:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    252:252:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.getVirtualRootMethod(com.android.tools.r8.graph.ProgramMethod):111:111 -> a
+    252:252:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):119 -> a
+    252:252:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
+    252:252:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    253:253:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):118:118 -> a
+    253:253:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
+    253:253:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    254:264:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):116:126 -> a
+    254:264:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
+    254:264:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    265:265:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.isUnknown():0:0 -> a
+    265:265:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):126 -> a
+    265:265:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
+    265:265:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    266:267:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.isMethodParameterAlreadyUnknown(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):128:129 -> a
+    266:267:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):478 -> a
+    266:267:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    268:268:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
+    268:268:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):479 -> a
     268:268:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    269:270:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):483:484 -> a
+    269:270:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):481:482 -> a
     269:270:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    271:271:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState.<init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):23:23 -> a
-    271:271:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):484 -> a
+    271:271:com.android.tools.r8.ir.analysis.value.BottomValue com.android.tools.r8.ir.analysis.value.AbstractValue.bottom():16:16 -> a
+    271:271:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):25 -> a
+    271:271:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):482 -> a
     271:271:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    272:273:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):486:487 -> a
-    272:273:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    274:274:com.android.tools.r8.ir.analysis.value.BottomValue com.android.tools.r8.ir.analysis.value.AbstractValue.bottom():16:16 -> a
-    274:274:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState.<init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):33 -> a
-    274:274:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):487 -> a
-    274:274:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    275:275:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState.<init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):33:33 -> a
-    275:275:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):487 -> a
+    272:272:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):25:25 -> a
+    272:272:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):482 -> a
+    272:272:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    273:274:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):483:484 -> a
+    273:274:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    275:275:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState.<init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):23:23 -> a
+    275:275:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):484 -> a
     275:275:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    276:278:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):492:494 -> a
-    276:278:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    279:279:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    279:279:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):495 -> a
+    276:277:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):486:487 -> a
+    276:277:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    278:278:com.android.tools.r8.ir.analysis.value.BottomValue com.android.tools.r8.ir.analysis.value.AbstractValue.bottom():16:16 -> a
+    278:278:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState.<init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):33 -> a
+    278:278:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):487 -> a
+    278:278:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    279:279:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState.<init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):33:33 -> a
+    279:279:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):487 -> a
     279:279:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    280:280:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):496:496 -> a
-    280:280:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    281:281:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState.<init>(com.android.tools.r8.ir.analysis.type.Nullability):27:27 -> a
-    281:281:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):496 -> a
-    281:281:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    282:287:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):499:504 -> a
-    282:287:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    288:288:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
-    288:288:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):504 -> a
-    288:288:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    289:291:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):505:507 -> a
-    289:291:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    292:292:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    292:292:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):508 -> a
+    280:282:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):492:494 -> a
+    280:282:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    283:283:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
+    283:283:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):495 -> a
+    283:283:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    284:284:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):496:496 -> a
+    284:284:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    285:285:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState.<init>(com.android.tools.r8.ir.analysis.type.Nullability):27:27 -> a
+    285:285:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):496 -> a
+    285:285:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    286:291:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):499:504 -> a
+    286:291:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    292:292:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    292:292:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):504 -> a
     292:292:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    293:293:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):509:509 -> a
-    293:293:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    294:294:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):29:29 -> a
-    294:294:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):509 -> a
-    294:294:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    295:296:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):514:515 -> a
-    295:296:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    297:297:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    297:297:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):516 -> a
+    293:295:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):505:507 -> a
+    293:295:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    296:296:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
+    296:296:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):508 -> a
+    296:296:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    297:297:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):509:509 -> a
     297:297:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    298:298:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):517:517 -> a
+    298:298:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):29:29 -> a
+    298:298:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):509 -> a
     298:298:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    299:299:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue):21:21 -> a
-    299:299:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):517 -> a
-    299:299:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
-    300:312:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):403:415 -> a
-    313:313:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState.unknown():19:19 -> a
-    313:313:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):416 -> a
-    314:314:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):419:419 -> a
-    315:319:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):521:525 -> a
-    320:320:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    320:320:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):525 -> a
-    321:321:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):526:526 -> a
-    322:322:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.getVirtualRootMethod(com.android.tools.r8.graph.ProgramMethod):111:111 -> a
-    322:322:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):527 -> a
-    323:323:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):530:530 -> a
-    324:324:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
-    324:324:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):530 -> a
-    325:328:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):530:533 -> a
-    329:329:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.getVirtualRootMethod(com.android.tools.r8.graph.ProgramMethod):111:111 -> a
-    329:329:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):536 -> a
-    330:332:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):537:539 -> a
-    333:333:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):538:538 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer -> com.android.tools.r8.internal.N2:
+    299:300:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):514:515 -> a
+    299:300:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    301:301:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
+    301:301:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):516 -> a
+    301:301:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    302:302:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):517:517 -> a
+    302:302:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    303:303:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue):21:21 -> a
+    303:303:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):517 -> a
+    303:303:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):404 -> a
+    304:316:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):403:415 -> a
+    317:317:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState.unknown():19:19 -> a
+    317:317:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):416 -> a
+    318:318:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):419:419 -> a
+    319:323:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):521:525 -> a
+    324:324:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
+    324:324:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):525 -> a
+    325:325:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):526:526 -> a
+    326:326:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.getVirtualRootMethod(com.android.tools.r8.graph.ProgramMethod):111:111 -> a
+    326:326:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):527 -> a
+    327:327:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):530:530 -> a
+    328:328:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
+    328:328:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):530 -> a
+    329:332:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):530:533 -> a
+    333:333:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.getVirtualRootMethod(com.android.tools.r8.graph.ProgramMethod):111:111 -> a
+    333:333:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):536 -> a
+    334:336:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):537:539 -> a
+    337:337:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):538:538 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer -> com.android.tools.r8.internal.M2:
     void acceptCodeScannerResult(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference) -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer andThen(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer):25:25 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer emptyConsumer():12:12 -> emptyConsumer
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$1 -> com.android.tools.r8.internal.L2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$1 -> com.android.tools.r8.internal.K2:
     1:1:void <init>():12:12 -> <init>
     void acceptCodeScannerResult(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference) -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$2 -> com.android.tools.r8.internal.M2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$2 -> com.android.tools.r8.internal.L2:
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer val$nextEventConsumer -> b
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer this$0 -> c
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer val$self -> a
     1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer):25:25 -> <init>
     1:2:void acceptCodeScannerResult(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):28:29 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens -> com.android.tools.r8.internal.P2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens -> com.android.tools.r8.internal.O2:
     boolean $assertionsDisabled -> o
     java.util.Map prototypeChanges -> n
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):87:87 -> a
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):73 -> a
-    2:2:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):39:39 -> a
-    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):74 -> a
-    3:6:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):78:81 -> a
-    7:7:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):79:79 -> a
-    1:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):58:65 -> b
-    9:9:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):102:102 -> b
-    10:10:boolean com.android.tools.r8.ir.code.Invoke$Type.isStatic():189:189 -> b
-    10:10:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):102 -> b
-    11:11:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):39:39 -> b
-    11:11:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):102 -> b
-    12:13:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):103:104 -> b
-    1:1:com.android.tools.r8.graph.DexField internalGetNextFieldSignature(com.android.tools.r8.graph.DexField):92:92 -> d
-    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):87:87 -> f
-    1:1:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):97:97 -> g
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexMethod):43:43 -> h
-    2:2:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):39:39 -> h
-    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexMethod):43 -> h
-    3:4:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexMethod):43:44 -> h
-    1:1:boolean hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):39:39 -> i
-    boolean isLegitimateToHaveEmptyMappings() -> k
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder -> com.android.tools.r8.internal.O2:
+    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):92:92 -> a
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):78 -> a
+    2:2:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):44:44 -> a
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):79 -> a
+    3:6:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):83:86 -> a
+    7:7:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):84:84 -> a
+    8:8:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):107:107 -> a
+    9:9:boolean com.android.tools.r8.ir.code.Invoke$Type.isStatic():189:189 -> a
+    9:9:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):107 -> a
+    10:10:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):44:44 -> a
+    10:10:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):107 -> a
+    11:12:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):108:109 -> a
+    1:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):63:70 -> b
+    1:1:com.android.tools.r8.graph.DexField internalGetNextFieldSignature(com.android.tools.r8.graph.DexField):97:97 -> d
+    1:1:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):92:92 -> e
+    1:1:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):102:102 -> f
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexMethod):48:48 -> g
+    2:2:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):44:44 -> g
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexMethod):48 -> g
+    3:4:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexMethod):48:49 -> g
+    1:1:boolean hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):44:44 -> h
+    boolean isLegitimateToHaveEmptyMappings() -> m
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder -> com.android.tools.r8.internal.N2:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map prototypeChanges -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> b
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> c
-    1:1:void <clinit>():111:111 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):121:121 -> <init>
-    2:10:void <init>(com.android.tools.r8.graph.AppView):114:122 -> <init>
-    1:3:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.isEmpty():126:128 -> a
-    1:3:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():165 -> a
-    4:4:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():168:168 -> a
-    5:10:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.fixupPrototypeChangesAfterFieldSignatureChanges(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):177:182 -> a
-    5:10:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():171 -> a
-    11:13:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder mergeDisjoint(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):133:135 -> a
-    14:15:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordMove(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):140:141 -> a
-    16:23:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):147:154 -> a
-    24:24:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):152:152 -> a
-    25:25:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordStaticized(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):160:160 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorIROptimizer -> com.android.tools.r8.internal.Q2:
+    1:1:void <clinit>():116:116 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):126:126 -> <init>
+    2:10:void <init>(com.android.tools.r8.graph.AppView):119:127 -> <init>
+    1:3:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.isEmpty():131:133 -> a
+    1:3:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():170 -> a
+    4:4:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():173:173 -> a
+    5:9:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.fixupPrototypeChangesAfterFieldSignatureChanges(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):182:186 -> a
+    5:9:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():176 -> a
+    10:13:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.fixupPrototypeChangesAfterFieldSignatureChanges(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):185:188 -> a
+    10:13:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():176 -> a
+    14:16:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder mergeDisjoint(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):138:140 -> a
+    17:18:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordMove(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):145:146 -> a
+    19:26:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):152:159 -> a
+    27:27:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):157:157 -> a
+    28:28:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordStaticized(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):165:165 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorIROptimizer -> com.android.tools.r8.internal.P2:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():27:27 -> <clinit>
     1:24:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):40:63 -> a
@@ -96401,7 +95355,7 @@
     106:106:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
     106:106:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):151 -> a
     107:107:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):151:151 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer -> com.android.tools.r8.internal.S2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer -> com.android.tools.r8.internal.R2:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection reprocessingCriteriaCollection -> b
     boolean $assertionsDisabled -> c
@@ -96412,7 +95366,6 @@
     26:36:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):89:99 -> a
     37:37:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     37:37:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):99 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     38:47:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):99:108 -> a
     48:48:boolean com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria.shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):46:46 -> a
     48:48:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):108 -> a
@@ -96424,7 +95377,6 @@
     61:64:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):108:111 -> a
     65:65:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     65:65:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):111 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     66:66:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):111:111 -> a
     67:70:void enqueueAffectedCallers(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,java.util.concurrent.ExecutorService):125:128 -> a
     71:90:void enqueueAffectedCallers(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,java.util.concurrent.ExecutorService):127:146 -> a
@@ -96434,7 +95386,7 @@
     95:96:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):137 -> a
     97:99:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):137:139 -> a
     100:100:void lambda$enqueueAffectedCallers$3(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,java.util.List):148:148 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer$AffectedMethodUseRegistry -> com.android.tools.r8.internal.R2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer$AffectedMethodUseRegistry -> com.android.tools.r8.internal.Q2:
     com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens graphLens -> g
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):160:162 -> <init>
@@ -96455,445 +95407,394 @@
     1:9:void registerFieldAccess(com.android.tools.r8.graph.DexField):231:239 -> i
     10:10:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer$AffectedMethodUseRegistry.markAffected():166:166 -> i
     10:10:void registerFieldAccess(com.android.tools.r8.graph.DexField):240 -> i
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator -> com.android.tools.r8.internal.T2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator -> com.android.tools.r8.internal.S2:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.BiConsumer interfaceDispatchOutsideProgram -> e
     java.util.List stronglyConnectedProgramComponents -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> b
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> c
-    1:1:void <clinit>():55:55 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection,java.util.List,java.util.function.BiConsumer):73:79 -> <init>
-    1:18:void populateOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):94:111 -> a
-    19:39:void processStronglyConnectedComponent(java.util.Set):126:146 -> a
-    40:40:void lambda$processStronglyConnectedComponent$0(java.util.Set,com.android.tools.r8.graph.DexMethodSignature):131:131 -> a
-    41:43:void setOptimizationInfo(java.util.concurrent.ExecutorService):150:150 -> a
-    44:44:void setOptimizationInfo(com.android.tools.r8.graph.DexProgramClass):155:155 -> a
-    45:56:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):159:170 -> a
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference,java.util.List,java.util.function.BiConsumer):65:70 -> <init>
+    1:18:void populateOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):85:102 -> a
+    19:39:void processStronglyConnectedComponent(java.util.Set):117:137 -> a
+    40:40:void lambda$processStronglyConnectedComponent$0(java.util.Set,com.android.tools.r8.graph.DexMethodSignature):122:122 -> a
+    41:43:void setOptimizationInfo(java.util.concurrent.ExecutorService):141:141 -> a
+    44:44:void setOptimizationInfo(com.android.tools.r8.graph.DexProgramClass):146:146 -> a
+    45:56:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):150:161 -> a
     57:57:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState.unknown():19:19 -> a
-    57:57:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):171 -> a
-    58:67:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):174:183 -> a
-    68:68:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isPolymorphic():0:0 -> a
-    68:68:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):183 -> a
-    69:73:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184:188 -> a
-    74:77:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):311:314 -> a
-    74:77:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    78:78:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState.isClassParameter():0:0 -> a
-    78:78:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):315 -> a
-    78:78:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    79:80:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):318:319 -> a
-    79:80:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    81:87:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.shouldWidenDynamicTypeToUnknown(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):334:340 -> a
-    81:87:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):320 -> a
-    81:87:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    88:88:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    88:88:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.shouldWidenDynamicTypeToUnknown(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):340 -> a
-    88:88:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):320 -> a
-    88:88:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    89:89:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    89:89:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    89:89:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.shouldWidenDynamicTypeToUnknown(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):340 -> a
-    89:89:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):320 -> a
-    89:89:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    90:91:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.shouldWidenDynamicTypeToUnknown(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):341:342 -> a
-    90:91:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):320 -> a
-    90:91:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    92:92:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):321:321 -> a
-    92:92:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    93:93:com.android.tools.r8.ir.analysis.value.BottomValue com.android.tools.r8.ir.analysis.value.AbstractValue.bottom():16:16 -> a
-    93:93:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):325 -> a
-    93:93:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    94:94:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):325:325 -> a
-    94:94:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    95:95:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):29:29 -> a
-    95:95:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):325 -> a
-    95:95:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    96:96:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):327:327 -> a
-    96:96:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    97:97:com.android.tools.r8.utils.Action com.android.tools.r8.utils.Action.empty():13:13 -> a
-    97:97:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64 -> a
-    97:97:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):323 -> a
-    97:97:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    98:98:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64:64 -> a
-    98:98:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):323 -> a
-    98:98:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    99:108:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):321:330 -> a
-    99:108:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):194 -> a
-    109:115:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):199:205 -> a
-    116:124:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):202:210 -> a
-    125:135:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):208:218 -> a
-    136:136:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple com.android.tools.r8.ir.optimize.info.OptimizationFeedback.getSimple():44:44 -> a
-    136:136:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):219 -> a
-    137:137:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):221:221 -> a
-    138:138:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):220:220 -> a
-    139:147:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):227:235 -> a
-    148:148:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    148:148:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):236 -> a
-    149:151:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newInitializedArrayList(int,java.lang.Object):207:209 -> a
-    149:151:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):236 -> a
-    152:168:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):237:253 -> a
-    169:177:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState lambda$getMethodStateAfterUninstantiatedParameterRemoval$1(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState):241:249 -> a
-    178:178:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):29:29 -> a
-    178:178:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState lambda$getMethodStateAfterUninstantiatedParameterRemoval$1(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState):249 -> a
-    1:10:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):259:268 -> b
-    11:11:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> b
-    11:11:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):269 -> b
-    12:14:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newInitializedArrayList(int,java.lang.Object):207:209 -> b
-    12:14:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):269 -> b
-    15:16:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):271:272 -> b
-    17:17:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():204:204 -> b
-    17:17:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):272 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:20:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):275:277 -> b
-    21:23:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.getUnusedParameterState(com.android.tools.r8.graph.DexType):292:294 -> b
-    21:23:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):278 -> b
-    24:24:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState.<init>(com.android.tools.r8.ir.analysis.type.Nullability):27:27 -> b
-    24:24:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.getUnusedParameterState(com.android.tools.r8.graph.DexType):294 -> b
-    24:24:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):278 -> b
-    25:28:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.getUnusedParameterState(com.android.tools.r8.graph.DexType):295:298 -> b
-    25:28:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):278 -> b
-    29:29:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType) -> b
-    29:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.getUnusedParameterState(com.android.tools.r8.graph.DexType):298 -> b
-    29:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):278 -> b
-    30:34:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.getUnusedParameterState(com.android.tools.r8.graph.DexType):300:304 -> b
-    30:34:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):278 -> b
-    35:35:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createZeroValue():49:49 -> b
-    35:35:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.getUnusedParameterState(com.android.tools.r8.graph.DexType):304 -> b
-    35:35:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):278 -> b
-    36:36:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue):21:21 -> b
-    36:36:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.getUnusedParameterState(com.android.tools.r8.graph.DexType):304 -> b
-    36:36:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):278 -> b
-    37:42:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):278:283 -> b
-    43:43:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> b
-    43:43:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):283 -> b
-    44:45:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):284:285 -> b
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer -> com.android.tools.r8.internal.W2:
+    57:57:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):162 -> a
+    58:66:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):165:173 -> a
+    67:67:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isPolymorphic():0:0 -> a
+    67:67:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):173 -> a
+    68:72:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):174:178 -> a
+    73:76:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):250:253 -> a
+    73:76:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    77:77:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState.isClassParameter():0:0 -> a
+    77:77:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):254 -> a
+    77:77:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    78:79:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):257:258 -> a
+    78:79:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    80:86:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.shouldWidenDynamicTypeToUnknown(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):273:279 -> a
+    80:86:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):259 -> a
+    80:86:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    87:87:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    87:87:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.shouldWidenDynamicTypeToUnknown(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):279 -> a
+    87:87:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):259 -> a
+    87:87:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    88:88:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    88:88:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    88:88:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.shouldWidenDynamicTypeToUnknown(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):279 -> a
+    88:88:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):259 -> a
+    88:88:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    89:90:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.shouldWidenDynamicTypeToUnknown(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):280:281 -> a
+    89:90:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):259 -> a
+    89:90:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    91:91:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):260:260 -> a
+    91:91:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    92:92:com.android.tools.r8.ir.analysis.value.BottomValue com.android.tools.r8.ir.analysis.value.AbstractValue.bottom():16:16 -> a
+    92:92:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):264 -> a
+    92:92:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    93:93:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):264:264 -> a
+    93:93:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    94:94:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):29:29 -> a
+    94:94:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):264 -> a
+    94:94:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    95:95:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):266:266 -> a
+    95:95:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    96:96:com.android.tools.r8.utils.Action com.android.tools.r8.utils.Action.empty():13:13 -> a
+    96:96:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64 -> a
+    96:96:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):262 -> a
+    96:96:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    97:97:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64:64 -> a
+    97:97:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):262 -> a
+    97:97:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    98:107:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.widenDynamicTypes(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):260:269 -> a
+    98:107:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):184 -> a
+    108:114:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):189:195 -> a
+    115:123:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):192:200 -> a
+    124:134:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):198:208 -> a
+    135:135:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple com.android.tools.r8.ir.optimize.info.OptimizationFeedback.getSimple():44:44 -> a
+    135:135:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):209 -> a
+    136:136:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):211:211 -> a
+    137:137:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):210:210 -> a
+    138:146:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):217:225 -> a
+    147:147:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
+    147:147:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):226 -> a
+    148:150:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newInitializedArrayList(int,java.lang.Object):207:209 -> a
+    148:150:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):226 -> a
+    151:167:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):227:243 -> a
+    168:176:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState lambda$getMethodStateAfterUninstantiatedParameterRemoval$1(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState):231:239 -> a
+    177:177:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):29:29 -> a
+    177:177:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState lambda$getMethodStateAfterUninstantiatedParameterRemoval$1(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState):239 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer -> com.android.tools.r8.internal.V2:
     java.util.Map interfaceDispatchOutsideProgram -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map libraryVirtualMethods -> d
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Map):150:150 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Map):144:153 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Map):156:156 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Map):150:159 -> <init>
     boolean lambda$computeLibraryVirtualMethods$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass) -> a
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer):73:73 -> a
-    2:19:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens run(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):162:179 -> a
-    20:20:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.builder(com.android.tools.r8.graph.AppView):35:35 -> a
-    20:20:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens run(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):179 -> a
-    21:23:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens run(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):180:182 -> a
-    24:28:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder lambda$run$0(java.util.function.Consumer,java.util.Set):167:171 -> a
-    29:29:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder lambda$run$0(java.util.function.Consumer,java.util.Set):170:170 -> a
-    30:30:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder lambda$run$0(java.util.function.Consumer,java.util.Set):168:168 -> a
-    31:35:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer.getOrComputeLibraryVirtualMethods(com.android.tools.r8.graph.DexClass):188:192 -> a
-    31:35:com.android.tools.r8.utils.collections.DexMethodSignatureSet access$200(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer,com.android.tools.r8.graph.DexClass):73 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:40:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer.getOrComputeLibraryVirtualMethods(com.android.tools.r8.graph.DexClass):188:192 -> a
-    36:40:void lambda$computeLibraryVirtualMethods$2(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):201 -> a
-    41:41:void lambda$computeLibraryVirtualMethods$2(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):201:201 -> a
-    42:51:com.android.tools.r8.utils.collections.DexMethodSignatureSet computeLibraryVirtualMethods(com.android.tools.r8.graph.DexClass):196:205 -> a
-    52:52:void lambda$computeLibraryVirtualMethods$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClassAndMethod):204:204 -> a
-    1:1:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo access$100(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer):73:73 -> b
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges -> com.android.tools.r8.internal.U2:
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer):79:79 -> a
+    2:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet access$200(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer,com.android.tools.r8.graph.DexClass):79:79 -> a
+    3:7:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer.getOrComputeLibraryVirtualMethods(com.android.tools.r8.graph.DexClass):195:199 -> a
+    3:7:com.android.tools.r8.utils.collections.DexMethodSignatureSet access$200(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer,com.android.tools.r8.graph.DexClass):79 -> a
+    8:26:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens run(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):168:186 -> a
+    27:27:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.builder(com.android.tools.r8.graph.AppView):35:35 -> a
+    27:27:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens run(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):186 -> a
+    28:30:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens run(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):187:189 -> a
+    31:35:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder lambda$run$0(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,java.util.function.Consumer,java.util.Set):174:178 -> a
+    36:36:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder lambda$run$0(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,java.util.function.Consumer,java.util.Set):177:177 -> a
+    37:37:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder lambda$run$0(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,java.util.function.Consumer,java.util.Set):175:175 -> a
+    38:42:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer.getOrComputeLibraryVirtualMethods(com.android.tools.r8.graph.DexClass):195:199 -> a
+    38:42:void lambda$computeLibraryVirtualMethods$2(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):208 -> a
+    43:43:void lambda$computeLibraryVirtualMethods$2(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):208:208 -> a
+    44:53:com.android.tools.r8.utils.collections.DexMethodSignatureSet computeLibraryVirtualMethods(com.android.tools.r8.graph.DexClass):203:212 -> a
+    54:54:void lambda$computeLibraryVirtualMethods$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClassAndMethod):211:211 -> a
+    1:1:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo access$100(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer):79:79 -> b
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges -> com.android.tools.r8.internal.T2:
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges EMPTY -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet removableParameterIndices -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType newReturnType -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap newParameterTypes -> b
-    1:4:void <clinit>():75:78 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):87:90 -> <init>
-    1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.RewrittenPrototypeDescription):94:94 -> a
-    2:2:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges.empty():120:120 -> a
-    2:2:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.RewrittenPrototypeDescription):95 -> a
-    3:20:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.RewrittenPrototypeDescription):98:115 -> a
-    21:21:void lambda$create$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):107:107 -> a
+    1:4:void <clinit>():81:84 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):93:96 -> <init>
+    1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.RewrittenPrototypeDescription):100:100 -> a
+    2:2:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges.empty():126:126 -> a
+    2:2:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.RewrittenPrototypeDescription):101 -> a
+    3:20:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.RewrittenPrototypeDescription):104:121 -> a
+    21:21:void lambda$create$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):113:113 -> a
     22:22:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
-    22:22:void lambda$create$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):107 -> a
-    23:25:void lambda$create$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):108:110 -> a
+    22:22:void lambda$create$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):113 -> a
+    23:25:void lambda$create$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):114:116 -> a
     26:26:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
-    26:26:void lambda$create$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):110 -> a
-    27:29:void lambda$create$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):110:112 -> a
-    30:30:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges empty():120:120 -> a
-    1:7:boolean equals(java.lang.Object):130:136 -> equals
-    1:1:int hashCode():125:125 -> hashCode
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer -> com.android.tools.r8.internal.V2:
-    java.util.Map allowedPrototypeChangesForVirtualMethods -> c
-    boolean $assertionsDisabled -> i
+    26:26:void lambda$create$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):116 -> a
+    27:29:void lambda$create$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):116:118 -> a
+    30:30:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges empty():126:126 -> a
+    1:7:boolean equals(java.lang.Object):136:142 -> equals
+    1:1:int hashCode():131:131 -> hashCode
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer -> com.android.tools.r8.internal.U2:
+    com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer this$0 -> j
+    java.util.Map allowedPrototypeChangesForVirtualMethods -> d
     com.android.tools.r8.utils.InternalOptions options -> b
-    com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer this$0 -> h
-    java.util.Map newMethodSignatures -> e
-    java.util.Map newMethodSignatureSuffixes -> f
-    com.android.tools.r8.utils.collections.ProgramMethodMap returnValuesForVirtualMethods -> d
-    java.util.Map occupiedMethodSignatures -> g
+    com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> i
+    boolean $assertionsDisabled -> k
+    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> c
+    com.android.tools.r8.utils.collections.ProgramMethodMap returnValuesForVirtualMethods -> e
+    java.util.Map newMethodSignatures -> f
+    java.util.Map newMethodSignatureSuffixes -> g
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
-    1:1:void <clinit>():209:209 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer):234:234 -> <init>
-    2:24:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer):214:236 -> <init>
-    com.android.tools.r8.graph.DexType lambda$computePrototypeChangesForMethod$13(int) -> a
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
-    1:1:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):575 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):546 -> a
-    2:31:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):575:604 -> a
-    2:31:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):546 -> a
-    32:32:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    32:32:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):604 -> a
-    32:32:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):546 -> a
-    33:33:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    33:33:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    33:33:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):604 -> a
-    33:33:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):546 -> a
-    34:66:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):604:636 -> a
-    34:66:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):546 -> a
-    67:67:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):213:213 -> a
-    67:67:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):636 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    67:67:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):546 -> a
-    68:70:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):547:549 -> a
-    71:71:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder access$300(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):209:209 -> a
-    72:84:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):257:269 -> a
-    85:85:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.builder(com.android.tools.r8.graph.AppView):35:35 -> a
-    85:85:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):269 -> a
-    86:89:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):270:273 -> a
-    90:94:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):272:276 -> a
-    95:95:boolean lambda$reservePinnedMethodSignatures$0(com.android.tools.r8.graph.DexEncodedMethod):288:288 -> a
-    96:97:boolean lambda$reservePinnedMethodSignatures$2(java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):298:299 -> a
-    98:98:void lambda$reservePinnedMethodSignatures$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):301:301 -> a
-    99:99:void lambda$reservePinnedMethodSignatures$4(com.android.tools.r8.graph.DexMethodSignature):305:305 -> a
-    100:107:void reserveMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges):314:321 -> a
-    108:109:void computePrototypeChangesForVirtualMethods(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet):330:331 -> a
-    110:110:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):335:335 -> a
-    111:111:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    111:111:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):335 -> a
-    112:117:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.containsImmediateInterfaceOfInstantiatedLambda(com.android.tools.r8.utils.collections.ProgramMethodSet):444:449 -> a
-    112:117:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):341 -> a
-    118:121:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):347:350 -> a
-    122:122:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> a
-    122:122:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):350 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    123:123:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):460:460 -> a
-    123:123:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):352 -> a
-    124:124:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.getFirst():50:50 -> a
-    124:124:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):464 -> a
-    124:124:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):352 -> a
-    125:128:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):464:467 -> a
-    125:128:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):352 -> a
-    129:134:boolean com.android.tools.r8.optimize.argumentpropagation.utils.ParameterRemovalUtils.canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):17:22 -> a
-    129:134:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):467 -> a
-    129:134:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):352 -> a
-    135:144:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):467:476 -> a
-    135:144:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):352 -> a
-    145:145:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
-    145:145:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):476 -> a
-    145:145:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):352 -> a
-    146:150:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):478:482 -> a
-    146:150:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):352 -> a
-    151:151:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):353:353 -> a
-    152:164:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewParameterTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):520:532 -> a
-    152:164:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):356 -> a
-    165:165:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.getFirst():50:50 -> a
-    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewParameterTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):533 -> a
-    165:165:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):356 -> a
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewParameterTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):533:533 -> a
-    166:166:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):356 -> a
-    167:167:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewParameterTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):532:532 -> a
-    167:167:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):356 -> a
-    168:168:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):358:358 -> a
-    169:169:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexMethodSignature.getReturnType():37:37 -> a
-    169:169:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getReturnValueForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethodSignature):419 -> a
-    169:169:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):365 -> a
-    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProto.getReturnType():62:62 -> a
-    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexMethodSignature.getReturnType():37 -> a
-    170:170:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getReturnValueForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethodSignature):419 -> a
-    170:170:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):365 -> a
-    171:190:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getReturnValueForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethodSignature):419:438 -> a
-    171:190:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):365 -> a
-    191:206:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewReturnTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.analysis.value.SingleValue):495:510 -> a
-    191:206:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):367 -> a
-    207:207:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.getFirst():50:50 -> a
-    207:207:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewReturnTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.analysis.value.SingleValue):510 -> a
-    207:207:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):367 -> a
-    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewReturnTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.analysis.value.SingleValue):510:510 -> a
-    208:208:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):367 -> a
-    209:227:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):369:387 -> a
-    228:228:boolean lambda$computePrototypeChangesForVirtualMethods$5(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):337:337 -> a
-    229:231:java.util.Map computeVirtualMethodsBySignature(java.util.Set):396:398 -> a
-    232:232:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
-    232:232:java.util.Map computeVirtualMethodsBySignature(java.util.Set):398 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    233:233:void lambda$computeVirtualMethodsBySignature$7(java.util.Map,com.android.tools.r8.graph.ProgramMethod):402:402 -> a
-    234:236:void lambda$computeVirtualMethodsBySignature$7(java.util.Map,com.android.tools.r8.graph.ProgramMethod):401:403 -> a
-    237:241:boolean isPrototypeChangesAllowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet):410:414 -> a
-    242:253:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):542:553 -> a
-    254:254:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):266:266 -> a
-    254:254:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):553 -> a
-    255:272:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):554:571 -> a
-    273:273:boolean lambda$visitClass$8(com.android.tools.r8.graph.DexEncodedField):544:544 -> a
-    274:274:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):557:557 -> a
-    275:283:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):724:732 -> a
-    275:283:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):558 -> a
-    284:284:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
-    284:284:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):732 -> a
-    284:284:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):558 -> a
-    285:293:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):733:741 -> a
-    285:293:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):558 -> a
-    294:295:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):533:534 -> a
-    294:295:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):741 -> a
-    294:295:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):558 -> a
-    296:298:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):541:543 -> a
-    296:298:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):536 -> a
-    296:298:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):741 -> a
-    296:298:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):558 -> a
-    299:299:com.android.tools.r8.graph.DexType[] com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteParameters(com.android.tools.r8.graph.ProgramMethod):547:547 -> a
-    299:299:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):543 -> a
-    299:299:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):536 -> a
-    299:299:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):741 -> a
-    299:299:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):558 -> a
-    300:300:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):543:543 -> a
-    300:300:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):536 -> a
-    300:300:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):741 -> a
-    300:300:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):558 -> a
-    301:301:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):537:537 -> a
-    301:301:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):741 -> a
-    301:301:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):558 -> a
-    302:302:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
-    302:302:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):537 -> a
-    302:302:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):741 -> a
-    302:302:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):558 -> a
-    303:305:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):742:744 -> a
-    303:305:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):558 -> a
-    306:310:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):560:564 -> a
-    311:316:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):563:568 -> a
-    317:327:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):641:651 -> a
-    328:328:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):62:62 -> a
-    328:328:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):651 -> a
-    329:349:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):654:674 -> a
-    350:358:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):673:681 -> a
-    359:361:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):680:682 -> a
-    362:362:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    362:362:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):684 -> a
-    363:373:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):684:694 -> a
-    374:390:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):683:699 -> a
-    391:391:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):698:698 -> a
-    392:394:boolean lambda$getNewMethodSignature$11(com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges,com.android.tools.r8.graph.DexMethod):688:690 -> a
-    395:401:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.isMethodSignatureFresh(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges):711:717 -> a
-    395:401:boolean lambda$getNewMethodSignature$11(com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges,com.android.tools.r8.graph.DexMethod):689 -> a
-    402:404:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):813:815 -> a
-    405:405:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewReturnType(com.android.tools.r8.graph.ProgramMethod):821:821 -> a
-    405:405:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):817 -> a
-    406:406:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):817:817 -> a
-    407:407:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):816:816 -> a
-    408:420:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):825:837 -> a
-    421:421:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    421:421:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):837 -> a
-    422:422:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    422:422:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    422:422:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):837 -> a
-    423:424:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):837:838 -> a
-    425:425:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
-    425:425:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):838 -> a
-    426:427:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):838:839 -> a
-    428:428:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    428:428:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):839 -> a
-    429:429:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    429:429:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    429:429:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):839 -> a
-    430:430:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):839:839 -> a
-    431:435:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):838:842 -> a
-    436:436:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
-    436:436:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):843 -> a
-    437:450:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):841:854 -> a
-    451:451:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):853:853 -> a
-    452:464:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):878:890 -> a
-    465:465:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    465:465:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):890 -> a
-    466:466:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    466:466:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    466:466:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):890 -> a
-    467:484:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):891:908 -> a
-    485:486:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):919:920 -> a
-    487:492:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):928:933 -> a
-    487:492:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):921 -> a
-    493:498:boolean com.android.tools.r8.optimize.argumentpropagation.utils.ParameterRemovalUtils.canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):17:22 -> a
-    493:498:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):933 -> a
-    493:498:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):921 -> a
-    499:502:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):933:936 -> a
-    499:502:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):921 -> a
-    503:510:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):935:942 -> a
-    503:510:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):921 -> a
-    511:511:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():204:204 -> a
-    511:511:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):942 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    511:511:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):921 -> a
-    512:523:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):943:954 -> a
-    512:523:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):921 -> a
-    524:537:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):949:962 -> a
-    524:537:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):921 -> a
-    538:538:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.builder():214:214 -> a
-    538:538:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):965 -> a
-    538:538:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):921 -> a
-    539:542:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):966:969 -> a
-    539:542:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):921 -> a
-    543:553:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):963:973 -> a
-    543:553:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):921 -> a
-    554:554:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):918:918 -> a
-    555:558:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo computeReturnChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):979:982 -> a
-    559:559:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.builder():214:214 -> a
-    559:559:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo computeReturnChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):983 -> a
-    560:567:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo computeReturnChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):983:990 -> a
-    568:568:void lambda$computeReturnChangesForMethod$15(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder):986:986 -> a
-    boolean lambda$computePrototypeChangesForMethod$14(int) -> b
-    1:20:void reservePinnedMethodSignatures(java.util.Set):284:303 -> b
-    21:22:void lambda$reservePinnedMethodSignatures$1(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):290:291 -> b
-    23:32:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):752:761 -> b
-    33:40:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):786:793 -> b
-    33:40:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):761 -> b
-    41:45:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):791:795 -> b
-    41:45:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):761 -> b
-    46:46:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.builder():214:214 -> b
-    46:46:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):798 -> b
-    46:46:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):761 -> b
-    47:50:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):799:802 -> b
-    47:50:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):761 -> b
-    51:63:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):796:808 -> b
-    51:63:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):761 -> b
-    64:64:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):805:805 -> b
-    64:64:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):761 -> b
-    65:72:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):768:775 -> b
-    73:73:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):774:774 -> b
-    74:74:com.android.tools.r8.graph.DexType lambda$computePrototypeChangesForMethod$12(com.android.tools.r8.graph.ProgramMethod,int):814:814 -> b
-    1:13:com.android.tools.r8.ir.analysis.value.SingleValue getReturnValue(com.android.tools.r8.graph.ProgramMethod):861:873 -> c
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods -> com.android.tools.r8.internal.Y2:
+    java.util.Map occupiedMethodSignatures -> h
+    1:1:void <clinit>():216:216 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext):245:245 -> <init>
+    2:30:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext):218:246 -> <init>
+    com.android.tools.r8.graph.DexType lambda$computePrototypeChangesForMethod$15(int) -> a
+    1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder access$300(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):216:216 -> a
+    2:14:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):267:279 -> a
+    15:15:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.builder(com.android.tools.r8.graph.AppView):35:35 -> a
+    15:15:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):279 -> a
+    16:19:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):280:283 -> a
+    20:24:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):282:286 -> a
+    25:25:boolean lambda$reservePinnedMethodSignatures$0(com.android.tools.r8.graph.DexEncodedMethod):298:298 -> a
+    26:27:boolean lambda$reservePinnedMethodSignatures$2(java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):310:311 -> a
+    28:28:void lambda$reservePinnedMethodSignatures$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):313:313 -> a
+    29:29:void lambda$reservePinnedMethodSignatures$4(com.android.tools.r8.graph.DexMethodSignature):317:317 -> a
+    30:37:void reserveMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges):326:333 -> a
+    38:39:void computePrototypeChangesForVirtualMethods(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet):342:343 -> a
+    40:40:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):347:347 -> a
+    41:41:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
+    41:41:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):347 -> a
+    42:47:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.containsImmediateInterfaceOfInstantiatedLambda(com.android.tools.r8.utils.collections.ProgramMethodSet):456:461 -> a
+    42:47:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):353 -> a
+    48:51:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):359:362 -> a
+    52:52:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> a
+    52:52:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):362 -> a
+    53:53:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):472:472 -> a
+    53:53:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):364 -> a
+    54:54:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.getFirst():50:50 -> a
+    54:54:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):476 -> a
+    54:54:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):364 -> a
+    55:74:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):476:495 -> a
+    55:74:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):364 -> a
+    75:75:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
+    75:75:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):495 -> a
+    75:75:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):364 -> a
+    76:80:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.canRemoveParameterFromVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):497:501 -> a
+    76:80:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):364 -> a
+    81:81:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):365:365 -> a
+    82:94:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewParameterTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):539:551 -> a
+    82:94:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):368 -> a
+    95:95:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.getFirst():50:50 -> a
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewParameterTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):552 -> a
+    95:95:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):368 -> a
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewParameterTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):552:552 -> a
+    96:96:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):368 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewParameterTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,int):551:551 -> a
+    97:97:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):368 -> a
+    98:98:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):370:370 -> a
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexMethodSignature.getReturnType():37:37 -> a
+    99:99:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getReturnValueForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethodSignature):431 -> a
+    99:99:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):377 -> a
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProto.getReturnType():62:62 -> a
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexMethodSignature.getReturnType():37 -> a
+    100:100:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getReturnValueForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethodSignature):431 -> a
+    100:100:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):377 -> a
+    101:120:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getReturnValueForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethodSignature):431:450 -> a
+    101:120:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):377 -> a
+    121:136:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewReturnTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.analysis.value.SingleValue):514:529 -> a
+    121:136:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):379 -> a
+    137:137:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.getFirst():50:50 -> a
+    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewReturnTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.analysis.value.SingleValue):529 -> a
+    137:137:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):379 -> a
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewReturnTypeForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.analysis.value.SingleValue):529:529 -> a
+    138:138:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):379 -> a
+    139:157:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):381:399 -> a
+    158:158:boolean lambda$computePrototypeChangesForVirtualMethods$5(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):349:349 -> a
+    159:161:java.util.Map computeVirtualMethodsBySignature(java.util.Set):408:410 -> a
+    162:162:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
+    162:162:java.util.Map computeVirtualMethodsBySignature(java.util.Set):410 -> a
+    163:163:void lambda$computeVirtualMethodsBySignature$7(java.util.Map,com.android.tools.r8.graph.ProgramMethod):414:414 -> a
+    164:166:void lambda$computeVirtualMethodsBySignature$7(java.util.Map,com.android.tools.r8.graph.ProgramMethod):413:415 -> a
+    167:171:boolean isPrototypeChangesAllowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet):422:426 -> a
+    172:185:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):561:574 -> a
+    186:186:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):266:266 -> a
+    186:186:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):574 -> a
+    187:218:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):584:615 -> a
+    219:219:boolean lambda$visitClass$8(com.android.tools.r8.graph.DexEncodedField):563:563 -> a
+    220:242:void lambda$visitClass$12(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):586:608 -> a
+    243:248:void lambda$visitClass$12(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):607:612 -> a
+    249:249:com.android.tools.r8.graph.RewrittenPrototypeDescription lambda$visitClass$11(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):590:590 -> a
+    250:257:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):768:775 -> a
+    250:257:com.android.tools.r8.graph.RewrittenPrototypeDescription lambda$visitClass$11(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):591 -> a
+    258:258:com.android.tools.r8.graph.RewrittenPrototypeDescription lambda$visitClass$11(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):595:595 -> a
+    259:259:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):619:619 -> a
+    259:259:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):565 -> a
+    260:260:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
+    260:260:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):619 -> a
+    260:260:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):565 -> a
+    261:290:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):619:648 -> a
+    261:290:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):565 -> a
+    291:291:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):648 -> a
+    291:291:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):565 -> a
+    292:292:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    292:292:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    292:292:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):648 -> a
+    292:292:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):565 -> a
+    293:325:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):648:680 -> a
+    293:325:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):565 -> a
+    326:326:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):213:213 -> a
+    326:326:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewFieldSignature(com.android.tools.r8.graph.ProgramField):680 -> a
+    326:326:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):565 -> a
+    327:329:void lambda$visitClass$9(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):566:568 -> a
+    330:340:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):685:695 -> a
+    341:341:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):62:62 -> a
+    341:341:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):695 -> a
+    342:362:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):698:718 -> a
+    363:371:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):717:725 -> a
+    372:374:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):724:726 -> a
+    375:375:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
+    375:375:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):728 -> a
+    376:386:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):728:738 -> a
+    387:403:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):727:743 -> a
+    404:404:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):742:742 -> a
+    405:407:boolean lambda$getNewMethodSignature$13(com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges,com.android.tools.r8.graph.DexMethod):732:734 -> a
+    408:414:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.isMethodSignatureFresh(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges):755:761 -> a
+    408:414:boolean lambda$getNewMethodSignature$13(com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges,com.android.tools.r8.graph.DexMethod):733 -> a
+    415:420:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):768:773 -> a
+    415:420:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):577 -> a
+    421:422:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):579:580 -> a
+    423:423:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexClassAndMethod):61:61 -> a
+    423:423:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):580 -> a
+    424:424:void lambda$visitClass$10(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):582:582 -> a
+    425:432:com.android.tools.r8.graph.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):785:792 -> a
+    433:433:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.withExtraParameters(com.android.tools.r8.ir.conversion.ExtraParameter[]):856:856 -> a
+    433:433:com.android.tools.r8.graph.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):793 -> a
+    434:446:com.android.tools.r8.graph.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):794:806 -> a
+    447:447:com.android.tools.r8.graph.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):803:803 -> a
+    448:448:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticItems.createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView):498:498 -> a
+    448:448:com.android.tools.r8.graph.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):803 -> a
+    449:450:com.android.tools.r8.graph.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):807:808 -> a
+    451:451:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.withExtraParameters(com.android.tools.r8.ir.conversion.ExtraParameter[]):856:856 -> a
+    451:451:com.android.tools.r8.graph.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):809 -> a
+    452:454:com.android.tools.r8.graph.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):810:812 -> a
+    455:457:com.android.tools.r8.graph.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):811:813 -> a
+    458:460:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):880:882 -> a
+    461:461:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewReturnType(com.android.tools.r8.graph.ProgramMethod):888:888 -> a
+    461:461:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):884 -> a
+    462:462:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):884:884 -> a
+    463:463:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):883:883 -> a
+    464:476:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):892:904 -> a
+    477:477:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    477:477:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):904 -> a
+    478:478:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    478:478:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    478:478:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):904 -> a
+    479:480:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):904:905 -> a
+    481:481:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
+    481:481:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):905 -> a
+    482:483:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):905:906 -> a
+    484:484:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    484:484:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):906 -> a
+    485:485:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    485:485:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    485:485:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):906 -> a
+    486:486:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):906:906 -> a
+    487:491:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):905:909 -> a
+    492:492:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
+    492:492:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):910 -> a
+    493:506:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):908:921 -> a
+    507:507:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.SingleValue):920:920 -> a
+    508:520:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):945:957 -> a
+    521:521:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    521:521:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):957 -> a
+    522:522:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    522:522:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    522:522:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):957 -> a
+    523:540:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):958:975 -> a
+    541:542:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):986:987 -> a
+    543:555:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):995:1007 -> a
+    543:555:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):988 -> a
+    556:565:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1002:1011 -> a
+    556:565:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):988 -> a
+    566:566:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():204:204 -> a
+    566:566:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1011 -> a
+    566:566:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):988 -> a
+    567:578:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1012:1023 -> a
+    567:578:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):988 -> a
+    579:595:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1019:1035 -> a
+    579:595:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):988 -> a
+    596:609:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1030:1043 -> a
+    596:609:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):988 -> a
+    610:610:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.builder():234:234 -> a
+    610:610:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1046 -> a
+    610:610:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):988 -> a
+    611:614:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1047:1050 -> a
+    611:614:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):988 -> a
+    615:624:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1044:1053 -> a
+    615:624:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):988 -> a
+    625:625:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):985:985 -> a
+    626:629:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo computeReturnChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1059:1062 -> a
+    630:630:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.builder():234:234 -> a
+    630:630:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo computeReturnChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1063 -> a
+    631:638:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo computeReturnChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1063:1070 -> a
+    639:639:void lambda$computeReturnChangesForMethod$17(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder):1066:1066 -> a
+    boolean lambda$computePrototypeChangesForMethod$16(int) -> b
+    1:22:void reservePinnedMethodSignatures(java.util.Set):294:315 -> b
+    23:26:void lambda$reservePinnedMethodSignatures$1(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):300:303 -> b
+    27:36:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):819:828 -> b
+    37:44:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):853:860 -> b
+    37:44:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):828 -> b
+    45:49:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):858:862 -> b
+    45:49:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):828 -> b
+    50:50:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo$Builder com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.builder():234:234 -> b
+    50:50:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):865 -> b
+    50:50:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):828 -> b
+    51:54:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):866:869 -> b
+    51:54:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):828 -> b
+    55:67:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):863:875 -> b
+    55:67:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):828 -> b
+    68:68:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):872:872 -> b
+    68:68:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):828 -> b
+    69:76:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):835:842 -> b
+    77:77:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):841:841 -> b
+    78:78:com.android.tools.r8.graph.DexType lambda$computePrototypeChangesForMethod$14(com.android.tools.r8.graph.ProgramMethod,int):881:881 -> b
+    1:13:com.android.tools.r8.ir.analysis.value.SingleValue getReturnValue(com.android.tools.r8.graph.ProgramMethod):928:940 -> c
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods -> com.android.tools.r8.internal.X2:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> b
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):31:34 -> <init>
-    1:18:void disableArgumentPropagationForUnoptimizableMethods(java.util.Collection):41:58 -> a
+    1:18:void initializeUnoptimizableMethodStates(java.util.Collection):41:58 -> a
     19:19:void disableArgumentPropagationForMethod(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
     1:3:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods.isUnoptimizableMethod(com.android.tools.r8.graph.ProgramMethod):66:66 -> b
-    1:3:boolean lambda$disableArgumentPropagationForUnoptimizableMethods$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
-    4:4:boolean lambda$disableArgumentPropagationForUnoptimizableMethods$0(com.android.tools.r8.graph.ProgramMethod):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":20,"2":21,"3":22}}
-    20:20:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods.isUnoptimizableMethod(com.android.tools.r8.graph.ProgramMethod):66:66 -> b
-    20:20:boolean lambda$disableArgumentPropagationForUnoptimizableMethods$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
+    1:3:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
+    4:4:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":21,"2":22,"3":23}}
     21:21:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods.isUnoptimizableMethod(com.android.tools.r8.graph.ProgramMethod):66:66 -> b
-    21:21:boolean lambda$disableArgumentPropagationForUnoptimizableMethods$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
+    21:21:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
     22:22:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods.isUnoptimizableMethod(com.android.tools.r8.graph.ProgramMethod):66:66 -> b
-    22:22:boolean lambda$disableArgumentPropagationForUnoptimizableMethods$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
+    22:22:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
+    23:23:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods.isUnoptimizableMethod(com.android.tools.r8.graph.ProgramMethod):66:66 -> b
+    23:23:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
     5:10:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods.isUnoptimizableMethod(com.android.tools.r8.graph.ProgramMethod):69:74 -> b
-    5:10:boolean lambda$disableArgumentPropagationForUnoptimizableMethods$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
+    5:10:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
     11:11:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> b
     11:11:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods.isUnoptimizableMethod(com.android.tools.r8.graph.ProgramMethod):74 -> b
-    11:11:boolean lambda$disableArgumentPropagationForUnoptimizableMethods$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
-    12:12:boolean com.android.tools.r8.shaking.KeepMethodInfo.isArgumentPropagationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):50:50 -> b
-    12:12:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods.isUnoptimizableMethod(com.android.tools.r8.graph.ProgramMethod):74 -> b
-    12:12:boolean lambda$disableArgumentPropagationForUnoptimizableMethods$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
-    13:14:boolean lambda$disableArgumentPropagationForUnoptimizableMethods$0(com.android.tools.r8.graph.ProgramMethod):48:49 -> b
-    15:15:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> b
-    15:15:boolean lambda$disableArgumentPropagationForUnoptimizableMethods$0(com.android.tools.r8.graph.ProgramMethod):49 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:19:boolean lambda$disableArgumentPropagationForUnoptimizableMethods$0(com.android.tools.r8.graph.ProgramMethod):50:53 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState -> com.android.tools.r8.internal.C5:
+    11:11:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
+    12:12:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods.isUnoptimizableMethod(com.android.tools.r8.graph.ProgramMethod):74:74 -> b
+    12:12:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
+    13:13:boolean com.android.tools.r8.shaking.KeepMethodInfo.isArgumentPropagationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):50:50 -> b
+    13:13:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods.isUnoptimizableMethod(com.android.tools.r8.graph.ProgramMethod):74 -> b
+    13:13:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):47 -> b
+    14:15:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):48:49 -> b
+    16:16:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> b
+    16:16:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):49 -> b
+    17:20:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):50:53 -> b
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState -> com.android.tools.r8.internal.z5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -96909,7 +95810,7 @@
     13:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):45 -> a
     14:15:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):47:48 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState -> com.android.tools.r8.internal.D5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState -> com.android.tools.r8.internal.A5:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState INSTANCE -> a
     1:3:void <clinit>():15:17 -> <clinit>
@@ -96925,7 +95826,7 @@
     16:16:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):50 -> a
     17:18:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):51:52 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState get():22:22 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState -> com.android.tools.r8.internal.F5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState -> com.android.tools.r8.internal.C5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -96937,14 +95838,14 @@
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom() -> g
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom() -> i
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState get():20:20 -> k
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomParameterState -> com.android.tools.r8.internal.G5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomParameterState -> com.android.tools.r8.internal.D5:
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):17:17 -> a
     2:2:com.android.tools.r8.ir.analysis.value.BottomValue com.android.tools.r8.ir.analysis.value.AbstractValue.bottom():16:16 -> a
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):17 -> a
     boolean isBottom() -> c
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy() -> f
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState -> com.android.tools.r8.internal.K5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState -> com.android.tools.r8.internal.H5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():12:14 -> <clinit>
@@ -96957,7 +95858,7 @@
     6:6:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):38 -> a
     7:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):38:39 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState -> com.android.tools.r8.internal.L5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState -> com.android.tools.r8.internal.I5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -96973,7 +95874,7 @@
     13:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):45 -> a
     14:15:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):47:48 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState -> com.android.tools.r8.internal.Wc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState -> com.android.tools.r8.internal.yc:
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
@@ -96986,17 +95887,15 @@
     7:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):102:103 -> a
     9:9:boolean com.android.tools.r8.ir.analysis.type.Nullability.isUnknown():53:53 -> a
     9:9:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):103 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:11:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):103:104 -> a
-    12:12:boolean com.android.tools.r8.ir.analysis.type.Nullability.isUnknown():53:53 -> a
-    12:12:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):105 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    13:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):106 -> a
-    14:15:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):108:109 -> a
-    16:16:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    16:16:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):110 -> a
-    17:17:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):113:113 -> a
+    10:12:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):103:105 -> a
+    13:13:boolean com.android.tools.r8.ir.analysis.type.Nullability.isUnknown():53:53 -> a
+    13:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):105 -> a
+    14:14:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
+    14:14:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):106 -> a
+    15:16:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):108:109 -> a
+    17:17:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
+    17:17:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):110 -> a
+    18:18:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):113:113 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy():93:93 -> f
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState asArrayParameter() -> g
     1:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState clearInParameters():40:41 -> k
@@ -97007,7 +95906,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():70:70 -> r
     1:1:boolean isEffectivelyBottom():84:84 -> s
     1:1:boolean isEffectivelyUnknown():88:88 -> t
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState -> com.android.tools.r8.internal.Zc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState -> com.android.tools.r8.internal.Bc:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> d
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> c
@@ -97018,7 +95917,6 @@
     2:3:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):56:57 -> a
     4:4:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():42:42 -> a
     4:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):57 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:8:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):57:60 -> a
     9:16:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):107:114 -> a
     17:27:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):112:122 -> a
@@ -97046,7 +95944,7 @@
     2:2:boolean isEffectivelyBottom():89 -> s
     3:3:boolean isEffectivelyBottom():89:89 -> s
     1:1:boolean isEffectivelyUnknown():93:93 -> t
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState -> com.android.tools.r8.internal.bd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState -> com.android.tools.r8.internal.Dc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -97079,7 +95977,7 @@
     22:22:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):45:45 -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState asConcrete() -> e
     boolean isConcrete() -> f
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState -> com.android.tools.r8.internal.cd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState -> com.android.tools.r8.internal.Ec:
     java.util.List parameterStates -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -97119,63 +96017,62 @@
     24:27:void setParameterState(int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState):100:103 -> a
     28:28:int com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.size():107:107 -> a
     28:28:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):54 -> a
-    29:29:int com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.size():107:107 -> a
-    29:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):54 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    30:30:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:55 -> a
-    31:31:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
-    31:31:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):56 -> a
-    32:32:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:55 -> a
-    33:33:int com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.size():107:107 -> a
-    33:33:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):60 -> a
-    34:34:int com.android.tools.r8.graph.DexMethodSignature.getArity():29:29 -> a
+    29:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):54:54 -> a
+    30:30:int com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.size():107:107 -> a
+    30:30:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):54 -> a
+    31:31:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:55 -> a
+    32:32:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
+    32:32:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):56 -> a
+    33:33:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:55 -> a
+    34:34:int com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.size():107:107 -> a
     34:34:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):60 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> a
-    35:35:int com.android.tools.r8.graph.DexMethodSignature.getArity():29 -> a
-    35:35:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):60 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    36:36:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61:61 -> a
-    37:37:int com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.size():107:107 -> a
-    37:37:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61 -> a
-    38:38:int com.android.tools.r8.graph.DexMethodSignature.getArity():29:29 -> a
-    38:38:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61 -> a
-    39:39:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> a
-    39:39:int com.android.tools.r8.graph.DexMethodSignature.getArity():29 -> a
+    35:35:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):60:60 -> a
+    36:36:int com.android.tools.r8.graph.DexMethodSignature.getArity():29:29 -> a
+    36:36:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):60 -> a
+    37:37:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> a
+    37:37:int com.android.tools.r8.graph.DexMethodSignature.getArity():29 -> a
+    37:37:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):60 -> a
+    38:38:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61:61 -> a
+    39:39:int com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.size():107:107 -> a
     39:39:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61 -> a
-    40:45:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61:66 -> a
-    46:46:com.android.tools.r8.utils.Action com.android.tools.r8.utils.Action.empty():13:13 -> a
-    46:46:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64 -> a
-    46:46:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):66 -> a
-    47:47:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64:64 -> a
-    47:47:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):66 -> a
-    48:48:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):65:65 -> a
-    49:49:int com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.size():107:107 -> a
-    49:49:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):70 -> a
-    50:51:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):71:72 -> a
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexMethodSignature.getParameter(int):33:33 -> a
-    52:52:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):73 -> a
-    53:55:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):74:76 -> a
-    56:56:com.android.tools.r8.utils.Action com.android.tools.r8.utils.Action.empty():13:13 -> a
-    56:56:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64 -> a
-    56:56:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):76 -> a
-    57:57:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64:64 -> a
-    57:57:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):76 -> a
-    58:62:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):74:78 -> a
-    63:63:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState.isReceiverParameter():0:0 -> a
-    63:63:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):78 -> a
-    64:68:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):77:81 -> a
-    69:69:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
-    69:69:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):81 -> a
+    40:40:int com.android.tools.r8.graph.DexMethodSignature.getArity():29:29 -> a
+    40:40:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61 -> a
+    41:41:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> a
+    41:41:int com.android.tools.r8.graph.DexMethodSignature.getArity():29 -> a
+    41:41:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61 -> a
+    42:47:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61:66 -> a
+    48:48:com.android.tools.r8.utils.Action com.android.tools.r8.utils.Action.empty():13:13 -> a
+    48:48:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64 -> a
+    48:48:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):66 -> a
+    49:49:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64:64 -> a
+    49:49:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):66 -> a
+    50:50:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):65:65 -> a
+    51:51:int com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.size():107:107 -> a
+    51:51:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):70 -> a
+    52:53:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):71:72 -> a
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexMethodSignature.getParameter(int):33:33 -> a
+    54:54:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):73 -> a
+    55:57:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):74:76 -> a
+    58:58:com.android.tools.r8.utils.Action com.android.tools.r8.utils.Action.empty():13:13 -> a
+    58:58:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64 -> a
+    58:58:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):76 -> a
+    59:59:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):64:64 -> a
+    59:59:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):76 -> a
+    60:64:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):74:78 -> a
+    65:65:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState.isReceiverParameter():0:0 -> a
+    65:65:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):78 -> a
+    66:70:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):77:81 -> a
+    71:71:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
+    71:71:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):81 -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState asMonomorphic() -> b
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom() -> g
     1:1:java.util.List getParameterStates():33:33 -> k
     1:1:boolean isEffectivelyUnknown():37:37 -> l
     1:1:int size():107:107 -> m
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.dd:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.ed:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.Fc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.Gc:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableCopy() -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState -> com.android.tools.r8.internal.gd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState -> com.android.tools.r8.internal.Ic:
     java.util.Set inParameters -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -97200,7 +96097,7 @@
     1:1:boolean hasInParameters():45:45 -> n
     1:1:void internalClearInParameters():33:33 -> o
     boolean isReferenceParameter() -> p
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState -> com.android.tools.r8.internal.hd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState -> com.android.tools.r8.internal.Jc:
     java.util.Map receiverBoundsToState -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():19:19 -> <clinit>
@@ -97260,79 +96157,78 @@
     57:57:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):165:165 -> a
     58:58:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
     58:58:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):165 -> a
-    59:60:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):165:166 -> a
-    61:61:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
-    61:61:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):167 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    62:67:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):167:172 -> a
-    68:68:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:55 -> a
-    68:68:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    69:69:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
-    69:69:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55 -> a
+    59:61:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):165:167 -> a
+    62:62:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
+    62:62:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):167 -> a
+    63:68:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):167:172 -> a
+    69:69:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:55 -> a
     69:69:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    70:72:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:57 -> a
-    70:72:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    73:73:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
-    73:73:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):57 -> a
-    73:73:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    74:74:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):58:58 -> a
+    70:70:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
+    70:70:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55 -> a
+    70:70:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    71:73:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:57 -> a
+    71:73:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    74:74:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    74:74:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):57 -> a
     74:74:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    75:75:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
-    75:75:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):59 -> a
+    75:75:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):58:58 -> a
     75:75:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    76:76:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61:61 -> a
+    76:76:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
+    76:76:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):59 -> a
     76:76:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    77:77:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
-    77:77:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):65 -> a
+    77:77:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61:61 -> a
     77:77:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    78:81:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):65:68 -> a
-    78:81:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    82:84:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):86:88 -> a
-    82:84:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
-    82:84:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    85:85:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
-    85:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> a
-    85:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
-    85:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    86:86:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88:88 -> a
+    78:78:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
+    78:78:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):65 -> a
+    78:78:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    79:82:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):65:68 -> a
+    79:82:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    83:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):86:88 -> a
+    83:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
+    83:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    86:86:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    86:86:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> a
     86:86:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
     86:86:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    87:87:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
-    87:87:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> a
+    87:87:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88:88 -> a
     87:87:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
     87:87:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    88:88:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
-    88:88:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91 -> a
+    88:88:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    88:88:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> a
     88:88:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
     88:88:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    89:92:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91:94 -> a
-    89:92:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
-    89:92:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    93:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
-    93:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):89 -> a
-    93:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
-    93:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    94:94:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):69:69 -> a
+    89:89:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
+    89:89:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91 -> a
+    89:89:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
+    89:89:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    90:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91:94 -> a
+    90:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
+    90:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    94:94:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
+    94:94:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):89 -> a
+    94:94:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
     94:94:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    95:95:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
-    95:95:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):69 -> a
+    95:95:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):69:69 -> a
     95:95:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    96:96:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
-    96:96:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):70 -> a
+    96:96:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    96:96:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):69 -> a
     96:96:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    97:97:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):72:72 -> a
+    97:97:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
+    97:97:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):70 -> a
     97:97:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    98:98:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
-    98:98:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):173 -> a
-    99:101:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):176:178 -> a
+    98:98:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):72:72 -> a
+    98:98:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    99:99:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    99:99:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):173 -> a
+    100:102:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):176:178 -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom() -> i
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState asPolymorphic() -> j
     1:1:boolean isEffectivelyBottom():113:113 -> k
     1:1:boolean isEffectivelyUnknown():117:117 -> l
     1:1:java.util.Collection values():183:183 -> m
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.id:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown -> com.android.tools.r8.internal.jd:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState -> com.android.tools.r8.internal.ld:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.Kc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown -> com.android.tools.r8.internal.Lc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState -> com.android.tools.r8.internal.Nc:
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -97359,7 +96255,7 @@
     2:2:boolean isEffectivelyBottom():92 -> q
     3:3:boolean isEffectivelyBottom():92:92 -> q
     1:1:boolean isEffectivelyUnknown():96:96 -> r
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverParameterState -> com.android.tools.r8.internal.md:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverParameterState -> com.android.tools.r8.internal.Oc:
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -97385,14 +96281,14 @@
     2:2:com.android.tools.r8.ir.analysis.type.Nullability getNullability():57:57 -> r
     1:1:boolean isEffectivelyBottom():66:66 -> s
     1:1:boolean isEffectivelyUnknown():70:70 -> t
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState -> com.android.tools.r8.internal.od:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState -> com.android.tools.r8.internal.Qc:
     1:1:void <init>(java.util.Set):18:18 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState asReferenceParameter() -> j
     boolean isReferenceParameter() -> p
     com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType() -> q
     com.android.tools.r8.ir.analysis.type.Nullability getNullability() -> r
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter -> com.android.tools.r8.internal.gF:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter -> com.android.tools.r8.internal.iE:
     int index -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,int):15:17 -> <init>
@@ -97400,11 +96296,22 @@
     1:1:com.android.tools.r8.graph.DexMethod getMethod():21:21 -> b
     1:5:boolean equals(java.lang.Object):30:34 -> equals
     1:1:int hashCode():39:39 -> hashCode
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory -> com.android.tools.r8.internal.hF:
+    1:1:java.lang.String toString():0:0 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":47,"2":48,"3":49}}
+    47:47:java.lang.String toString():44:44 -> toString
+    48:48:java.lang.String toString():44:44 -> toString
+    49:49:java.lang.String toString():44:44 -> toString
+    45:45:java.lang.String toString():44:44 -> toString
+    46:46:java.lang.String toString():0:0 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":47,"2":48,"3":49}}
+    47:47:java.lang.String toString():44:44 -> toString
+    48:48:java.lang.String toString():44:44 -> toString
+    49:49:java.lang.String toString():44:44 -> toString
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory -> com.android.tools.r8.internal.jE:
     java.util.Map methodParameters -> a
     1:3:void <init>():12:14 -> <init>
     1:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter create(com.android.tools.r8.graph.ProgramMethod,int):17:17 -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com.android.tools.r8.internal.oF:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com.android.tools.r8.internal.qE:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy() -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> a
@@ -97417,7 +96324,7 @@
     boolean isMonomorphic() -> h
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom() -> i
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState asPolymorphic() -> j
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase -> com.android.tools.r8.internal.pF:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase -> com.android.tools.r8.internal.rE:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState asMonomorphic() -> b
     boolean isPolymorphic() -> c
@@ -97482,10 +96389,10 @@
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState get(com.android.tools.r8.graph.ProgramMethod):13 -> b
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.get(com.android.tools.r8.graph.ProgramMethod):96:96 -> b
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState get(com.android.tools.r8.graph.ProgramMethod):13 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyParameterState -> com.android.tools.r8.internal.RH:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyParameterState -> com.android.tools.r8.internal.OG:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyParameterState asNonEmpty() -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState -> com.android.tools.r8.internal.XL:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState -> com.android.tools.r8.internal.TK:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState asConcrete() -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView) -> a
@@ -97495,7 +96402,7 @@
     boolean isConcrete() -> d
     boolean isUnknown() -> e
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy() -> f
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner -> com.android.tools.r8.internal.ZW:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner -> com.android.tools.r8.internal.vV:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner CLONER -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner IDENTITY -> b
     1:14:void <clinit>():23:36 -> <clinit>
@@ -97504,15 +96411,15 @@
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState) -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner getCloner():50:50 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner getIdentity():54:54 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$1 -> com.android.tools.r8.internal.XW:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$1 -> com.android.tools.r8.internal.tV:
     1:1:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):27:27 -> a
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState):32:32 -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$2 -> com.android.tools.r8.internal.YW:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$2 -> com.android.tools.r8.internal.uV:
     1:1:void <init>():37:37 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState) -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState -> com.android.tools.r8.internal.I10:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState -> com.android.tools.r8.internal.YZ:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -97521,7 +96428,7 @@
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState get():21:21 -> k
-com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState -> com.android.tools.r8.internal.J10:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState -> com.android.tools.r8.internal.ZZ:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -97531,13 +96438,13 @@
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):25 -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy() -> f
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis -> com.android.tools.r8.internal.q30:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis -> com.android.tools.r8.internal.C10:
     java.util.Set monomorphicVirtualMethods -> g
     java.util.Map virtualRootMethodsPerClass -> f
     java.util.Map virtualRootMethods -> h
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):114:114 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):105:110 -> <init>
-    1:5:void extendVirtualRootMethods(java.util.Collection,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner):121:125 -> a
+    1:5:void initializeVirtualRootMethods(java.util.Collection,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner):121:125 -> a
     6:7:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):130:131 -> a
     8:8:void com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis.promoteToFinalIfPossible(com.android.tools.r8.graph.DexProgramClass):211:211 -> a
     8:8:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):132 -> a
@@ -97562,22 +96469,19 @@
     57:57:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod):220:220 -> a
     58:58:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     58:58:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod):220 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     59:64:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod):220:225 -> a
     1:1:void lambda$prune$5(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):204:204 -> b
     1:3:void prune(com.android.tools.r8.graph.DexProgramClass):172:174 -> i
     4:4:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> i
     4:4:void prune(com.android.tools.r8.graph.DexProgramClass):174 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:2:void visit(com.android.tools.r8.graph.DexProgramClass):140:141 -> k
     1:2:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):146:147 -> l
     3:3:void com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.forEachImmediateProgramSuperClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):86:86 -> l
     3:3:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):147 -> l
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):157:157 -> l
     5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> l
     5:5:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):157 -> l
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod -> com.android.tools.r8.internal.p30:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod -> com.android.tools.r8.internal.B10:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod parent -> a
     com.android.tools.r8.utils.collections.ProgramMethodSet overrides -> c
     com.android.tools.r8.graph.ProgramMethod root -> b
@@ -97596,7 +96500,52 @@
     13:13:com.android.tools.r8.graph.ProgramMethod getSingleNonAbstractMethod():84:84 -> c
     1:1:boolean hasOverrides():95:95 -> d
     1:1:boolean isInterfaceMethodWithSiblings():101:101 -> e
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator -> com.android.tools.r8.internal.Uo:
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter -> com.android.tools.r8.internal.eH:
+    1:1:void <init>():32:32 -> <init>
+    void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult) -> a
+    void processWorklist() -> a
+    1:2:com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):39:40 -> a
+    3:3:boolean com.android.tools.r8.graph.GraphLens.isArgumentPropagatorGraphLens():0:0 -> a
+    3:3:com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):43 -> a
+    4:6:com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):44:46 -> a
+    7:7:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):40:40 -> a
+    8:8:boolean com.android.tools.r8.graph.GraphLens.isArgumentPropagatorGraphLens():0:0 -> a
+    8:8:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):40 -> a
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$EmptyNullCheckInserter -> com.android.tools.r8.internal.cH:
+    1:1:void <init>():188:188 -> <init>
+    void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult) -> a
+    void processWorklist() -> a
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl -> com.android.tools.r8.internal.dH:
+    com.android.tools.r8.graph.AppView appView -> a
+    java.util.Map worklist -> d
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.ir.code.IRCode code -> b
+    com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens graphLens -> c
+    1:1:void <clinit>():54:54 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):63:63 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):60:66 -> <init>
+    boolean lambda$processWorklist$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
+    1:7:void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):73:79 -> a
+    8:8:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.isRemovedArgumentInfo():0:0 -> a
+    8:8:void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):79 -> a
+    9:25:void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):80:96 -> a
+    26:46:void processWorklist():101:121 -> a
+    47:55:boolean com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl.isReadOfEffectivelyUnreadField(com.android.tools.r8.ir.code.Value):152:160 -> a
+    47:55:void processWorklist():122 -> a
+    56:63:boolean com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl.isReadOfEffectivelyUnreadField(com.android.tools.r8.ir.code.Instruction):175:182 -> a
+    56:63:boolean com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl.isReadOfEffectivelyUnreadField(com.android.tools.r8.ir.code.Value):160 -> a
+    56:63:void processWorklist():122 -> a
+    64:67:boolean com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl.isReadOfEffectivelyUnreadField(com.android.tools.r8.ir.code.Value):167:170 -> a
+    64:67:void processWorklist():122 -> a
+    68:75:boolean com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl.isReadOfEffectivelyUnreadField(com.android.tools.r8.ir.code.Instruction):175:182 -> a
+    68:75:boolean com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl.isReadOfEffectivelyUnreadField(com.android.tools.r8.ir.code.Value):170 -> a
+    68:75:void processWorklist():122 -> a
+    76:82:void processWorklist():126:132 -> a
+    83:91:void processWorklist():131:139 -> a
+    92:92:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
+    92:92:void processWorklist():139 -> a
+    93:99:void processWorklist():140:146 -> a
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator -> com.android.tools.r8.internal.yo:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
@@ -97627,7 +96576,7 @@
     62:62:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):148 -> a
     63:63:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):148:148 -> a
     1:10:void run(java.util.concurrent.ExecutorService):61:70 -> b
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$FlowGraph -> com.android.tools.r8.internal.So:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$FlowGraph -> com.android.tools.r8.internal.wo:
     java.util.Map nodes -> a
     com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator this$0 -> b
     boolean $assertionsDisabled -> c
@@ -97702,7 +96651,7 @@
     76:79:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode getOrCreateParameterNode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):257:260 -> a
     80:80:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode getOrCreateParameterNode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):259:259 -> a
     81:82:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode lambda$getOrCreateParameterNode$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,int,com.android.tools.r8.graph.ProgramMethod,java.lang.Integer,com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode):264:265 -> a
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode -> com.android.tools.r8.internal.To:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode -> com.android.tools.r8.internal.xo:
     java.util.Set predecessors -> d
     java.util.Set successors -> e
     com.android.tools.r8.graph.DexType parameterType -> c
@@ -97728,7 +96677,7 @@
     2:2:void setPending():354 -> g
     3:4:void setPending():354:355 -> g
     1:2:void unsetPending():363:364 -> h
-com.android.tools.r8.optimize.argumentpropagation.propagation.InterfaceMethodArgumentPropagator -> com.android.tools.r8.internal.Rt:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InterfaceMethodArgumentPropagator -> com.android.tools.r8.internal.lt:
     boolean $assertionsDisabled -> i
     java.util.function.Consumer interfaceDispatchOutsideProgram -> h
     java.util.Map methodStatesToPropagate -> g
@@ -97776,16 +96725,15 @@
     1:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):93:94 -> l
     3:3:void com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.forEachImmediateProgramSuperClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):86:86 -> l
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):94 -> l
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):104:104 -> l
     5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> l
     5:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):104 -> l
     6:6:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):119:119 -> l
     1:1:boolean lambda$propagateInterfaceStateToClassHierarchy$2(com.android.tools.r8.graph.DexProgramClass):129:129 -> m
-com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.ME:
+com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.PD:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> f
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):21:22 -> <init>
-com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator -> com.android.tools.r8.internal.Z20:
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator -> com.android.tools.r8.internal.m10:
     boolean $assertionsDisabled -> h
     java.util.Map propagationStates -> g
     1:1:void <clinit>():34:34 -> <clinit>
@@ -97818,7 +96766,6 @@
     71:71:void computeFinalMethodStates(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):279:279 -> a
     72:72:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
     72:72:void computeFinalMethodStates(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):279 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     73:74:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):283:284 -> a
     73:74:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
     75:75:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState.bottom():15:15 -> a
@@ -97844,33 +96791,37 @@
     79:79:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
     80:84:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):289:293 -> a
     80:84:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
-    85:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.access$1100(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):36:36 -> a
+    85:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.computeMethodStateForPolymorhicMethod(com.android.tools.r8.graph.ProgramMethod):149:149 -> a
+    85:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.access$1100(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):36 -> a
     85:85:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):297 -> a
     85:85:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
-    86:91:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.computeMethodStateForPolymorhicMethod(com.android.tools.r8.graph.ProgramMethod):149:154 -> a
-    86:91:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.access$1100(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):36 -> a
-    86:91:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):297 -> a
-    86:91:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
-    92:92:com.android.tools.r8.graph.AppView com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.access$300(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):34:34 -> a
-    92:92:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.computeMethodStateForPolymorhicMethod(com.android.tools.r8.graph.ProgramMethod):156 -> a
-    92:92:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.access$1100(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):36 -> a
-    92:92:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):297 -> a
-    92:92:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
-    93:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.computeMethodStateForPolymorhicMethod(com.android.tools.r8.graph.ProgramMethod):156:156 -> a
+    86:86:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.access$1100(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):36:36 -> a
+    86:86:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):297 -> a
+    86:86:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
+    87:92:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.computeMethodStateForPolymorhicMethod(com.android.tools.r8.graph.ProgramMethod):149:154 -> a
+    87:92:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.access$1100(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):36 -> a
+    87:92:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):297 -> a
+    87:92:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
+    93:93:com.android.tools.r8.graph.AppView com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.access$300(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):34:34 -> a
+    93:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.computeMethodStateForPolymorhicMethod(com.android.tools.r8.graph.ProgramMethod):156 -> a
     93:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.access$1100(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):36 -> a
     93:93:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):297 -> a
     93:93:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
-    94:94:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.computeMethodStateForPolymorhicMethod(com.android.tools.r8.graph.ProgramMethod):155:155 -> a
+    94:94:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.computeMethodStateForPolymorhicMethod(com.android.tools.r8.graph.ProgramMethod):156:156 -> a
     94:94:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.access$1100(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):36 -> a
     94:94:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):297 -> a
     94:94:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
-    95:95:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):298:298 -> a
+    95:95:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.computeMethodStateForPolymorhicMethod(com.android.tools.r8.graph.ProgramMethod):155:155 -> a
+    95:95:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.access$1100(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):36 -> a
+    95:95:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):297 -> a
     95:95:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
-    96:96:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
-    96:96:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):298 -> a
+    96:96:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):298:298 -> a
     96:96:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
-    97:98:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):298:299 -> a
-    97:98:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
+    97:97:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
+    97:97:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):298 -> a
+    97:97:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
+    98:99:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):298:299 -> a
+    98:99:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):279 -> a
     1:1:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):34:34 -> b
     1:1:com.android.tools.r8.graph.AppView access$1000(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):34:34 -> c
     1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):34:34 -> d
@@ -97885,9 +96836,8 @@
     1:4:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):192:195 -> l
     5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> l
     5:5:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):195 -> l
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):255:255 -> l
-com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.Y20:
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.l10:
     java.util.Map activeUntilLowerBound -> b
     java.util.Map inactiveUntilUpperBound -> c
     com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator this$0 -> d
@@ -97923,7 +96873,7 @@
     1:1:void <init>():22:22 -> <init>
     boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType) -> a
     boolean shouldReprocessDueToDynamicType() -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection -> com.android.tools.r8.internal.X2:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection -> com.android.tools.r8.internal.W2:
     java.util.Map reproccessingCriteria -> b
     java.util.Map delayedReproccessingCriteria -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -97957,7 +96907,7 @@
     103:115:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):70:82 -> a
     116:116:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):81:81 -> a
     1:1:boolean verifyNoDelayedReprocessingCriteria():156:156 -> b
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria -> com.android.tools.r8.internal.mF:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria -> com.android.tools.r8.internal.oE:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap reproccesingCriteria -> a
     com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria ALWAYS_REPROCESS -> b
     boolean $assertionsDisabled -> c
@@ -97965,7 +96915,7 @@
     1:2:void <init>():23:24 -> <init>
     3:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):28:30 -> <init>
     1:3:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria getParameterReprocessingCriteria(int):38:38 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.ZH:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.VG:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(boolean):26:27 -> <init>
@@ -97976,17 +96926,19 @@
     16:16:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo.getNullability(int):123:123 -> a
     16:16:boolean com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria.shouldReprocessReferenceParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):89 -> a
     16:16:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):38 -> a
-    17:17:boolean com.android.tools.r8.ir.analysis.type.Nullability.isUnknown():53:53 -> a
-    17:17:boolean com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria.shouldReprocessReferenceParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):89 -> a
+    17:17:boolean com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria.shouldReprocessReferenceParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):89:89 -> a
     17:17:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):38 -> a
-    18:18:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):41:41 -> a
-    19:19:boolean com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria.shouldReprocessPrimitiveParameter(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int):63:63 -> a
-    19:19:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):42 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.WL:
+    18:18:boolean com.android.tools.r8.ir.analysis.type.Nullability.isUnknown():53:53 -> a
+    18:18:boolean com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria.shouldReprocessReferenceParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):89 -> a
+    18:18:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):38 -> a
+    19:19:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):41:41 -> a
+    20:20:boolean com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria.shouldReprocessPrimitiveParameter(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int):63:63 -> a
+    20:20:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):42 -> a
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.SK:
     1:1:void <init>():15:15 -> <init>
     boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType) -> a
     boolean shouldReprocessDueToDynamicType() -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> com.android.tools.r8.internal.VL:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> com.android.tools.r8.internal.RK:
     boolean reprocessDueToAbstractValue -> a
     boolean reprocessDueToDynamicType -> b
     boolean reprocessDueToNullability -> c
@@ -97999,14 +96951,110 @@
     1:1:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder setReprocessDueToDynamicType():70:70 -> c
     1:1:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder setReprocessDueToNullability():75:75 -> d
     1:1:boolean shouldAlwaysReprocess():80:80 -> e
-com.android.tools.r8.optimize.argumentpropagation.utils.BidirectedGraph -> com.android.tools.r8.internal.K4:
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis -> com.android.tools.r8.internal.rh:
+    java.util.Map constraints -> b
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.utils.collections.ProgramMethodSet optimizableVirtualMethods -> c
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():67:67 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):82:82 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.AppView):73:83 -> <init>
+    boolean lambda$computeEffectivelyUnusedConstraints$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value) -> a
+    1:3:void initializeOptimizableVirtualMethods(java.util.Set):88:90 -> a
+    4:4:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
+    4:4:void initializeOptimizableVirtualMethods(java.util.Set):90 -> a
+    5:5:void initializeOptimizableVirtualMethods(java.util.Set):99:99 -> a
+    6:6:void lambda$initializeOptimizableVirtualMethods$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):94:94 -> a
+    7:9:void lambda$initializeOptimizableVirtualMethods$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):93:95 -> a
+    10:10:void lambda$initializeOptimizableVirtualMethods$1(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):101:101 -> a
+    11:11:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.getFirst():50:50 -> a
+    11:11:void lambda$initializeOptimizableVirtualMethods$1(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):102 -> a
+    12:14:void lambda$initializeOptimizableVirtualMethods$1(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):102:104 -> a
+    15:37:java.util.Set computeEffectivelyUnusedConstraints(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.code.Value):133:155 -> a
+    38:42:boolean com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis.isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):210:214 -> a
+    38:42:java.util.Set computeEffectivelyUnusedConstraints(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.code.Value):156 -> a
+    43:50:java.util.Set computeEffectivelyUnusedConstraints(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.code.Value):160:167 -> a
+    51:51:java.util.Set computeEffectivelyUnusedConstraints(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.code.Value):166:166 -> a
+    52:53:void computeEffectivelyUnusedArguments(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):178:179 -> a
+    54:64:void com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph.removeUnoptimizableNodes():170:180 -> a
+    54:64:void computeEffectivelyUnusedArguments(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):183 -> a
+    65:65:void computeEffectivelyUnusedArguments(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):188:188 -> a
+    66:66:boolean com.android.tools.r8.utils.WorkList.isEmpty():112:112 -> a
+    66:66:void computeEffectivelyUnusedArguments(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):189 -> a
+    67:67:boolean com.android.tools.r8.utils.WorkList.isEmpty():112:112 -> a
+    67:67:void computeEffectivelyUnusedArguments(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):190 -> a
+    68:82:void computeEffectivelyUnusedArguments(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):191:205 -> a
+    83:87:boolean com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis.isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):210:214 -> a
+    83:87:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):113 -> a
+    88:98:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):116:126 -> a
+    99:101:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):222:224 -> a
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph -> com.android.tools.r8.internal.sh:
+    java.util.Map nodes -> b
+    com.android.tools.r8.graph.AppView appView -> a
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):35:35 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):33:36 -> <init>
+    1:2:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph create(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):43:44 -> a
+    3:3:void lambda$create$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Set):46:46 -> a
+    4:5:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph.getOrCreateNode(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):99:100 -> a
+    4:5:void lambda$create$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Set):46 -> a
+    6:6:void lambda$create$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Set):47:47 -> a
+    7:11:void com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph.addConstraintEdge(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):59:63 -> a
+    7:11:void lambda$create$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Set):48 -> a
+    12:40:void com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph.addConstraintEdge(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):62:90 -> a
+    12:40:void lambda$create$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Set):48 -> a
+    41:41:java.util.Collection getNodes():95:95 -> a
+    42:42:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode getOrCreateNode(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):105:105 -> a
+    43:43:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode lambda$getOrCreateNode$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):106:106 -> a
+    44:54:void removeClosedCycles(java.util.function.Consumer):119:129 -> a
+    55:55:boolean com.android.tools.r8.utils.dfs.DFSWorklistItem.isFullyVisited():0:0 -> a
+    55:55:void removeClosedCycles(java.util.function.Consumer):130 -> a
+    56:60:void removeClosedCycles(java.util.function.Consumer):133:137 -> a
+    61:77:boolean lambda$removeClosedCycles$3(com.android.tools.r8.utils.dfs.DFSStack,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode,java.util.function.Consumer,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):139:155 -> a
+    78:78:boolean lambda$removeClosedCycles$2(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):143:143 -> a
+    1:6:void remove(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):110:115 -> b
+    1:3:boolean verifyContains(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):164:166 -> c
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode -> com.android.tools.r8.internal.th:
+    java.util.Set predecessors -> c
+    java.util.Set successors -> d
+    boolean unoptimizable -> e
+    boolean $assertionsDisabled -> f
+    int argumentIndex -> b
+    com.android.tools.r8.graph.ProgramMethod method -> a
+    1:1:void <clinit>():18:18 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,int):28:28 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.ProgramMethod,int):23:30 -> <init>
+    1:4:void addSuccessor(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):34:37 -> a
+    5:9:void com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode.clearSuccessors():47:51 -> a
+    5:9:void cleanForRemoval():42 -> a
+    10:14:void com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode.clearPredecessors():55:59 -> a
+    10:14:void cleanForRemoval():43 -> a
+    15:30:boolean isNullable(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):79:94 -> a
+    31:31:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.isUnknown():0:0 -> a
+    31:31:boolean isNullable(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):94 -> a
+    32:34:boolean isNullable(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):97:99 -> a
+    35:35:void lambda$setUnused$1(java.util.BitSet):130:130 -> a
+    1:1:int getArgumentIndex():63:63 -> b
+    2:2:boolean lambda$removeUnusedSuccessors$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):114:114 -> b
+    3:4:boolean com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode.isUnused():107:108 -> b
+    3:4:boolean lambda$removeUnusedSuccessors$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):114 -> b
+    5:6:boolean lambda$removeUnusedSuccessors$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):115:116 -> b
+    1:1:com.android.tools.r8.graph.ProgramMethod getMethod():67:67 -> c
+    1:1:java.util.Set getPredecessors():71:71 -> d
+    1:1:java.util.Set getSuccessors():75:75 -> e
+    1:1:boolean isUnoptimizable():103:103 -> f
+    1:1:void removeUnusedSuccessors():112:112 -> g
+    1:1:void setUnoptimizable():124:124 -> h
+    1:7:void setUnused():128:134 -> i
+com.android.tools.r8.optimize.argumentpropagation.utils.BidirectedGraph -> com.android.tools.r8.internal.H4:
     1:1:void <init>():14:14 -> <init>
     void forEachNeighbor(java.lang.Object,java.util.function.Consumer) -> a
     void forEachNode(java.util.function.Consumer) -> a
     1:3:java.util.List computeStronglyConnectedComponents():25:27 -> a
     4:9:void lambda$computeStronglyConnectedComponents$0(java.util.Set,java.util.List,java.lang.Object):29:34 -> a
     10:15:java.util.Set computeStronglyConnectedComponent(java.lang.Object):40:45 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal -> com.android.tools.r8.internal.lf:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal -> com.android.tools.r8.internal.Ve:
     java.util.Map states -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List newlySeenButNotFinishedRoots -> d
@@ -98057,19 +97105,17 @@
     16:18:void com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal.markFinished(com.android.tools.r8.graph.DexProgramClass):183:185 -> j
     16:18:void traverse(com.android.tools.r8.graph.DexProgramClass):129 -> j
     void visit(com.android.tools.r8.graph.DexProgramClass) -> k
-com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.kf:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.Ue:
     com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState FINISHED -> c
     com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState SEEN -> b
     1:5:void <clinit>():30:34 -> <clinit>
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
-com.android.tools.r8.optimize.argumentpropagation.utils.ParameterRemovalUtils -> com.android.tools.r8.internal.UL:
+com.android.tools.r8.optimize.argumentpropagation.utils.ParameterRemovalUtils -> com.android.tools.r8.internal.QK:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
-    1:1:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):27:27 -> a
-    2:7:boolean com.android.tools.r8.optimize.argumentpropagation.utils.ParameterRemovalUtils.canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):17:22 -> a
-    2:7:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):27 -> a
-    8:19:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):27:38 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph -> com.android.tools.r8.internal.vN:
+    1:10:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):17:26 -> a
+    11:22:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):31:42 -> a
+com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph -> com.android.tools.r8.internal.mM:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):20:22 -> <init>
@@ -98082,7 +97128,7 @@
     4:4:void com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph.forEachNeighbor(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):28:28 -> a
     4:4:void forEachNeighbor(java.lang.Object,java.util.function.Consumer):13 -> a
     5:5:void forEachNode(java.util.function.Consumer):33:33 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.android.tools.r8.internal.B30:
+com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.android.tools.r8.internal.N10:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:com.android.tools.r8.ir.analysis.type.DynamicType widenDynamicReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType):28:29 -> a
@@ -98099,7 +97145,6 @@
     19:20:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):60:61 -> a
     21:21:boolean com.android.tools.r8.ir.analysis.type.Nullability.strictlyLessThan(com.android.tools.r8.ir.analysis.type.Nullability):87:87 -> a
     21:21:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):61 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     22:23:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):62:63 -> a
     24:24:boolean com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.hasTrivialLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):87:87 -> a
     24:24:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):64 -> a
@@ -98129,7 +97174,7 @@
     50:50:boolean com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:101 -> a
     50:50:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):82 -> a
     51:51:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):82:82 -> a
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.R5:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.O5:
     com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult result -> b
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -98202,22 +97247,24 @@
     221:221:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):306:306 -> a
     221:221:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
     225:225:java.util.List lambda$hoistBridgeIfPossible$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):201:201 -> a
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.S5:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.P5:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap bridgeToHoistedBridgeMap -> f
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneMap):25:26 -> <init>
     com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod) -> a
     1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):43:43 -> a
     2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):53:53 -> a
+    3:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):61:61 -> a
+    4:4:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    4:4:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):61 -> a
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
     1:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):31:32 -> b
     3:3:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):48:48 -> b
-    4:4:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):58:58 -> b
+    1:3:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):68:70 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):63:63 -> d
-    1:1:boolean hasCodeRewritings():73:73 -> e
-    1:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):37:38 -> f
-    3:3:boolean isContextFreeForMethods():68:68 -> f
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.T5:
+    1:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):37:38 -> e
+    3:3:boolean hasCodeRewritings():80:80 -> e
+    1:1:boolean isContextFreeForMethods():75:75 -> g
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.Q5:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap bridgeToHoistedBridgeMap -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -98226,21 +97273,20 @@
     2:5:void <init>(com.android.tools.r8.graph.AppView):26:29 -> <init>
     1:1:void forEachHoistedBridge(java.util.function.BiConsumer):33:33 -> a
     2:5:void lambda$forEachHoistedBridge$0(java.util.function.BiConsumer,java.util.Set,com.android.tools.r8.graph.DexMethod):35:38 -> a
-    6:6:void move(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):48:48 -> a
-    7:7:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> a
-    7:7:void move(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):49 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:void move(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):49:49 -> a
-    9:9:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():305:305 -> a
-    9:9:void move(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):50 -> a
-    10:20:void move(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):51:61 -> a
-    21:25:void recordNonReboundMethodAccesses(com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder):66:70 -> a
-    26:31:void lambda$recordNonReboundMethodAccesses$3(com.android.tools.r8.graph.MethodAccessInfoCollection,com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder,com.android.tools.r8.graph.DexMethod):72:77 -> a
-    32:32:void lambda$recordNonReboundMethodAccesses$1(com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):75:75 -> a
-    33:33:com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens buildLens():86:86 -> a
-    34:34:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult.isEmpty():44:44 -> a
-    34:34:com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens buildLens():86 -> a
-    35:36:com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens buildLens():86:87 -> a
+    6:7:void move(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):48:49 -> a
+    8:8:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> a
+    8:8:void move(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):49 -> a
+    9:9:void move(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):49:49 -> a
+    10:10:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():305:305 -> a
+    10:10:void move(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):50 -> a
+    11:21:void move(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):51:61 -> a
+    22:26:void recordNonReboundMethodAccesses(com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder):66:70 -> a
+    27:32:void lambda$recordNonReboundMethodAccesses$3(com.android.tools.r8.graph.MethodAccessInfoCollection,com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder,com.android.tools.r8.graph.DexMethod):72:77 -> a
+    33:33:void lambda$recordNonReboundMethodAccesses$1(com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):75:75 -> a
+    34:34:com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens buildLens():86:86 -> a
+    35:35:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult.isEmpty():44:44 -> a
+    35:35:com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens buildLens():86 -> a
+    36:37:com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens buildLens():86:87 -> a
     1:1:boolean isEmpty():44:44 -> b
     2:2:void lambda$recordNonReboundMethodAccesses$2(com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):80:80 -> b
 com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> com.android.tools.r8.internal.a2:
@@ -98284,7 +97330,7 @@
     178:178:void putAnnotations(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.ByteVector):468:468 -> a
     179:202:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):526:549 -> a
     1:8:int computeAnnotationsSize(java.lang.String):334:341 -> b
-com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.internal.U3:
+com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.internal.R3:
     byte[] content -> b
     java.lang.String type -> a
     com.android.tools.r8.org.objectweb.asm.Attribute nextAttribute -> c
@@ -98293,7 +97339,7 @@
     4:4:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159:159 -> a
     5:18:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int):247:260 -> a
     19:29:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):336:346 -> a
-com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.internal.T3:
+com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.internal.Q3:
     com.android.tools.r8.org.objectweb.asm.Attribute[] data -> b
     int size -> a
     1:6:void <init>():351:356 -> <init>
@@ -98303,7 +97349,7 @@
     5:10:void com.android.tools.r8.org.objectweb.asm.Attribute$Set.add(com.android.tools.r8.org.objectweb.asm.Attribute):384:389 -> a
     5:10:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):362 -> a
     11:11:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):364:364 -> a
-com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.internal.d6:
+com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.internal.a6:
     byte[] data -> a
     int length -> b
     1:2:void <init>():45:46 -> <init>
@@ -98323,7 +97369,7 @@
     1:9:com.android.tools.r8.org.objectweb.asm.ByteVector put12(int,int):130:138 -> c
     10:19:com.android.tools.r8.org.objectweb.asm.ByteVector putInt(int):172:181 -> c
     1:8:com.android.tools.r8.org.objectweb.asm.ByteVector putShort(int):110:117 -> d
-com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.Ua:
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.Ea:
     int[] bootstrapMethodOffsets -> f
     byte[] classFileBuffer -> b
     int[] cpInfoOffsets -> c
@@ -98645,7 +97691,7 @@
     1:2:long readLong(int):3634:3635 -> e
     1:2:short readShort(int):3607:3608 -> f
     1:2:int readUnsignedShort(int):3595:3596 -> g
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.db:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.Ja:
     java.lang.String className -> b
     int constantPoolCount -> c
     1:1:void <init>(java.lang.String,int):0:0 -> <init>
@@ -98658,7 +97704,7 @@
     50:52:void <init>(java.lang.String,int):49:51 -> <init>
     1:1:java.lang.String getClassName():60:60 -> a
     1:1:int getConstantPoolCount():69:69 -> b
-com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.hb:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.Na:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):58:58 -> <init>
@@ -98684,7 +97730,7 @@
     12:12:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):305:305 -> b
     1:5:void visitPermittedSubclass(java.lang.String):265:269 -> c
     6:6:void visitPermittedSubclass(java.lang.String):266:266 -> c
-com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.rb:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.Xa:
 # {"id":"sourceFile","fileName":"ClassWriter.java"}
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
@@ -98754,7 +97800,7 @@
     307:307:byte[] toByteArray():720:720 -> b
     308:308:byte[] toByteArray():599:599 -> b
     1:5:void visitPermittedSubclass(java.lang.String):377:381 -> c
-com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.Hd:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.jd:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -98769,7 +97815,7 @@
     1:8:boolean equals(java.lang.Object):150:157 -> equals
     1:4:int hashCode():162:165 -> hashCode
     1:7:java.lang.String toString():170:176 -> toString
-com.android.tools.r8.org.objectweb.asm.Constants -> com.android.tools.r8.internal.Nd:
+com.android.tools.r8.org.objectweb.asm.Constants -> com.android.tools.r8.internal.pd:
 # {"id":"sourceFile","fileName":"Constants.java"}
     1:2:void checkAsmExperimental(java.lang.Object):186:187 -> a
     3:10:boolean com.android.tools.r8.org.objectweb.asm.Constants.isWhitelisted(java.lang.String):194:201 -> a
@@ -98781,7 +97827,7 @@
     24:24:void checkAsmExperimental(java.lang.Object):189 -> a
     25:25:void com.android.tools.r8.org.objectweb.asm.Constants.checkIsPreview(java.io.InputStream):207:207 -> a
     25:25:void checkAsmExperimental(java.lang.Object):189 -> a
-com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.he:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.Jd:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -98802,15 +97848,15 @@
     int[] currentLocalVariableAnnotationRangeIndices -> l
     int currentFrameLocalCountDelta -> p
     1:1:void <init>():36:36 -> <init>
-com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.le:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.Nd:
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.Label):40:40 -> <init>
     1:4:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):51:54 -> a
-com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.Jh:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.qh:
     com.android.tools.r8.org.objectweb.asm.Label successor -> b
     int info -> a
     com.android.tools.r8.org.objectweb.asm.Edge nextEdge -> c
     1:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Edge):86:89 -> <init>
-com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.lk:
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.Rj:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> b
     int api -> a
     1:1:void <init>(int):57:57 -> <init>
@@ -98828,7 +97874,7 @@
     8:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):117:117 -> a
     9:10:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):131:132 -> a
     11:12:void visitEnd():141:142 -> a
-com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.mk:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.Sj:
     com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> m
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> i
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> c
@@ -98857,7 +97903,7 @@
     15:21:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):219:225 -> b
     15:21:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable):191 -> b
     15:21:int computeFieldInfoSize():208 -> b
-com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.el:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.Ik:
     short outputStackTop -> g
     short outputStackStart -> f
     int[] initializations -> i
@@ -98967,7 +98013,7 @@
     1:11:void setLocal(int,int):504:514 -> b
     12:27:void push(int):524:539 -> b
     28:32:int pop():567:571 -> b
-com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.om:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.Rl:
     boolean isInterface -> e
     java.lang.String name -> c
     java.lang.String owner -> b
@@ -98982,7 +98028,7 @@
     1:9:boolean equals(java.lang.Object):159:167 -> equals
     1:3:int hashCode():172:174 -> hashCode
     1:1:java.lang.String toString():187:187 -> toString
-com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.pm:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.Sl:
     com.android.tools.r8.org.objectweb.asm.Handler nextHandler -> f
     com.android.tools.r8.org.objectweb.asm.Label handlerPc -> c
     int catchType -> d
@@ -99002,7 +98048,7 @@
     26:27:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147:148 -> a
     28:29:void com.android.tools.r8.org.objectweb.asm.Handler.<init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
     28:29:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):148 -> a
-com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.NA:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.Wz:
     com.android.tools.r8.org.objectweb.asm.Frame frame -> k
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> m
     int bytecodeOffset -> e
@@ -99039,7 +98085,7 @@
     623:623:java.lang.String toString():620:620 -> toString
     624:624:java.lang.String toString():620:620 -> toString
     621:621:java.lang.String toString():620:620 -> toString
-com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.qF:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.sE:
     int codeSize -> e
     java.lang.String methodName -> c
     java.lang.String className -> b
@@ -99049,7 +98095,7 @@
     1:1:int getCodeSize():97:97 -> b
     1:1:java.lang.String getDescriptor():88:88 -> c
     1:1:java.lang.String getMethodName():79:79 -> d
-com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.rF:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.tE:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):71:71 -> <init>
@@ -99102,7 +98148,7 @@
     7:8:void visitMaxs(int,int):772:773 -> c
     9:10:void visitEnd():782:783 -> c
     1:2:void visitVarInsn(int,int):358:359 -> d
-com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.sF:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.uE:
     boolean hasSubroutines -> d0
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> I
     int nameIndex -> l
@@ -99314,7 +98360,7 @@
     107:107:void com.android.tools.r8.org.objectweb.asm.MethodWriter.putFrame():1914:1914 -> h
     107:107:void visitFrameEnd():1850 -> h
     108:111:void visitFrameEnd():1851:1854 -> h
-com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.SF:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.PE:
     com.android.tools.r8.org.objectweb.asm.ModuleVisitor mv -> a
     1:1:void <init>(int):57:57 -> <init>
     2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):68:76 -> <init>
@@ -99334,7 +98380,7 @@
     1:2:void visitPackage(java.lang.String):102:103 -> b
     3:4:void visitOpen(java.lang.String,int,java.lang.String[]):146:147 -> b
     1:2:void visitUse(java.lang.String):158:159 -> c
-com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.TF:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.QE:
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> m
     int providesCount -> n
     com.android.tools.r8.org.objectweb.asm.ByteVector opens -> k
@@ -99364,7 +98410,7 @@
     13:23:int computeAttributesSize():196:206 -> b
     1:2:void visitUse(java.lang.String):160:161 -> c
     3:3:int getAttributeCount():186:186 -> c
-com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.XK:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.TJ:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -99373,7 +98419,7 @@
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
     1:7:void <clinit>():392:398 -> <clinit>
-com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.IQ:
+com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.sP:
     com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor delegate -> a
     1:1:void <init>(int):57:57 -> <init>
     2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):68:76 -> <init>
@@ -99389,7 +98435,7 @@
     3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):126:127 -> a
     5:6:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):138:139 -> a
     7:8:void visitEnd():148:149 -> a
-com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.JQ:
+com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.tP:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleTypeAnnotation -> h
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> i
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> f
@@ -99416,7 +98462,7 @@
     10:16:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):219:225 -> b
     10:16:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable):191 -> b
     10:16:int computeRecordComponentInfoSize():169 -> b
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.MY:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.eX:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -99549,7 +98595,7 @@
     11:20:int com.android.tools.r8.org.objectweb.asm.SymbolTable.addTypeInternal(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):1216:1225 -> e
     11:20:int addType(java.lang.String):1148 -> e
     1:1:com.android.tools.r8.org.objectweb.asm.ClassReader getSource():288:288 -> f
-com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.LY:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.dX:
     long com.android.tools.r8.org.objectweb.asm.Symbol.data -> f
     int hashCode -> h
     int com.android.tools.r8.org.objectweb.asm.Symbol.info -> g
@@ -99574,7 +98620,7 @@
     33:39:void com.android.tools.r8.org.objectweb.asm.Symbol.<init>(int,int,java.lang.String,java.lang.String,java.lang.String,long):220:226 -> <init>
     33:39:void <init>(int,int,java.lang.String,java.lang.String,int):1313 -> <init>
     40:40:void <init>(int,int,java.lang.String,java.lang.String,int):1314:1314 -> <init>
-com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.k00:
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.AY:
     com.android.tools.r8.org.objectweb.asm.Type FLOAT_TYPE -> k
     com.android.tools.r8.org.objectweb.asm.Type INT_TYPE -> j
     com.android.tools.r8.org.objectweb.asm.Type DOUBLE_TYPE -> m
@@ -99634,7 +98680,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> f
     1:4:int hashCode():877:880 -> hashCode
     1:1:java.lang.String toString():893:893 -> toString
-com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.j10:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.zZ:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -99651,7 +98697,7 @@
     7:7:java.lang.String toString():174:174 -> toString
     8:8:java.lang.String toString():171:171 -> toString
     9:24:java.lang.String toString():168:183 -> toString
-com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.k10:
+com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.AZ:
     int targetTypeAndInfo -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:int getExceptionIndex():359:359 -> a
@@ -99662,7 +98708,7 @@
     1:1:int getTypeArgumentIndex():382:382 -> f
     1:1:int getTypeParameterBoundIndex():327:327 -> g
     1:1:int getTypeParameterIndex():315:315 -> h
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.wv:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.Qu:
     java.util.BitSet mainSubroutineInsns -> F
     java.util.BitSet sharedSubroutineInsns -> H
     java.util.Map subroutinesInsns -> G
@@ -99686,27 +98732,24 @@
     28:47:void visitEnd():154 -> c
     48:57:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():302:311 -> c
     48:57:void visitEnd():155 -> c
-    58:62:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):340:344 -> c
-    58:62:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    58:62:void visitEnd():155 -> c
-    63:63:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):546:546 -> c
-    63:63:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):345 -> c
-    63:63:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    63:63:void visitEnd():155 -> c
-    64:82:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):347:365 -> c
-    64:82:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    64:82:void visitEnd():155 -> c
-    83:94:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):363:374 -> c
-    83:94:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    83:94:void visitEnd():155 -> c
-    95:95:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):371:371 -> c
-    95:95:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    95:95:void visitEnd():155 -> c
-    96:96:void visitEnd():0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":144,"2":145,"3":146,"4":147,"5":148,"6":149}}
-    144:144:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):371:371 -> c
-    144:144:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    144:144:void visitEnd():155 -> c
+    58:63:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):340:345 -> c
+    58:63:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    58:63:void visitEnd():155 -> c
+    64:64:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):546:546 -> c
+    64:64:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):345 -> c
+    64:64:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    64:64:void visitEnd():155 -> c
+    65:83:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):347:365 -> c
+    65:83:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    65:83:void visitEnd():155 -> c
+    84:95:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):363:374 -> c
+    84:95:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    84:95:void visitEnd():155 -> c
+    96:96:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):371:371 -> c
+    96:96:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    96:96:void visitEnd():155 -> c
+    97:97:void visitEnd():0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":145,"2":146,"3":147,"4":148,"5":149,"6":150}}
     145:145:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):371:371 -> c
     145:145:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
     145:145:void visitEnd():155 -> c
@@ -99722,58 +98765,61 @@
     149:149:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):371:371 -> c
     149:149:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
     149:149:void visitEnd():155 -> c
-    97:104:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):371:378 -> c
-    97:104:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    97:104:void visitEnd():155 -> c
-    105:105:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabelForJumpInsn(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):534:534 -> c
-    105:105:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):379 -> c
-    105:105:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    105:105:void visitEnd():155 -> c
-    106:119:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):384:397 -> c
-    106:119:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    106:119:void visitEnd():155 -> c
-    120:120:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):546:546 -> c
-    120:120:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):397 -> c
-    120:120:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    120:120:void visitEnd():155 -> c
-    121:121:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):398:398 -> c
+    150:150:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):371:371 -> c
+    150:150:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    150:150:void visitEnd():155 -> c
+    98:105:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):371:378 -> c
+    98:105:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    98:105:void visitEnd():155 -> c
+    106:106:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabelForJumpInsn(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):534:534 -> c
+    106:106:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):379 -> c
+    106:106:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    106:106:void visitEnd():155 -> c
+    107:120:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):384:397 -> c
+    107:120:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    107:120:void visitEnd():155 -> c
+    121:121:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):546:546 -> c
+    121:121:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):397 -> c
     121:121:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
     121:121:void visitEnd():155 -> c
-    122:122:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):546:546 -> c
-    122:122:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):398 -> c
+    122:122:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):398:398 -> c
     122:122:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
     122:122:void visitEnd():155 -> c
-    123:123:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):400:400 -> c
+    123:123:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):546:546 -> c
+    123:123:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):398 -> c
     123:123:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
     123:123:void visitEnd():155 -> c
-    124:124:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabelForJumpInsn(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):534:534 -> c
-    124:124:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):401 -> c
+    124:124:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):400:400 -> c
     124:124:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
     124:124:void visitEnd():155 -> c
-    125:125:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):405:405 -> c
+    125:125:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabelForJumpInsn(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):534:534 -> c
+    125:125:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):401 -> c
     125:125:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
     125:125:void visitEnd():155 -> c
-    126:134:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):403:411 -> c
-    126:134:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    126:134:void visitEnd():155 -> c
-    135:135:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):546:546 -> c
-    135:135:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):411 -> c
-    135:135:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
-    135:135:void visitEnd():155 -> c
-    136:136:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):412:412 -> c
+    126:126:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):405:405 -> c
+    126:126:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    126:126:void visitEnd():155 -> c
+    127:135:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):403:411 -> c
+    127:135:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    127:135:void visitEnd():155 -> c
+    136:136:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):546:546 -> c
+    136:136:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):411 -> c
     136:136:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
     136:136:void visitEnd():155 -> c
-    137:137:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):546:546 -> c
-    137:137:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):412 -> c
+    137:137:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):412:412 -> c
     137:137:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
     137:137:void visitEnd():155 -> c
-    138:138:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):414:414 -> c
+    138:138:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):546:546 -> c
+    138:138:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):412 -> c
     138:138:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
     138:138:void visitEnd():155 -> c
-    139:141:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():315:317 -> c
-    139:141:void visitEnd():155 -> c
-    142:143:void visitEnd():157:158 -> c
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.vv:
+    139:139:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):414:414 -> c
+    139:139:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():312 -> c
+    139:139:void visitEnd():155 -> c
+    140:142:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():315:317 -> c
+    140:142:void visitEnd():155 -> c
+    143:144:void visitEnd():157:158 -> c
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.Pu:
     java.util.Map clonedLabels -> d
     java.util.BitSet subroutineInsns -> c
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode returnLabel -> e
@@ -99791,7 +98837,7 @@
     2:2:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):558 -> get
     2:2:java.lang.Object get(java.lang.Object):427 -> get
     1:1:int hashCode():568:568 -> hashCode
-com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.internal.yV:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.internal.OT:
     java.lang.String signatureValue -> a
     1:2:void <init>(java.lang.String):49:50 -> <init>
     1:17:void accept(com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):64:80 -> a
@@ -99803,7 +98849,7 @@
     230:230:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):229:229 -> a
     231:241:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):196:206 -> a
     242:242:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):168:168 -> a
-com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor -> com.android.tools.r8.internal.zV:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor -> com.android.tools.r8.internal.PT:
     1:1:void <init>(int):74:74 -> <init>
 com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode -> com.android.tools.r8.internal.w:
     java.util.List visibleTypeAnnotations -> b
@@ -99855,7 +98901,7 @@
     82:90:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):151:159 -> a
     91:98:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):190:197 -> a
     99:115:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,java.lang.Object):211:227 -> a
-com.android.tools.r8.org.objectweb.asm.tree.ClassNode -> com.android.tools.r8.internal.Ea:
+com.android.tools.r8.org.objectweb.asm.tree.ClassNode -> com.android.tools.r8.internal.qa:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     java.util.List invisibleAnnotations -> d
@@ -99892,7 +98938,7 @@
     3:3:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):262 -> b
     4:4:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):263:263 -> b
     1:1:void visitPermittedSubclass(java.lang.String):249:249 -> c
-com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.Lj:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.sj:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -99900,7 +98946,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):88:89 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):94:94 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.FieldNode -> com.android.tools.r8.internal.Tj:
+com.android.tools.r8.org.objectweb.asm.tree.FieldNode -> com.android.tools.r8.internal.Aj:
     java.util.List visibleTypeAnnotations -> f
     java.util.List invisibleAnnotations -> e
     java.util.List visibleAnnotations -> d
@@ -99912,7 +98958,7 @@
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):144:148 -> a
     6:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):156:160 -> a
     11:11:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):167:167 -> a
-com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.fl:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.Jk:
     int type -> g
     java.util.List stack -> i
     java.util.List local -> h
@@ -99931,16 +98977,16 @@
     25:44:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):152:171 -> a
     45:51:java.lang.Object[] asArray(java.util.List):178:184 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.Rn:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.wn:
     int incr -> h
     int var -> g
     1:3:void <init>(int,int):54:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.InnerClassNode -> com.android.tools.r8.internal.Ip:
+com.android.tools.r8.org.objectweb.asm.tree.InnerClassNode -> com.android.tools.r8.internal.kp:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,int):70:70 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.Kp:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.mp:
     int size -> b
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode lastInsn -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] cache -> e
@@ -99963,7 +99009,7 @@
     1:1:java.util.ListIterator com.android.tools.r8.org.objectweb.asm.tree.InsnList.iterator():156 -> iterator
     1:1:java.util.Iterator iterator():38 -> iterator
     1:1:int size():61:61 -> size
-com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.Jp:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.lp:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode remove -> d
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> e
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode nextInsn -> b
@@ -99981,18 +99027,18 @@
     1:7:int previousIndex():568:574 -> previousIndex
     1:10:void remove():525:534 -> remove
     1:9:void set(java.lang.Object):592:600 -> set
-com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.Lp:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.np:
     1:1:void <init>(int):55:55 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):65:66 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):71:71 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.ot:
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.Ks:
     int operand -> g
     1:2:void <init>(int,int):51:52 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):71:72 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):77:77 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.Hu:
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.bu:
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
@@ -100001,7 +99047,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):84:85 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:90 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.fw:
+com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.yv:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode label -> g
     1:2:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):57:58 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):79:80 -> a
@@ -100010,7 +99056,7 @@
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85 -> a
     5:5:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85:85 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.OA:
+com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.Xz:
     com.android.tools.r8.org.objectweb.asm.Label value -> g
     1:1:void <init>():40:40 -> <init>
     1:1:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):68:68 -> a
@@ -100018,13 +99064,13 @@
     int getType() -> b
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():60:63 -> c
     1:1:void resetLabel():77:77 -> d
-com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.pB:
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.yA:
     java.lang.Object cst -> g
     1:2:void <init>(java.lang.Object):64:65 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):75:76 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):81:81 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.UB:
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.eB:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> h
     int line -> g
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):55:57 -> <init>
@@ -100034,14 +99080,14 @@
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.NC:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.VB:
     java.util.List start -> f
     java.util.List index -> h
     java.util.List end -> g
     1:4:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],int[],java.lang.String):116:119 -> <init>
     1:10:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):129:138 -> a
     11:11:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):137:137 -> a
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.OC:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.WB:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -100049,7 +99095,7 @@
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> d
     1:7:void <init>(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,int):74:80 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.tD:
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.BC:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -100063,7 +99109,7 @@
     14:16:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89 -> a
     17:19:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.UE:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.WD:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -100072,7 +99118,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):115:116 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):121:121 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.YE:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.aE:
     java.util.List attrs -> r
     java.util.List invisibleTypeAnnotations -> q
     com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> x
@@ -100126,38 +99172,34 @@
     65:67:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):423 -> a
     68:68:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):423:423 -> a
     69:69:void visitMultiANewArrayInsn(java.lang.String,int):428:428 -> a
-    70:70:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):435:435 -> a
-    71:71:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():137:137 -> a
-    71:71:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):436 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    72:72:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getPrevious():154:154 -> a
-    72:72:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):437 -> a
-    73:79:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):440:446 -> a
-    80:82:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):454:456 -> a
-    83:86:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):482:485 -> a
-    87:87:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):497:497 -> a
-    88:91:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):542:542 -> a
-    88:91:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):499 -> a
-    92:93:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):543:544 -> a
-    92:93:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):499 -> a
-    94:94:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode.<init>(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],int[],java.lang.String):87:87 -> a
-    94:94:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):499 -> a
-    95:99:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):501:505 -> a
-    100:102:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):660:662 -> a
-    103:103:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:66 -> a
-    103:103:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):662 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    104:127:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):666:689 -> a
-    128:137:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):688:697 -> a
-    138:188:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):696:746 -> a
-    189:196:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):89:96 -> a
-    189:196:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):746 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    197:205:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):747:755 -> a
-    206:208:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
-    206:208:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):755 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    209:222:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):759:772 -> a
+    70:71:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):435:436 -> a
+    72:72:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():137:137 -> a
+    72:72:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):436 -> a
+    73:73:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getPrevious():154:154 -> a
+    73:73:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):437 -> a
+    74:80:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):440:446 -> a
+    81:83:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):454:456 -> a
+    84:87:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):482:485 -> a
+    88:88:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):497:497 -> a
+    89:92:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):542:542 -> a
+    89:92:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):499 -> a
+    93:94:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):543:544 -> a
+    93:94:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):499 -> a
+    95:95:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode.<init>(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],int[],java.lang.String):87:87 -> a
+    95:95:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):499 -> a
+    96:100:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):501:505 -> a
+    101:103:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):660:662 -> a
+    104:104:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:66 -> a
+    104:104:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):662 -> a
+    105:128:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):666:689 -> a
+    129:138:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):688:697 -> a
+    139:189:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):696:746 -> a
+    190:197:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):89:96 -> a
+    190:197:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):746 -> a
+    198:206:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):747:755 -> a
+    207:209:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
+    207:209:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):755 -> a
+    210:223:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):759:772 -> a
     void visitCode() -> b
     1:4:void visitParameter(java.lang.String,int):241:244 -> b
     5:5:void visitIntInsn(int,int):348:348 -> b
@@ -100168,13 +99210,13 @@
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):274:278 -> c
     6:7:void visitMaxs(int,int):517:518 -> c
     1:1:void visitVarInsn(int,int):353:353 -> d
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.XE:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.ZD:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> b
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,int):251:251 -> <init>
     1:2:boolean add(java.lang.Object):254:255 -> add
-com.android.tools.r8.org.objectweb.asm.tree.ModuleExportNode -> com.android.tools.r8.internal.NF:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleExportNode -> com.android.tools.r8.internal.KE:
     1:1:void <init>(java.lang.String,int,java.util.List):64:64 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.ModuleNode -> com.android.tools.r8.internal.OF:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleNode -> com.android.tools.r8.internal.LE:
     java.util.List packages -> b
     java.util.List uses -> f
     java.util.List opens -> e
@@ -100190,24 +99232,24 @@
     1:4:void visitPackage(java.lang.String):140:143 -> b
     5:8:void visitOpen(java.lang.String,int,java.lang.String[]):164:167 -> b
     1:4:void visitUse(java.lang.String):172:175 -> c
-com.android.tools.r8.org.objectweb.asm.tree.ModuleOpenNode -> com.android.tools.r8.internal.PF:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleOpenNode -> com.android.tools.r8.internal.ME:
     1:1:void <init>(java.lang.String,int,java.util.List):64:64 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.ModuleProvideNode -> com.android.tools.r8.internal.QF:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleProvideNode -> com.android.tools.r8.internal.NE:
     1:1:void <init>(java.lang.String,java.util.List):53:53 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.ModuleRequireNode -> com.android.tools.r8.internal.RF:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleRequireNode -> com.android.tools.r8.internal.OE:
     1:1:void <init>(java.lang.String,int,java.lang.String):59:59 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.cG:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.ZE:
     java.lang.String desc -> g
     int dims -> h
     1:3:void <init>(java.lang.String,int):54:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.TL:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.PK:
     java.lang.String name -> a
     int access -> b
     1:3:void <init>(java.lang.String,int):55:57 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.RecordComponentNode -> com.android.tools.r8.internal.HQ:
+com.android.tools.r8.org.objectweb.asm.tree.RecordComponentNode -> com.android.tools.r8.internal.rP:
     java.util.List visibleAnnotations -> b
     java.util.List attrs -> f
     java.util.List invisibleTypeAnnotations -> e
@@ -100218,7 +99260,7 @@
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):108:112 -> a
     6:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):120:124 -> a
     11:11:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):131:131 -> a
-com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.gZ:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.wX:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -100233,7 +99275,7 @@
     10:12:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90 -> a
     13:14:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.i00:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.yY:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
@@ -100245,24 +99287,24 @@
     5:9:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):109:113 -> a
     10:19:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):112:121 -> a
     20:20:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):120:120 -> a
-com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.e10:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.uZ:
     int typeRef -> d
     com.android.tools.r8.org.objectweb.asm.TypePath typePath -> e
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):62:64 -> <init>
     4:6:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):82:84 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.i10:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.yZ:
     java.lang.String desc -> g
     1:2:void <init>(int,java.lang.String):56:57 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):77:78 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):83:83 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.h20:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.x00:
     1:2:java.util.List add(java.util.List,java.lang.Object):44:45 -> a
     3:5:java.util.List asArrayList(int):50:52 -> a
     6:10:java.util.List asArrayList(java.lang.Object[]):59:63 -> a
     11:15:java.util.List asArrayList(int[]):114:118 -> a
     16:18:java.util.List asArrayList(int,java.lang.Object[]):157:159 -> a
-com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.z20:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.O00:
     int var -> g
     1:2:void <init>(int,int):53:54 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):74:75 -> a
@@ -100279,84 +99321,84 @@
     boolean[] inInstructionsToProcess -> n
     int numInstructionsToProcess -> p
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter):88:89 -> <init>
-    1:53:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):106:158 -> a
-    54:54:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):461:461 -> a
-    54:54:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    55:55:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.newFrame(int,int):531:531 -> a
-    55:55:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):461 -> a
-    55:55:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    56:60:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):463:467 -> a
-    56:60:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    61:61:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
-    61:61:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newParameterValue(boolean,int,com.android.tools.r8.org.objectweb.asm.Type):97 -> a
-    61:61:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):467 -> a
-    61:61:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    62:70:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):466:474 -> a
-    62:70:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    71:71:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
-    71:71:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newParameterValue(boolean,int,com.android.tools.r8.org.objectweb.asm.Type):97 -> a
-    71:71:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):474 -> a
-    71:71:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    72:77:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):472:477 -> a
-    72:77:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    78:78:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
-    78:78:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newEmptyValue(int):126 -> a
-    78:78:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):477 -> a
-    78:78:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    79:84:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):477:482 -> a
-    79:84:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    85:85:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
-    85:85:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newEmptyValue(int):126 -> a
-    85:85:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):482 -> a
-    85:85:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    86:89:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):482:485 -> a
-    86:89:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    90:90:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
-    90:90:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newReturnTypeValue(com.android.tools.r8.org.objectweb.asm.Type):111 -> a
-    90:90:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):485 -> a
-    90:90:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    91:91:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):485:485 -> a
-    91:91:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
-    92:171:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):164:243 -> a
-    172:203:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):237:268 -> a
-    204:299:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):185:280 -> a
-    300:300:boolean com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.newControlFlowExceptionEdge(int,com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode):586:586 -> a
-    300:300:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):282 -> a
-    301:301:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.newFrame(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame):541:541 -> a
-    301:301:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):283 -> a
-    302:303:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):284:285 -> a
-    304:304:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
-    304:304:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newExceptionValue(com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.Type):145 -> a
-    304:304:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):285 -> a
-    305:315:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):285:295 -> a
-    316:316:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":915,"2":916,"3":917,"4":918,"5":919}}
-    915:915:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):295:295 -> a
-    916:916:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):295:295 -> a
-    917:917:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):295:295 -> a
-    918:918:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):295:295 -> a
-    919:919:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):295:295 -> a
-    612:612:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):296:296 -> a
-    613:613:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
-    614:614:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":920,"2":921,"3":922,"4":923,"5":924}}
-    920:920:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
-    921:921:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
-    922:922:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
-    923:923:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
-    924:924:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
-    906:914:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):292:300 -> a
-    925:987:void findSubroutine(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,java.util.List):385:447 -> a
-    988:988:void findSubroutine(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,java.util.List):391:391 -> a
-    989:989:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] getFrames():498:498 -> a
-    990:990:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):605:605 -> a
-    991:991:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.newFrame(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame):541:541 -> a
-    991:991:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):607 -> a
-    992:1010:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):607:625 -> a
-    1011:1014:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,boolean[]):653:656 -> a
-    1015:1015:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.newFrame(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame):541:541 -> a
-    1015:1015:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,boolean[]):658 -> a
-    1016:1027:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,boolean[]):658:669 -> a
+    1:159:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):0:158 -> a
+    160:160:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):461:461 -> a
+    160:160:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    161:161:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.newFrame(int,int):531:531 -> a
+    161:161:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):461 -> a
+    161:161:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    162:166:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):463:467 -> a
+    162:166:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    167:167:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
+    167:167:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newParameterValue(boolean,int,com.android.tools.r8.org.objectweb.asm.Type):97 -> a
+    167:167:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):467 -> a
+    167:167:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    168:176:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):466:474 -> a
+    168:176:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    177:177:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
+    177:177:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newParameterValue(boolean,int,com.android.tools.r8.org.objectweb.asm.Type):97 -> a
+    177:177:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):474 -> a
+    177:177:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    178:183:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):472:477 -> a
+    178:183:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    184:184:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
+    184:184:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newEmptyValue(int):126 -> a
+    184:184:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):477 -> a
+    184:184:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    185:190:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):477:482 -> a
+    185:190:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    191:191:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
+    191:191:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newEmptyValue(int):126 -> a
+    191:191:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):482 -> a
+    191:191:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    192:195:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):482:485 -> a
+    192:195:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    196:196:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
+    196:196:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newReturnTypeValue(com.android.tools.r8.org.objectweb.asm.Type):111 -> a
+    196:196:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):485 -> a
+    196:196:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    197:197:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):485:485 -> a
+    197:197:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):163 -> a
+    198:277:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):164:243 -> a
+    278:309:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):237:268 -> a
+    310:405:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):185:280 -> a
+    406:406:boolean com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.newControlFlowExceptionEdge(int,com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode):586:586 -> a
+    406:406:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):282 -> a
+    407:407:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.newFrame(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame):541:541 -> a
+    407:407:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):283 -> a
+    408:409:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):284:285 -> a
+    410:410:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
+    410:410:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter.newExceptionValue(com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.Type):145 -> a
+    410:410:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):285 -> a
+    411:421:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):285:295 -> a
+    422:422:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1021,"2":1022,"3":1023,"4":1024,"5":1025}}
+    1021:1021:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):295:295 -> a
+    1022:1022:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):295:295 -> a
+    1023:1023:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):295:295 -> a
+    1024:1024:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):295:295 -> a
+    1025:1025:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):295:295 -> a
+    718:718:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):296:296 -> a
+    719:719:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
+    720:720:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1026,"2":1027,"3":1028,"4":1029,"5":1030}}
+    1026:1026:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
+    1027:1027:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
+    1028:1028:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
+    1029:1029:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
+    1030:1030:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):291:291 -> a
+    1012:1020:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):292:300 -> a
+    1031:1093:void findSubroutine(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,java.util.List):385:447 -> a
+    1094:1094:void findSubroutine(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,java.util.List):391:391 -> a
+    1095:1095:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] getFrames():498:498 -> a
+    1096:1096:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):605:605 -> a
+    1097:1097:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.newFrame(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame):541:541 -> a
+    1097:1097:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):607 -> a
+    1098:1116:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):607:625 -> a
+    1117:1120:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,boolean[]):653:656 -> a
+    1121:1121:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.newFrame(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame):541:541 -> a
+    1121:1121:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,boolean[]):658 -> a
+    1122:1133:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,boolean[]):658:669 -> a
 com.android.tools.r8.org.objectweb.asm.tree.analysis.AnalyzerException -> com.android.tools.r8.internal.M1:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode node -> b
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String):52:53 -> <init>
@@ -100371,7 +99413,7 @@
     101:101:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):83:83 -> <init>
     90:90:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):83:83 -> <init>
     91:96:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):82:87 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.tools.r8.internal.E4:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.tools.r8.internal.B4:
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue FLOAT_VALUE -> d
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue INT_VALUE -> c
     com.android.tools.r8.org.objectweb.asm.Type type -> a
@@ -100387,7 +99429,7 @@
     1:5:boolean equals(java.lang.Object):101:105 -> equals
     1:1:int hashCode():114:114 -> hashCode
     1:8:java.lang.String toString():119:126 -> toString
-com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicVerifier -> com.android.tools.r8.internal.F4:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicVerifier -> com.android.tools.r8.internal.C4:
     com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.NULL_TYPE -> h
     1:1:void com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.<clinit>():56:56 -> <clinit>
     1:1:void com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.<init>(int):79:79 -> <init>
@@ -100596,7 +99638,7 @@
     589:589:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):231:231 -> b
     590:590:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):229:229 -> b
     591:591:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):225:225 -> b
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame -> com.android.tools.r8.internal.dl:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame -> com.android.tools.r8.internal.Hk:
 # {"id":"sourceFile","fileName":"Frame.java"}
     int numStack -> d
     int maxStack -> e
@@ -100774,23 +99816,23 @@
     6:6:int com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame.getStackSize():220:220 -> toString
     6:6:java.lang.String toString():747 -> toString
     7:9:java.lang.String toString():748:750 -> toString
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter -> com.android.tools.r8.internal.tu:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter -> com.android.tools.r8.internal.Nt:
     1:1:void <init>(int):61:61 -> <init>
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value binaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value) -> a
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value copyOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value) -> a
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value naryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.util.List) -> a
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value newOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode) -> a
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value) -> b
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine -> com.android.tools.r8.internal.tY:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine -> com.android.tools.r8.internal.LW:
     java.util.List callers -> c
     boolean[] localsUsed -> b
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
     1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,int,com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):61:65 -> <init>
     6:9:void <init>(com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):73:76 -> <init>
     1:11:boolean merge(com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):89:99 -> a
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Value -> com.android.tools.r8.internal.n20:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Value -> com.android.tools.r8.internal.C00:
 # {"id":"sourceFile","fileName":"Value.java"}
-com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.r9:
+com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.h9:
     boolean useNamedValue -> b
     boolean visitEndCalled -> c
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,boolean):55:56 -> <init>
@@ -100830,7 +99872,7 @@
     53:53:void visitEnum(java.lang.String,java.lang.String,java.lang.String):96:96 -> a
     54:54:void com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter.checkVisitEndNotCalled():132:132 -> a
     54:54:void visitEnum(java.lang.String,java.lang.String,java.lang.String):91 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.w9:
+com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.m9:
     boolean visitNestHostCalled -> i
     java.lang.String nestMemberPackageName -> j
     boolean visitEndCalled -> k
@@ -101189,7 +100231,7 @@
     4:8:int checkSignatureIdentifier(java.lang.String,int):890:894 -> c
     1:3:void checkFieldSignature(java.lang.String):675:677 -> d
     1:13:java.lang.String getUnqualifiedName(java.lang.String):1127:1139 -> e
-com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.x9:
+com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.n9:
     boolean visitEndCalled -> c
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):70:70 -> <init>
     1:1:void com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter.checkVisitEndNotCalled():113:113 -> a
@@ -101223,7 +100265,7 @@
     113:113:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):88:88 -> a
     114:114:void com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter.checkVisitEndNotCalled() -> a
     114:114:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):84 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.A9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.q9:
     boolean visitCodeCalled -> n
     java.util.Map labelInsnIndices -> r
     int visibleAnnotableParameterCount -> l
@@ -101584,7 +100626,7 @@
     9:9:void checkUnsignedShort(int,java.lang.String):1133:1133 -> d
     1:2:void checkVisitEndNotCalled():1060:1061 -> e
     1:2:void checkVisitMaxsNotCalled():1053:1054 -> f
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.y9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.o9:
     com.android.tools.r8.org.objectweb.asm.MethodVisitor val$methodVisitor -> F
     1:1:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.org.objectweb.asm.MethodVisitor):448:448 -> <init>
     1:15:void visitEnd():451:465 -> c
@@ -101593,7 +100635,7 @@
     21:22:void visitEnd():455:456 -> c
     23:27:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1.throwError(com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.lang.Exception):470:474 -> c
     23:27:void visitEnd():460 -> c
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method -> com.android.tools.r8.internal.z9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method -> com.android.tools.r8.internal.p9:
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_INT_INSN -> c
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_VAR_INSN -> d
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_TYPE_INSN -> e
@@ -101603,7 +100645,7 @@
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_INSN -> b
     1:7:void <clinit>():73:79 -> <clinit>
     1:1:void <init>(java.lang.String,int):72:72 -> <init>
-com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter -> com.android.tools.r8.internal.C9:
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter -> com.android.tools.r8.internal.s9:
     com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet requiredModules -> c
     boolean visitEndCalled -> i
     int classVersion -> h
@@ -101634,12 +100676,12 @@
     16:16:void visitOpen(java.lang.String,int,java.lang.String[]):149:149 -> b
     17:18:void checkVisitEndNotCalled():192:193 -> b
     1:4:void visitUse(java.lang.String):164:167 -> c
-com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet -> com.android.tools.r8.internal.B9:
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet -> com.android.tools.r8.internal.r9:
     java.util.HashSet names -> b
     java.lang.String type -> a
     1:3:void <init>(java.lang.String):202:204 -> <init>
     1:2:void checkNameNotAlreadyDeclared(java.lang.String):208:209 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter -> com.android.tools.r8.internal.F9:
+com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter -> com.android.tools.r8.internal.v9:
     boolean visitEndCalled -> b
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):74:74 -> <init>
     1:1:void com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter.checkVisitEndNotCalled():117:117 -> a
@@ -101673,7 +100715,7 @@
     117:117:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):92:92 -> a
     118:118:void com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter.checkVisitEndNotCalled() -> a
     118:118:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):88 -> a
-com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.qN:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.hM:
     java.util.List text -> c
     java.lang.StringBuilder stringBuilder -> b
     java.lang.String[] TYPES -> e
@@ -101714,7 +100756,7 @@
     void visitParameter(java.lang.String,int) -> b
     void visitMaxs(int,int) -> c
     void visitVarInsn(int,int) -> d
-com.android.tools.r8.org.objectweb.asm.util.Textifier -> com.android.tools.r8.internal.hZ:
+com.android.tools.r8.org.objectweb.asm.util.Textifier -> com.android.tools.r8.internal.xX:
     java.lang.String tab2 -> g
     java.lang.String tab -> f
     java.lang.String ltab -> i
@@ -101881,7 +100923,7 @@
     5:11:void visitMaxs(int,int):1174:1180 -> c
     12:12:void maybeAppendComma(int):1449:1449 -> c
     1:3:void visitVarInsn(int,int):892:894 -> d
-com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.android.tools.r8.internal.MZ:
+com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.android.tools.r8.internal.cY:
     com.android.tools.r8.org.objectweb.asm.util.Printer printer -> b
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.org.objectweb.asm.util.Printer):60:61 -> <init>
     1:2:void visit(java.lang.String,java.lang.Object):66:67 -> a
@@ -101889,7 +100931,7 @@
     5:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):78:79 -> a
     7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):84:85 -> a
     9:10:void visitEnd():90:91 -> a
-com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor -> com.android.tools.r8.internal.NZ:
+com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor -> com.android.tools.r8.internal.dY:
     com.android.tools.r8.org.objectweb.asm.util.Printer p -> j
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.util.Printer):65:66 -> <init>
     1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):77:79 -> a
@@ -101901,27 +100943,25 @@
     15:16:void visitInsn(int):135:136 -> a
     17:18:void visitTypeInsn(int,java.lang.String):153:154 -> a
     19:20:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160:161 -> a
-    21:21:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):173:173 -> a
-    22:22:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):965:965 -> a
-    22:22:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):181 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    23:34:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):175:186 -> a
-    35:36:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196:197 -> a
-    37:38:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202:203 -> a
-    39:40:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208:209 -> a
-    41:42:void visitLdcInsn(java.lang.Object):214:215 -> a
-    43:44:void visitIincInsn(int,int):220:221 -> a
-    45:46:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227:228 -> a
-    47:48:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233:234 -> a
-    49:50:void visitMultiANewArrayInsn(java.lang.String,int):239:240 -> a
-    51:51:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246:246 -> a
-    52:52:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1071:1071 -> a
-    52:52:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    53:54:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):247:248 -> a
-    55:56:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):254:255 -> a
-    57:58:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274:275 -> a
-    59:62:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):287:290 -> a
+    21:29:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):173:181 -> a
+    30:30:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):965:965 -> a
+    30:30:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):181 -> a
+    31:42:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):175:186 -> a
+    43:44:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196:197 -> a
+    45:46:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202:203 -> a
+    47:48:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208:209 -> a
+    49:50:void visitLdcInsn(java.lang.Object):214:215 -> a
+    51:52:void visitIincInsn(int,int):220:221 -> a
+    53:54:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227:228 -> a
+    55:56:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233:234 -> a
+    57:58:void visitMultiANewArrayInsn(java.lang.String,int):239:240 -> a
+    59:59:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246:246 -> a
+    60:60:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1071:1071 -> a
+    60:60:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246 -> a
+    61:62:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):247:248 -> a
+    63:64:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):254:255 -> a
+    65:66:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274:275 -> a
+    67:70:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):287:290 -> a
     1:2:void visitParameter(java.lang.String,int):71:72 -> b
     3:4:void visitCode():118:119 -> b
     5:6:void visitIntInsn(int,int):141:142 -> b
@@ -101930,12 +100970,11 @@
     1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):85:85 -> c
     2:2:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):790:790 -> c
     2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):85 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):86:87 -> c
     5:6:void visitMaxs(int,int):303:304 -> c
     7:8:void visitEnd():309:310 -> c
     1:2:void visitVarInsn(int,int):147:148 -> d
-com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.internal.QZ:
+com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.internal.gY:
     int arrayStack -> j
     java.lang.String separator -> k
     int argumentStack -> i
@@ -102349,7 +101388,6 @@
     1:1:boolean isPrintHelp():137:137 -> isPrintHelp
     1:1:boolean isPrintVersion():141:141 -> isPrintVersion
     1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):109:109 -> parse
-com.android.tools.r8.relocator.RelocatorCommand$1 -> com.android.tools.r8.relocator.a:
 com.android.tools.r8.relocator.RelocatorCommand$Builder -> com.android.tools.r8.relocator.RelocatorCommand$Builder:
     com.android.tools.r8.ClassFileConsumer consumer -> d
     com.android.tools.r8.utils.AndroidApp$Builder app -> a
@@ -102432,7 +101470,7 @@
     1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder setPrintHelp(boolean):214:214 -> setPrintHelp
     1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder setPrintVersion(boolean):219:219 -> setPrintVersion
     1:3:com.android.tools.r8.relocator.RelocatorCommand$Builder setThreadCount(int):231:233 -> setThreadCount
-com.android.tools.r8.relocator.RelocatorCommandLine -> com.android.tools.r8.relocator.b:
+com.android.tools.r8.relocator.RelocatorCommandLine -> com.android.tools.r8.relocator.a:
     1:8:void run(java.lang.String[]):31:38 -> a
     9:9:void run(java.lang.String[]):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":51,"2":52,"3":53}}
@@ -102440,13 +101478,13 @@
     52:52:void run(java.lang.String[]):38:38 -> a
     53:53:void run(java.lang.String[]):38:38 -> a
     47:50:void run(java.lang.String[]):38:41 -> a
-com.android.tools.r8.relocator.RelocatorDiagnostic -> com.android.tools.r8.relocator.c:
+com.android.tools.r8.relocator.RelocatorDiagnostic -> com.android.tools.r8.relocator.b:
     java.lang.String message -> b
     1:2:void <init>(java.lang.String):16:17 -> <init>
     1:1:java.lang.String getDiagnosticMessage():32:32 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():22:22 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():27:27 -> getPosition
-com.android.tools.r8.relocator.SimplePackagesRewritingMapper -> com.android.tools.r8.relocator.f:
+com.android.tools.r8.relocator.SimplePackagesRewritingMapper -> com.android.tools.r8.relocator.d:
     java.util.Map typeMappings -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -102482,8 +101520,7 @@
     71:71:void lambda$compute$0(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):83 -> a
     72:77:void lambda$compute$0(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):83:88 -> a
     78:80:void lambda$compute$0(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):87:89 -> a
-com.android.tools.r8.relocator.SimplePackagesRewritingMapper$1 -> com.android.tools.r8.relocator.d:
-com.android.tools.r8.relocator.SimplePackagesRewritingMapper$RelocatorNamingLens -> com.android.tools.r8.relocator.e:
+com.android.tools.r8.relocator.SimplePackagesRewritingMapper$RelocatorNamingLens -> com.android.tools.r8.relocator.c:
     java.util.Map typeMappings -> d
     java.util.Map packageMappings -> e
     1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.relocator.SimplePackagesRewritingMapper$1):96:96 -> <init>
@@ -102494,7 +101531,7 @@
     4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):127:127 -> a
     5:5:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):132:132 -> a
     boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod) -> b
-com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.jT:
+com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.MR:
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration repackagingConfiguration -> c
@@ -102506,7 +101543,7 @@
     41:41:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):738:738 -> a
     41:41:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):123 -> a
     42:42:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):130:130 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1210:1210 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1220:1220 -> a
     43:43:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):130 -> a
     44:48:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):134:138 -> a
     49:63:void com.android.tools.r8.repackaging.Repackaging.processPackagesInDesiredLocation(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,java.util.Set):202:216 -> a
@@ -102527,7 +101564,7 @@
     117:117:boolean lambda$run$0(java.util.Map$Entry):142:142 -> a
     118:146:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):272:300 -> a
     147:147:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):298:298 -> a
-com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.eT:
+com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.GR:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():87:87 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):87:87 -> <init>
@@ -102535,10 +101572,10 @@
     2:2:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):100:100 -> a
     3:3:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):105:105 -> a
     com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.repackaging.Repackaging$2 -> com.android.tools.r8.internal.fT:
+com.android.tools.r8.repackaging.Repackaging$2 -> com.android.tools.r8.internal.HR:
     1:1:void <init>(com.android.tools.r8.graph.AppView):109:109 -> <init>
-    boolean isLegitimateToHaveEmptyMappings() -> k
-com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.gT:
+    boolean isLegitimateToHaveEmptyMappings() -> m
+com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.IR:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy packageMinificationStrategy -> e
@@ -102548,23 +101585,23 @@
     1:1:void <clinit>():328:328 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView):336:341 -> <init>
     1:5:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):346:350 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1218:1218 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1228:1228 -> a
     6:6:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):350 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1222:1222 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1232:1232 -> a
     7:7:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):352 -> a
     8:14:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):354:360 -> a
     15:20:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):357:362 -> a
-    21:21:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1214:1214 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1224:1224 -> a
     21:21:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):362 -> a
     22:27:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):362:367 -> a
     28:32:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):373:377 -> a
-    33:33:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1218:1218 -> a
+    33:33:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1228:1228 -> a
     33:33:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):377 -> a
     34:34:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):378:378 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1222:1222 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1232:1232 -> a
     35:35:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):379 -> a
     36:40:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):381:385 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1214:1214 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1224:1224 -> a
     41:41:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):385 -> a
     42:42:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):385:385 -> a
     43:54:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):423:434 -> a
@@ -102578,8 +101615,8 @@
     494:498:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):444 -> a
     499:499:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):445:445 -> a
     1:13:boolean mayHavePinnedPackagePrivateOrProtectedItem(com.android.tools.r8.graph.ProgramPackage):396:408 -> b
-com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.hT:
-com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.iT:
+com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.JR:
+com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.KR:
     com.android.tools.r8.repackaging.RepackagingLens$Builder lensBuilder -> g
     com.android.tools.r8.com.google.common.collect.BiMap mappings -> f
     boolean $assertionsDisabled -> h
@@ -102588,17 +101625,14 @@
     1:1:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):181:181 -> a
     2:2:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):92:92 -> a
     2:2:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):181 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):186:186 -> a
     4:4:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):96:96 -> a
     4:4:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):186 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):191:191 -> a
     6:6:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):100:100 -> a
     6:6:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):191 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):176:176 -> b
-com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.kT:
+com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.NR:
     com.android.tools.r8.repackaging.RepackagingUseRegistry registry -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -102612,18 +101646,16 @@
     62:62:void traceDexValue(com.android.tools.r8.graph.DexValue):65:65 -> a
     63:63:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexValue$DexValueAnnotation.getValue():1703:1703 -> a
     63:63:void traceDexValue(com.android.tools.r8.graph.DexValue):65 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     64:80:void traceDexValue(com.android.tools.r8.graph.DexValue):65:81 -> a
     81:105:void traceDexValue(com.android.tools.r8.graph.DexValue):77:101 -> a
-    106:106:void traceDexValue(com.android.tools.r8.graph.DexValue):86:86 -> a
-    107:107:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():290:290 -> a
-    107:107:void traceDexValue(com.android.tools.r8.graph.DexValue):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    108:110:void traceDexValue(com.android.tools.r8.graph.DexValue):88:90 -> a
-    111:111:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
-    111:111:void traceDexValue(com.android.tools.r8.graph.DexValue):90 -> a
-    112:119:void traceDexValue(com.android.tools.r8.graph.DexValue):90:97 -> a
-com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.mT:
+    106:107:void traceDexValue(com.android.tools.r8.graph.DexValue):86:87 -> a
+    108:108:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():290:290 -> a
+    108:108:void traceDexValue(com.android.tools.r8.graph.DexValue):87 -> a
+    109:111:void traceDexValue(com.android.tools.r8.graph.DexValue):88:90 -> a
+    112:112:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
+    112:112:void traceDexValue(com.android.tools.r8.graph.DexValue):90 -> a
+    113:120:void traceDexValue(com.android.tools.r8.graph.DexValue):90:97 -> a
+com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.PR:
     com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node libraryBoundaryNode -> e
     com.android.tools.r8.graph.ProgramPackage pkg -> b
     java.util.Map nodes -> c
@@ -102637,7 +101669,6 @@
     3:8:void populateConstraints(java.util.concurrent.ExecutorService):94:99 -> a
     9:9:void com.android.tools.r8.graph.ProgramPackage.forEachClass(java.util.function.Consumer):56:56 -> a
     9:9:void populateConstraints(java.util.concurrent.ExecutorService):99 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:void populateConstraints(java.util.concurrent.ExecutorService):100:100 -> a
     11:41:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):104:134 -> a
     42:42:void lambda$registerReferencesFromClass$0(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):129:129 -> a
@@ -102649,9 +101680,8 @@
     10:10:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):82:82 -> b
     11:15:boolean com.android.tools.r8.graph.DexDefinition.isNotProgramDefinition(com.android.tools.r8.graph.AppView):141:145 -> b
     11:15:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):82 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:22:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):83:89 -> b
-com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.lT:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.OR:
     com.android.tools.r8.graph.DexDefinition definitionForDebugging -> a
     java.util.Set neighbors -> b
     1:1:void <init>(com.android.tools.r8.graph.DexDefinition):201:201 -> <init>
@@ -102664,7 +101694,7 @@
     219:219:java.lang.String toString():216:216 -> toString
     220:220:java.lang.String toString():216:216 -> toString
     217:217:java.lang.String toString():216:216 -> toString
-com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.pT:
+com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.RR:
     com.android.tools.r8.com.google.common.collect.BiMap newTypes -> n
     boolean $assertionsDisabled -> p
     java.util.Map packageRenamings -> o
@@ -102677,15 +101707,14 @@
     13:13:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):70:70 -> a
     14:20:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):74:80 -> a
     21:21:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):77:77 -> a
-com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.nT:
-com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.oT:
+com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.QR:
     com.android.tools.r8.com.google.common.collect.BiMap newTypes -> a
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> b
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():83:83 -> <clinit>
     1:6:void <init>():83:88 -> <init>
-com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.qT:
+com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.SR:
     com.android.tools.r8.graph.InitClassLens initClassLens -> h
     boolean $assertionsDisabled -> k
     com.android.tools.r8.repackaging.RepackagingConstraintGraph constraintGraph -> g
@@ -102705,30 +101734,30 @@
     24:42:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):131:149 -> a
     43:49:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):72:78 -> a
     43:49:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
-    50:56:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):77:83 -> a
-    50:56:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
-    57:57:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    57:57:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):84 -> a
-    57:57:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
-    58:61:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):84:87 -> a
-    58:61:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
-    62:62:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):85:85 -> a
-    62:62:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
-    63:63:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):152:152 -> a
-    64:74:void registerTypeAccess(com.android.tools.r8.graph.DexType,java.util.function.Consumer):162:172 -> a
-    75:77:void registerClassTypeAccess(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):184:186 -> a
-    78:78:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):202:202 -> a
-    79:79:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerMemberAccessForInvoke(com.android.tools.r8.graph.MemberResolutionResult):107:107 -> a
-    79:79:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):202 -> a
-    80:80:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):222:222 -> a
-    81:83:void registerEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):262:264 -> a
-    84:91:void registerEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):263:270 -> a
-    92:92:void registerInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):280:280 -> a
-    93:93:void registerNestHostAttribute(com.android.tools.r8.graph.NestHostClassAttribute):290:290 -> a
-    94:94:void registerNestHostAttribute(com.android.tools.r8.graph.NestHostClassAttribute):289:289 -> a
-    95:95:void registerNestMemberClassAttributes(java.util.List):300:300 -> a
-    96:96:void lambda$registerNestMemberClassAttributes$5(com.android.tools.r8.graph.NestMemberClassAttribute):303:303 -> a
-    97:97:void lambda$registerNestMemberClassAttributes$5(com.android.tools.r8.graph.NestMemberClassAttribute):302:302 -> a
+    50:57:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):77:84 -> a
+    50:57:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
+    58:58:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    58:58:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):84 -> a
+    58:58:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
+    59:62:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):84:87 -> a
+    59:62:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
+    63:63:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):85:85 -> a
+    63:63:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
+    64:64:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):152:152 -> a
+    65:75:void registerTypeAccess(com.android.tools.r8.graph.DexType,java.util.function.Consumer):162:172 -> a
+    76:78:void registerClassTypeAccess(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):184:186 -> a
+    79:79:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):202:202 -> a
+    80:80:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerMemberAccessForInvoke(com.android.tools.r8.graph.MemberResolutionResult):107:107 -> a
+    80:80:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):202 -> a
+    81:81:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):222:222 -> a
+    82:84:void registerEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):262:264 -> a
+    85:92:void registerEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):263:270 -> a
+    93:93:void registerInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):280:280 -> a
+    94:94:void registerNestHostAttribute(com.android.tools.r8.graph.NestHostClassAttribute):290:290 -> a
+    95:95:void registerNestHostAttribute(com.android.tools.r8.graph.NestHostClassAttribute):289:289 -> a
+    96:96:void registerNestMemberClassAttributes(java.util.List):300:300 -> a
+    97:97:void lambda$registerNestMemberClassAttributes$5(com.android.tools.r8.graph.NestMemberClassAttribute):303:303 -> a
+    98:98:void lambda$registerNestMemberClassAttributes$5(com.android.tools.r8.graph.NestMemberClassAttribute):302:302 -> a
     1:1:void registerInitClass(com.android.tools.r8.graph.DexType):192:192 -> b
     2:2:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):212:212 -> b
     3:3:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerMemberAccessForInvoke(com.android.tools.r8.graph.MemberResolutionResult):107:107 -> b
@@ -103053,17 +102082,16 @@
     6:8:com.android.tools.r8.retrace.StringRetrace create(com.android.tools.r8.retrace.Retracer,com.android.tools.r8.DiagnosticsHandler,java.lang.String,boolean):64:66 -> create
     1:4:java.util.List retrace(java.util.List):79:82 -> retrace
     5:6:java.util.List retrace(java.lang.String):115:116 -> retrace
-com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.gf:
+com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.Ke:
 # {"id":"sourceFile","fileName":"Definition.java"}
-com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.lh:
+com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.Tg:
     com.android.tools.r8.naming.ClassNameMapper getClassNameMapper() -> a
     1:1:java.io.Reader get():11:11 -> get
     2:2:java.io.BufferedReader get():17:17 -> get
-com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.Jj:
+com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.qj:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.FieldDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
-com.android.tools.r8.retrace.internal.FieldDefinition$1 -> com.android.tools.r8.internal.Gj:
-com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.Hj:
+com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.oj:
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String name -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.retrace.internal.FieldDefinition$1):25:25 -> <init>
@@ -103075,7 +102103,7 @@
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():41:41 -> getHolderClass
     1:1:java.lang.String getName():36:36 -> getName
     1:1:int hashCode():63:63 -> hashCode
-com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com.android.tools.r8.internal.Ij:
+com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com.android.tools.r8.internal.pj:
     com.android.tools.r8.references.FieldReference fieldReference -> a
     1:1:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.retrace.internal.FieldDefinition$1):67:67 -> <init>
     2:3:void <init>(com.android.tools.r8.references.FieldReference):71:72 -> <init>
@@ -103086,12 +102114,11 @@
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():82:82 -> getHolderClass
     1:1:java.lang.String getName():77:77 -> getName
     1:1:int hashCode():105:105 -> hashCode
-com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.TE:
+com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.VD:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition asFullMethodDefinition() -> a
     com.android.tools.r8.retrace.internal.MethodDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
-com.android.tools.r8.retrace.internal.MethodDefinition$1 -> com.android.tools.r8.internal.QE:
-com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.RE:
+com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.TD:
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String name -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.retrace.internal.MethodDefinition$1):33:33 -> <init>
@@ -103103,7 +102130,7 @@
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():45:45 -> getHolderClass
     1:1:java.lang.String getName():50:50 -> getName
     1:1:int hashCode():72:72 -> hashCode
-com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.SE:
+com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.UD:
     com.android.tools.r8.references.MethodReference methodReference -> a
     1:1:void <init>(com.android.tools.r8.references.MethodReference,com.android.tools.r8.retrace.internal.MethodDefinition$1):76:76 -> <init>
     2:3:void <init>(com.android.tools.r8.references.MethodReference):80:81 -> <init>
@@ -103117,9 +102144,9 @@
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():86:86 -> getHolderClass
     1:1:java.lang.String getName():91:91 -> getName
     1:1:int hashCode():132:132 -> hashCode
-com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.GT:
+com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.iS:
     1:1:void <init>():7:7 -> <init>
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.KT:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.lS:
     com.android.tools.r8.references.ClassReference obfuscatedReference -> a
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> c
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> b
@@ -103127,39 +102154,39 @@
     1:1:void <clinit>():30:30 -> <clinit>
     1:4:void <init>(com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.RetracerImpl):37:40 -> <init>
     1:1:com.android.tools.r8.naming.ClassNamingForNameMapper access$100(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):30:30 -> a
-    2:2:com.android.tools.r8.retrace.internal.RetraceClassResultImpl create(com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.RetracerImpl):45:45 -> a
-    3:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(java.lang.String):50:50 -> a
-    4:4:com.android.tools.r8.retrace.internal.FieldDefinition com.android.tools.r8.retrace.internal.FieldDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
-    4:4:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(java.lang.String):50 -> a
+    2:2:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl access$300(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):30:30 -> a
+    3:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):141:141 -> a
+    3:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl access$300(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):30 -> a
+    4:4:com.android.tools.r8.retrace.internal.RetraceClassResultImpl create(com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.RetracerImpl):45:45 -> a
     5:5:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(java.lang.String):50:50 -> a
-    6:6:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):73:73 -> a
-    7:8:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):76:77 -> a
-    9:9:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):86:86 -> 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:102 -> a
-    11:16:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.createElement():165:170 -> a
-    11:16:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():161 -> a
-    11:16:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):103 -> a
-    17:17:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.createElement():167:167 -> a
-    17:17:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():161 -> a
-    17:17:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):103 -> a
-    18:18:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():161:161 -> a
-    18:18:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):103 -> a
-    19:32:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):103:116 -> a
-    33:41:void lambda$lookup$2(java.util.function.BiFunction,com.android.tools.r8.retrace.internal.Definition,java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):106:114 -> a
-    42:42:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):122:122 -> a
-    43:43:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
-    43:43:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):122 -> a
-    44:44:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):141:141 -> a
-    44:44:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):122 -> a
-    45:49:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):132:136 -> a
-    50:50:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.MethodReference):20:20 -> a
-    50:50:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):135 -> a
-    51:51:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):141:141 -> a
-    51:51:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):132 -> a
-    52:52:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):141:141 -> a
-    52:52:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl access$300(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):30 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    53:53:com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl lookupThrownException(com.android.tools.r8.retrace.RetraceStackTraceContext):146:146 -> a
+    6:6:com.android.tools.r8.retrace.internal.FieldDefinition com.android.tools.r8.retrace.internal.FieldDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
+    6:6:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(java.lang.String):50 -> a
+    7:7:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(java.lang.String):50:50 -> a
+    8:8:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):73:73 -> a
+    9:10:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):76:77 -> a
+    11:11:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):86:86 -> a
+    12:12:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):102:102 -> a
+    13:18:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.createElement():165:170 -> a
+    13:18:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():161 -> a
+    13:18:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):103 -> a
+    19:19:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.createElement():167:167 -> a
+    19:19:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():161 -> a
+    19:19:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):103 -> a
+    20:20:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():161:161 -> a
+    20:20:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):103 -> a
+    21:34:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):103:116 -> a
+    35:43:void lambda$lookup$2(java.util.function.BiFunction,com.android.tools.r8.retrace.internal.Definition,java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):106:114 -> a
+    44:44:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):122:122 -> a
+    45:45:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
+    45:45:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):122 -> a
+    46:46:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):141:141 -> a
+    46:46:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):122 -> a
+    47:51:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):132:136 -> a
+    52:52:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.MethodReference):20:20 -> a
+    52:52:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):135 -> a
+    53:53:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):141:141 -> a
+    53:53:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):132 -> a
+    54:54:com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl lookupThrownException(com.android.tools.r8.retrace.RetraceStackTraceContext):146:146 -> a
     1:1:com.android.tools.r8.retrace.internal.RetracerImpl access$200(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):30:30 -> b
     2:2:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(java.lang.String):61:61 -> b
     3:3:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> b
@@ -103191,10 +102218,9 @@
     7:7:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.createElement():167:167 -> stream
     7:7:java.util.stream.Stream stream():157 -> stream
     8:8:java.util.stream.Stream stream():157:157 -> stream
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$1 -> com.android.tools.r8.internal.HT:
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.IT:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.jS:
     java.lang.Object create(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,java.lang.Object,com.android.tools.r8.retrace.internal.RetracerImpl) -> a
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.JT:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.kS:
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl classResult -> a
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
     com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl classReference -> b
@@ -103257,7 +102283,7 @@
     2:2:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):182 -> lookupMethod
     3:3:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupMethod(java.lang.String):253:253 -> lookupMethod
     3:3:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):182 -> lookupMethod
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.NT:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.nS:
     java.util.List memberNamings -> a
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> b
     com.android.tools.r8.retrace.Retracer retracer -> c
@@ -103281,8 +102307,7 @@
     1:8:boolean isAmbiguous():85:92 -> isAmbiguous
     1:1:boolean isEmpty():97:97 -> isEmpty
     1:2:java.util.stream.Stream stream():43:44 -> stream
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$1 -> com.android.tools.r8.internal.LT:
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.MT:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.mS:
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl fieldReference -> a
     com.android.tools.r8.retrace.internal.RetraceFieldResultImpl retraceFieldResult -> b
@@ -103297,7 +102322,7 @@
     1:1:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():142:142 -> getSourceFile
     1:1:boolean isCompilerSynthesized():117:117 -> isCompilerSynthesized
     1:1:boolean isUnknown():122:122 -> isUnknown
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.QT:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.qS:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     com.android.tools.r8.utils.OptionalBool isAmbiguousCache -> f
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> d
@@ -103381,7 +102406,7 @@
     20:34:boolean isAmbiguous():72:86 -> isAmbiguous
     1:1:boolean isEmpty():224:224 -> isEmpty
     1:2:java.util.stream.Stream stream():101:102 -> stream
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.OT:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.oS:
     com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl methodReference -> a
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetraceFrameResultImpl retraceFrameResult -> b
@@ -103449,7 +102474,7 @@
     1:1:boolean isUnknown():275:275 -> isUnknown
     1:3:java.util.stream.Stream stream():303:305 -> stream
     1:3:java.util.stream.Stream streamRewritten(com.android.tools.r8.retrace.RetraceStackTraceContext):344:346 -> streamRewritten
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame -> com.android.tools.r8.internal.PT:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame -> com.android.tools.r8.internal.pS:
     com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange mappedRange -> a
     java.util.OptionalInt position -> b
     1:3:void <init>(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):394:396 -> <init>
@@ -103469,10 +102494,10 @@
     10:10:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):412:412 -> a
     10:10:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$600(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):389 -> a
     1:1:java.util.OptionalInt access$100(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):389:389 -> b
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.getMappedRange():400:400 -> c
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange access$400(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):389 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.TT:
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange access$400(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):389:389 -> c
+    2:2:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.getMappedRange():400:400 -> c
+    2:2:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange access$400(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):389 -> c
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.sS:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl classResult -> b
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> d
@@ -103510,8 +102535,7 @@
     1:1:boolean isEmpty():69:69 -> isEmpty
     1:1:com.android.tools.r8.retrace.RetraceFrameResult narrowByPosition(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt):27:27 -> narrowByPosition
     1:2:java.util.stream.Stream stream():128:129 -> stream
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$1 -> com.android.tools.r8.internal.RT:
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.ST:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.rS:
     com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl methodReference -> a
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetraceMethodResultImpl retraceMethodResult -> b
@@ -103525,7 +102549,7 @@
     1:3:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():200:200 -> getSourceFile
     1:1:boolean isCompilerSynthesized():175:175 -> isCompilerSynthesized
     1:1:boolean isUnknown():180:180 -> isUnknown
-com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl -> com.android.tools.r8.internal.WT:
+com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl -> com.android.tools.r8.internal.uS:
     com.android.tools.r8.references.ClassReference thrownException -> a
     java.util.OptionalInt rewritePosition -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.util.OptionalInt,com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$1):17:17 -> <init>
@@ -103536,8 +102560,7 @@
     1:1:int getRewritePosition():56:56 -> b
     1:1:com.android.tools.r8.references.ClassReference getThrownException():29:29 -> c
     1:1:boolean hasRewritePosition():52:52 -> d
-com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$1 -> com.android.tools.r8.internal.UT:
-com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder -> com.android.tools.r8.internal.VT:
+com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder -> com.android.tools.r8.internal.tS:
     com.android.tools.r8.references.ClassReference thrownException -> a
     java.util.OptionalInt rewritePosition -> b
     1:1:void <init>():81:81 -> <init>
@@ -103547,7 +102570,7 @@
     3:3:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl build():99:99 -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder clearRewritePosition():94:94 -> b
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder create():103:103 -> c
-com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation -> com.android.tools.r8.internal.ZT:
+com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation -> com.android.tools.r8.internal.wS:
     com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation EMPTY -> b
     int removeInnerFramesCount -> a
     1:1:void <clinit>():9:9 -> <clinit>
@@ -103555,13 +102578,12 @@
     2:3:void <init>(int):14:15 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation empty():23:23 -> a
     1:1:int getRemoveInnerFramesCount():19:19 -> b
-com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$1 -> com.android.tools.r8.internal.XT:
-com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder -> com.android.tools.r8.internal.YT:
+com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder -> com.android.tools.r8.internal.vS:
     int removeInnerFramesCount -> a
     1:1:void <init>():30:30 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder incrementRemoveInnerFramesCount(int):36:36 -> a
     2:2:com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation build():50:50 -> a
-com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl -> com.android.tools.r8.internal.cU:
+com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl -> com.android.tools.r8.internal.yS:
     java.util.stream.Stream resultStream -> a
     java.util.function.Supplier resultContext -> b
     1:1:void <init>(java.util.stream.Stream,java.util.function.Supplier,com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$1):14:14 -> <init>
@@ -103574,14 +102596,13 @@
     4:4:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder builder():38 -> a
     1:1:com.android.tools.r8.retrace.RetraceStackTraceContext getResultContext():34:34 -> getResultContext
     1:1:java.util.stream.Stream stream():29:29 -> stream
-com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$1 -> com.android.tools.r8.internal.aU:
-com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder -> com.android.tools.r8.internal.bU:
+com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder -> com.android.tools.r8.internal.xS:
     java.util.stream.Stream resultStream -> a
     java.util.function.Supplier resultContext -> b
     1:1:void <init>():46:46 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl build():60:60 -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder create():64:64 -> b
-com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl -> com.android.tools.r8.internal.fU:
+com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl -> com.android.tools.r8.internal.AS:
     com.android.tools.r8.references.ClassReference obfuscatedReference -> a
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> b
     1:4:void <init>(com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl,com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper):26:29 -> <init>
@@ -103591,8 +102612,7 @@
     7:7:com.android.tools.r8.retrace.RetraceThrownExceptionElement com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl.createElement():45:45 -> stream
     7:7:java.util.stream.Stream stream():34 -> stream
     8:8:java.util.stream.Stream stream():34:34 -> stream
-com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$1 -> com.android.tools.r8.internal.dU:
-com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl -> com.android.tools.r8.internal.eU:
+com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl -> com.android.tools.r8.internal.zS:
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
     com.android.tools.r8.references.ClassReference thrownException -> d
     com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl classReference -> b
@@ -103613,7 +102633,7 @@
     11:11:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl.getRetracedClass():73:73 -> getSourceFile
     11:11:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():92 -> getSourceFile
     12:12:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():92:92 -> getSourceFile
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.hU:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.CS:
     com.android.tools.r8.retrace.Retracer retracer -> b
     com.android.tools.r8.references.TypeReference obfuscatedType -> a
     1:3:void <init>(com.android.tools.r8.references.TypeReference,com.android.tools.r8.retrace.Retracer):19:21 -> <init>
@@ -103624,11 +102644,11 @@
     1:1:com.android.tools.r8.retrace.RetraceTypeResult forEach(java.util.function.Consumer):14 -> forEach
     1:13:java.util.stream.Stream stream():31:43 -> stream
     14:14:java.util.stream.Stream stream():32:32 -> stream
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.gU:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.BS:
     com.android.tools.r8.retrace.RetracedTypeReference retracedType -> a
     1:2:void <init>(com.android.tools.r8.retrace.RetracedTypeReference):61:62 -> <init>
     1:1:com.android.tools.r8.retrace.RetracedTypeReference getType():67:67 -> getType
-com.android.tools.r8.retrace.internal.RetraceUnknownJsonMappingInformationResultImpl -> com.android.tools.r8.internal.iU:
+com.android.tools.r8.retrace.internal.RetraceUnknownJsonMappingInformationResultImpl -> com.android.tools.r8.internal.DS:
     java.util.List elements -> a
     1:2:void <init>(java.util.List):21:22 -> <init>
     1:1:com.android.tools.r8.retrace.RetraceUnknownMappingInformationElement lambda$stream$0(com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation):30:30 -> a
@@ -103638,14 +102658,14 @@
     11:11:void lambda$build$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.naming.mappinginformation.MappingInformation):39 -> a
     12:12:void lambda$build$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.naming.mappinginformation.MappingInformation):40:40 -> a
     1:2:java.util.stream.Stream stream():27:28 -> stream
-com.android.tools.r8.retrace.internal.RetraceUnknownMappingInformationElementImpl -> com.android.tools.r8.internal.jU:
+com.android.tools.r8.retrace.internal.RetraceUnknownMappingInformationElementImpl -> com.android.tools.r8.internal.ES:
     com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation mappingInformation -> b
     com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult result -> a
     1:3:void <init>(com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult,com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation):19:21 -> <init>
     1:1:java.lang.String getIdentifier():26:26 -> getIdentifier
     1:1:java.lang.String getPayLoad():31:31 -> getPayLoad
     1:1:com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult getRetraceResultContext():36:36 -> getRetraceResultContext
-com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.kU:
+com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.FS:
     java.util.Set KEEP_SOURCEFILE_NAMES -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():31:33 -> <clinit>
@@ -103693,7 +102713,7 @@
     264:264:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):127 -> a
     265:265:int com.android.tools.r8.retrace.internal.RetraceUtils.firstFromIndex(java.lang.String,int,java.util.function.Predicate):140:140 -> a
     265:265:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):127 -> a
-com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.lU:
+com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.GS:
     com.android.tools.r8.references.ClassReference classReference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -103706,12 +102726,11 @@
     1:1:com.android.tools.r8.retrace.RetracedTypeReference getRetracedType():10 -> getRetracedType
     1:1:java.lang.String getTypeName():25:25 -> getTypeName
     1:1:int hashCode():56:56 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.pU:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.JS:
     1:1:void <init>(com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1):12:12 -> <init>
     2:2:void <init>():14:14 -> <init>
     1:1:boolean isKnown():23:23 -> isKnown
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1 -> com.android.tools.r8.internal.mU:
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.nU:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.HS:
     com.android.tools.r8.references.FieldReference fieldReference -> b
     1:1:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1):31:31 -> <init>
     2:3:void <init>(com.android.tools.r8.references.FieldReference):36:37 -> <init>
@@ -103722,7 +102741,7 @@
     1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl.getHolderClass():52:52 -> getHolderClass
     1:1:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():31 -> getHolderClass
     1:1:int hashCode():84:84 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.oU:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.IS:
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> b
     1:1:void <init>(com.android.tools.r8.retrace.internal.FieldDefinition,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1):88:88 -> <init>
     2:3:void <init>(com.android.tools.r8.retrace.internal.FieldDefinition):92:93 -> <init>
@@ -103731,7 +102750,7 @@
     1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl.getHolderClass():98:98 -> getHolderClass
     1:1:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():88 -> getHolderClass
     1:1:int hashCode():120:120 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android.tools.r8.internal.tU:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android.tools.r8.internal.MS:
     java.util.Comparator comparator -> c
     int $r8$clinit -> d
     java.util.OptionalInt position -> b
@@ -103750,8 +102769,7 @@
     1:1:int getOriginalPositionOrDefault(int):50:50 -> getOriginalPositionOrDefault
     1:1:boolean hasPosition():45:45 -> hasPosition
     1:1:boolean isKnown():60:60 -> isKnown
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1 -> com.android.tools.r8.internal.qU:
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.rU:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.KS:
     com.android.tools.r8.references.MethodReference methodReference -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():73:73 -> <clinit>
@@ -103767,14 +102785,14 @@
     1:2:com.android.tools.r8.references.TypeReference getReturnType():112:113 -> getReturnType
     1:1:int hashCode():140:140 -> hashCode
     1:1:boolean isVoid():92:92 -> isVoid
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.sU:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.LS:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> e
     1:1:void <init>(com.android.tools.r8.retrace.internal.MethodDefinition,java.util.OptionalInt,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1):144:144 -> <init>
     2:3:void <init>(com.android.tools.r8.retrace.internal.MethodDefinition,java.util.OptionalInt):150:151 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl.getHolderClass():156:156 -> getHolderClass
     1:1:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():144 -> getHolderClass
     1:1:java.lang.String getMethodName():161:161 -> getMethodName
-com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl -> com.android.tools.r8.internal.uU:
+com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl -> com.android.tools.r8.internal.NS:
     com.android.tools.r8.retrace.RetracedMethodReference methodReference -> b
     com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl frameElement -> a
     int index -> c
@@ -103786,7 +102804,7 @@
     2:2:com.android.tools.r8.retrace.RetracedMethodReference com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl.getMethodReference():27:27 -> getSourceFile
     2:2:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():37 -> getSourceFile
     3:3:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():37:37 -> getSourceFile
-com.android.tools.r8.retrace.internal.RetracedSourceFileImpl -> com.android.tools.r8.internal.vU:
+com.android.tools.r8.retrace.internal.RetracedSourceFileImpl -> com.android.tools.r8.internal.OS:
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String filename -> b
     boolean $assertionsDisabled -> c
@@ -103797,7 +102815,7 @@
     2:2:java.lang.String getOrInferSourceFile():36:36 -> getOrInferSourceFile
     1:1:java.lang.String getSourceFile():28:28 -> getSourceFile
     1:1:boolean hasRetraceResult():23:23 -> hasRetraceResult
-com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.wU:
+com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.PS:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.references.TypeReference typeReference -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -103810,7 +102828,7 @@
     1:1:int hashCode():62:62 -> hashCode
     1:1:boolean isVoid():30:30 -> isVoid
     1:1:com.android.tools.r8.references.TypeReference toArray(int):35:35 -> toArray
-com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.xU:
+com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.QS:
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     boolean $assertionsDisabled -> c
@@ -103851,7 +102869,7 @@
     4:4:com.android.tools.r8.retrace.RetraceThrownExceptionResult retraceThrownException(com.android.tools.r8.references.ClassReference):24 -> retraceThrownException
     1:1:com.android.tools.r8.retrace.internal.RetraceTypeResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceType(com.android.tools.r8.references.TypeReference):101:101 -> retraceType
     1:1:com.android.tools.r8.retrace.RetraceTypeResult retraceType(com.android.tools.r8.references.TypeReference):24 -> retraceType
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.yW:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.WU:
     com.android.tools.r8.retrace.Retracer retracer -> a
     1:2:void <init>(com.android.tools.r8.retrace.Retracer):45:46 -> <init>
     1:4:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceClassOrType(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.RetraceClassResult):81:84 -> a
@@ -103929,8 +102947,7 @@
     5:5:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder.setResultContext(java.util.function.Supplier):55:55 -> retrace
     5:5:com.android.tools.r8.retrace.RetraceStackTraceElementProxyResult retrace(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceContext):55 -> retrace
     6:21:com.android.tools.r8.retrace.RetraceStackTraceElementProxyResult retrace(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceContext):56:71 -> retrace
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1 -> com.android.tools.r8.internal.vW:
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl -> com.android.tools.r8.internal.xW:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl -> com.android.tools.r8.internal.VU:
     boolean $assertionsDisabled -> m
     java.lang.String sourceFile -> h
     boolean isAmbiguous -> j
@@ -103985,7 +103002,7 @@
     1:1:boolean hasSourceFile():412:412 -> hasSourceFile
     1:1:boolean isAmbiguous():387:387 -> isAmbiguous
     1:1:boolean isTopFrame():392:392 -> isTopFrame
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder -> com.android.tools.r8.internal.wW:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder -> com.android.tools.r8.internal.UU:
     java.lang.String sourceFile -> g
     com.android.tools.r8.retrace.RetracedMethodReference methodContext -> c
     java.util.List methodArguments -> f
@@ -104010,45 +103027,36 @@
     8:8:com.android.tools.r8.retrace.StackTraceElementProxy access$2400(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder):543:543 -> a
     9:9:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedClass(com.android.tools.r8.retrace.RetracedClassReference):562:562 -> a
     9:9:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$100(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,com.android.tools.r8.retrace.RetracedClassReference):543 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedFieldOrReturnType(com.android.tools.r8.retrace.RetracedTypeReference):577:577 -> a
     10:10:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$1000(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,com.android.tools.r8.retrace.RetracedTypeReference):543 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.apply(java.util.function.Consumer):612:612 -> a
     11:11:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$500(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,java.util.function.Consumer):543 -> a
     12:12:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.applyIf(boolean,java.util.function.Consumer):618:618 -> a
     12:12:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$800(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,boolean,java.util.function.Consumer):543 -> a
     1:1:com.android.tools.r8.retrace.RetracedClassReference access$1202(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,com.android.tools.r8.retrace.RetracedClassReference):543:543 -> b
     2:2:com.android.tools.r8.retrace.RetracedTypeReference access$1502(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,com.android.tools.r8.retrace.RetracedTypeReference):543:543 -> b
-    3:3:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedMethod(com.android.tools.r8.retrace.RetracedMethodReference):567:567 -> b
-    3:3:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$700(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,com.android.tools.r8.retrace.RetracedMethodReference):543 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedField(com.android.tools.r8.retrace.RetracedFieldReference):572:572 -> b
-    4:4:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$900(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,com.android.tools.r8.retrace.RetracedFieldReference):543 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedMethodArguments(java.util.List):582:582 -> b
-    5:5:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$2300(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,java.util.List):543 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setSourceFile(java.lang.String):587:587 -> b
-    6:6:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$2500(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,java.lang.String):543 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setLineNumber(int):592:592 -> b
-    7:7:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$2600(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,int):543 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.joinAmbiguous(boolean):597:597 -> b
-    8:8:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$200(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,boolean):543 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setContext(com.android.tools.r8.retrace.RetraceStackTraceContext):607:607 -> b
-    9:9:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$400(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,com.android.tools.r8.retrace.RetraceStackTraceContext):543 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:14:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.build():624:628 -> b
-    10:14:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl access$600(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder):543 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$2500(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,java.lang.String):543:543 -> b
+    4:4:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setSourceFile(java.lang.String):587:587 -> b
+    4:4:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$2500(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,java.lang.String):543 -> b
+    5:5:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$2600(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,int):543:543 -> b
+    6:6:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setLineNumber(int):592:592 -> b
+    6:6:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$2600(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,int):543 -> b
+    7:7:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedMethod(com.android.tools.r8.retrace.RetracedMethodReference):567:567 -> b
+    7:7:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$700(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,com.android.tools.r8.retrace.RetracedMethodReference):543 -> b
+    8:8:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedField(com.android.tools.r8.retrace.RetracedFieldReference):572:572 -> b
+    8:8:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$900(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,com.android.tools.r8.retrace.RetracedFieldReference):543 -> b
+    9:9:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedMethodArguments(java.util.List):582:582 -> b
+    9:9:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$2300(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,java.util.List):543 -> b
+    10:10:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.joinAmbiguous(boolean):597:597 -> b
+    10:10:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$200(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,boolean):543 -> b
+    11:11:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setContext(com.android.tools.r8.retrace.RetraceStackTraceContext):607:607 -> b
+    11:11:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$400(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,com.android.tools.r8.retrace.RetraceStackTraceContext):543 -> b
+    12:16:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.build():624:628 -> b
+    12:16:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl access$600(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder):543 -> b
     1:1:boolean access$2002(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,boolean):543:543 -> c
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setTopFrame(boolean):602:602 -> d
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$300(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,boolean):543 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.EW:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.bV:
     java.util.List orderedIndices -> b
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldOrReturnType -> h
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodArguments -> i
@@ -104094,20 +103102,19 @@
     1:1:boolean hasSourceFile():73:73 -> hasSourceFile
     1:9:java.lang.String com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,boolean):146:154 -> toRetracedItem
     1:9:java.lang.Object toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,boolean):23 -> toRetracedItem
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1 -> com.android.tools.r8.internal.zW:
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.AW:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.XU:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType TYPENAME -> c
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType BINARY -> b
     1:2:void <clinit>():167:168 -> <clinit>
     1:1:void <init>(java.lang.String,int):166:166 -> <init>
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.BW:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.YU:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex NO_INDEX -> e
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType classNameType -> d
     1:1:void <clinit>():367:367 -> <clinit>
     1:1:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1):365:365 -> <init>
     2:3:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):382:383 -> <init>
     1:4:com.android.tools.r8.references.ClassReference getReference(java.lang.String):387:390 -> a
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.CW:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.ZU:
     java.util.List orderedIndices -> b
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldOrReturnType -> h
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodArguments -> i
@@ -104149,7 +103156,7 @@
     43:43:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):216 -> d
     1:7:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerSourceFile(int,int):224:230 -> e
     8:8:java.lang.String lambda$registerSourceFile$2(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):229:229 -> e
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.DW:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.aV:
     com.android.tools.r8.utils.TriFunction retracedString -> c
     int endIndex -> b
     int startIndex -> a
@@ -104157,7 +103164,7 @@
     2:5:void <init>(int,int,com.android.tools.r8.utils.TriFunction):354:357 -> <init>
     1:1:com.android.tools.r8.utils.TriFunction access$100(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):334:334 -> a
     2:2:boolean hasIndex():361:361 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.TW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.pV:
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup lineNumberGroup -> g
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup fieldOrReturnTypeGroup -> h
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup methodNameGroup -> j
@@ -104208,61 +103215,60 @@
     2:2:com.android.tools.r8.retrace.StackTraceElementProxy parse(java.lang.Object):16 -> parse
     3:15:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser.parse(java.lang.String):61:73 -> parse
     3:15:com.android.tools.r8.retrace.StackTraceElementProxy parse(java.lang.Object):16 -> parse
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1 -> com.android.tools.r8.internal.FW:
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.GW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.cV:
     1:1:void <init>():222:222 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):222:222 -> <init>
     1:1:java.lang.String subExpression():226:226 -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType():231:231 -> b
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup -> com.android.tools.r8.internal.IW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup -> com.android.tools.r8.internal.eV:
     1:1:void <init>():179:179 -> <init>
     1:1:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):185:185 -> a
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType() -> b
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup$1 -> com.android.tools.r8.internal.HW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup$1 -> com.android.tools.r8.internal.dV:
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup this$0 -> b
     java.lang.String val$captureGroup -> a
     1:1:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup,java.lang.String):185:185 -> <init>
     boolean isClassHandler() -> a
     1:10:boolean matchHandler(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):188:197 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldNameGroup -> com.android.tools.r8.internal.JW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldNameGroup -> com.android.tools.r8.internal.fV:
     1:1:void <init>():255:255 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):255:255 -> <init>
     1:1:java.lang.String subExpression():259:259 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):264:264 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):265:269 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.KW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.gV:
     1:1:void <init>():339:339 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):339:339 -> <init>
     1:1:java.lang.String subExpression():343:343 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):348:348 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):349:353 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.LW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.hV:
     1:1:void <init>():298:298 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):298:298 -> <init>
     1:1:java.lang.String subExpression():302:302 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):307:307 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):308:312 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.MW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.iV:
     1:1:void <init>():359:359 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):359:359 -> <init>
     1:1:java.lang.String subExpression():363:363 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):368:368 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):369:373 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.NW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.jV:
     1:1:void <init>():235:235 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):235:235 -> <init>
     1:1:java.lang.String subExpression():239:239 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):244:244 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):245:249 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup -> com.android.tools.r8.internal.OW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup -> com.android.tools.r8.internal.kV:
     1:1:void <init>():161:161 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):161:161 -> <init>
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String) -> a
     java.lang.String subExpression() -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler -> com.android.tools.r8.internal.PW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler -> com.android.tools.r8.internal.lV:
     boolean isClassHandler() -> a
     boolean matchHandler(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher) -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup -> com.android.tools.r8.internal.QW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup -> com.android.tools.r8.internal.mV:
     1:1:void <init>():275:275 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):275:275 -> <init>
     1:1:java.lang.String subExpression():0:0 -> a
@@ -104276,12 +103282,12 @@
     283:283:java.lang.String subExpression():282:282 -> a
     290:290:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):287:287 -> a
     291:295:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):288:292 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.RW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.nV:
     1:1:void <init>():318:318 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):318:318 -> <init>
     1:1:java.lang.String subExpression():322:322 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):327:327 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.SW:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.oV:
     1:1:void <init>():209:209 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):209:209 -> <init>
     1:1:java.lang.String subExpression():213:213 -> a
@@ -104319,60 +103325,59 @@
     16:20:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):72:76 -> a
     21:21:boolean com.android.tools.r8.graph.DexValue.isDexValueAnnotation():0:0 -> a
     21:21:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):78 -> a
-    22:22:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):79:79 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexValue$DexValueAnnotation.getValue():1703:1703 -> a
-    23:23:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):80 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:28:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):80:84 -> a
-    29:29:boolean com.android.tools.r8.graph.DexValue.isDexItemBasedValueString():0:0 -> a
-    29:29:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):90 -> a
-    29:29:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    30:34:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):91:95 -> a
-    30:34:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    35:35:boolean com.android.tools.r8.graph.DexValue.isDexValueEnum():0:0 -> a
-    35:35:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):97 -> a
-    35:35:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    36:37:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):98:99 -> a
-    36:37:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    38:38:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
-    38:38:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):99 -> a
-    38:38:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    39:39:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):101:101 -> a
+    22:23:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):79:80 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexValue$DexValueAnnotation.getValue():1703:1703 -> a
+    24:24:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):80 -> a
+    25:29:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):80:84 -> a
+    30:30:boolean com.android.tools.r8.graph.DexValue.isDexItemBasedValueString():0:0 -> a
+    30:30:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):90 -> a
+    30:30:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
+    31:35:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):91:95 -> a
+    31:35:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
+    36:36:boolean com.android.tools.r8.graph.DexValue.isDexValueEnum():0:0 -> a
+    36:36:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):97 -> a
+    36:36:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
+    37:38:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):98:99 -> a
+    37:38:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
+    39:39:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
+    39:39:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):99 -> a
     39:39:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    40:40:boolean com.android.tools.r8.graph.DexValue.isDexValueField():0:0 -> a
-    40:40:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):103 -> a
+    40:40:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):101:101 -> a
     40:40:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    41:41:boolean com.android.tools.r8.graph.DexValue.isDexValueMethod():0:0 -> a
-    41:41:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):105 -> a
+    41:41:boolean com.android.tools.r8.graph.DexValue.isDexValueField():0:0 -> a
+    41:41:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):103 -> a
     41:41:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    42:42:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    42:42:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):107 -> a
+    42:42:boolean com.android.tools.r8.graph.DexValue.isDexValueMethod():0:0 -> a
+    42:42:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):105 -> a
     42:42:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    43:43:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> a
-    43:43:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):109 -> a
+    43:43:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
+    43:43:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):107 -> a
     43:43:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    44:48:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):111:115 -> a
-    44:48:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    49:49:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":69,"2":70,"3":71}}
-    69:69:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):115:115 -> a
-    69:69:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    70:70:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):115 -> a
+    44:44:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> a
+    44:44:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):109 -> a
+    44:44:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
+    45:49:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):111:115 -> a
+    45:49:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
+    50:50:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":70,"2":71,"3":72}}
+    70:70:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):115:115 -> a
     70:70:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     71:71:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):115 -> a
     71:71:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    50:54:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):117:121 -> a
-    50:54:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    55:55:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):110:110 -> a
-    55:55:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    56:56:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):108:108 -> a
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    72:72:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):115 -> a
+    72:72:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
+    51:55:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):117:121 -> a
+    51:55:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
+    56:56:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):110:110 -> a
     56:56:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    57:57:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):106:106 -> a
+    57:57:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):108:108 -> a
     57:57:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
-    58:58:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):104:104 -> a
+    58:58:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):106:106 -> a
     58:58:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
+    59:59:com.android.tools.r8.graph.DexValue com.android.tools.r8.shaking.AnnotationFixer.rewriteNestedValue(com.android.tools.r8.graph.DexValue):104:104 -> a
+    59:59:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):86 -> a
 com.android.tools.r8.shaking.AnnotationMatchResult -> com.android.tools.r8.shaking.e:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.shaking.AnnotationMatchResult$ConcreteAnnotationMatchResult asConcreteAnnotationMatchResult() -> a
@@ -104396,7 +103401,7 @@
     1:1:com.android.tools.r8.graph.DexAnnotation getAnnotation():76:76 -> c
     1:3:boolean equals(java.lang.Object):88:90 -> equals
     1:1:int hashCode():99:99 -> hashCode
-com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.shaking.h:
+com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.shaking.g:
     com.android.tools.r8.shaking.ProguardKeepAttributes keep -> e
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.shaking.Enqueuer$Mode mode -> b
@@ -104427,7 +103432,6 @@
     39:40:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):122:123 -> a
     41:41:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
     41:41:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):123 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     42:42:boolean com.android.tools.r8.graph.DexAnnotation.isJavaLangRetentionAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):330:330 -> a
     42:42:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):124 -> a
     43:43:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):128:128 -> a
@@ -104443,28 +103447,21 @@
     68:68:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173:173 -> a
     69:75:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):144:150 -> a
     69:75:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     76:76:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     76:76:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150 -> a
     76:76:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     77:80:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150:153 -> a
     77:80:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     81:81:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     81:81:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153 -> a
     81:81:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     82:90:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153:161 -> a
     82:90:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     91:91:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     91:91:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):161 -> a
     91:91:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     92:92:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):161:161 -> a
     92:92:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     93:94:void run(java.util.concurrent.ExecutorService):178:179 -> a
     95:103:void run(com.android.tools.r8.graph.DexProgramClass):183:191 -> a
     104:106:void lambda$run$1(java.util.Set,com.android.tools.r8.graph.ProgramMember):193:195 -> a
@@ -104500,9 +103497,9 @@
     123:123:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":382,"2":383,"3":384}}
     382:382:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):250:250 -> a
-    383:383:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    383:383:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     383:383:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):250 -> a
-    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     384:384:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):250 -> a
     374:380:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):251:257 -> a
     381:381:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):256:256 -> a
@@ -104511,7 +103508,6 @@
     387:389:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):278:280 -> a
     390:390:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
     390:390:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):280 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     391:404:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):281:294 -> a
     405:405:com.android.tools.r8.graph.DexAnnotation lambda$removeAnnotations$5(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):285:285 -> a
     406:406:com.android.tools.r8.graph.DexAnnotation lambda$removeAnnotations$7(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):295:295 -> a
@@ -104533,7 +103529,7 @@
     436:436:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342:342 -> a
     437:437:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):184:184 -> a
     437:437:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342 -> a
-    438:438:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> a
+    438:438:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():628:628 -> a
     438:438:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):187 -> a
     438:438:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342 -> a
     439:439:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):190:190 -> a
@@ -104550,7 +103546,7 @@
     452:453:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):366:367 -> a
     454:454:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):203:203 -> a
     454:454:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):367 -> a
-    455:455:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> a
+    455:455:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():628:628 -> a
     455:455:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):206 -> a
     455:455:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):367 -> a
     456:456:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):211:211 -> a
@@ -104601,8 +103597,7 @@
     6:8:boolean verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo():202:204 -> b
     9:19:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):263:273 -> b
     20:20:com.android.tools.r8.graph.DexAnnotation lambda$removeAnnotations$6(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):289:289 -> b
-com.android.tools.r8.shaking.AnnotationRemover$1 -> com.android.tools.r8.shaking.f:
-com.android.tools.r8.shaking.AnnotationRemover$Builder -> com.android.tools.r8.shaking.g:
+com.android.tools.r8.shaking.AnnotationRemover$Builder -> com.android.tools.r8.shaking.f:
     com.android.tools.r8.shaking.Enqueuer$Mode mode -> b
     java.util.Set annotationsToRetain -> a
     1:1:void <init>(com.android.tools.r8.shaking.Enqueuer$Mode):411:411 -> <init>
@@ -104610,7 +103605,7 @@
     1:1:boolean isRetainedForFinalTreeShaking(com.android.tools.r8.graph.DexAnnotation):416:416 -> a
     2:2:com.android.tools.r8.shaking.AnnotationRemover build(com.android.tools.r8.graph.AppView,java.util.Set):425:425 -> a
     1:1:void retainAnnotation(com.android.tools.r8.graph.DexAnnotation):420:420 -> b
-com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.i:
+com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.h:
     java.util.Map switchMaps -> T
     java.util.Set liveMethods -> s
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> R
@@ -104679,164 +103674,167 @@
     30:30:java.util.Map pruneMapFromMembers(java.util.Map,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):466:466 -> a
     31:42:void lambda$pruneMapFromMembers$4(com.android.tools.r8.graph.PrunedItems,java.util.Map):469:480 -> a
     43:45:boolean lambda$pruneMapFromMembers$3(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember):475:477 -> a
-    46:46:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    46:46:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):694 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    47:48:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):697:698 -> a
-    49:60:void computeLargestCfVersion():704:704 -> a
-    49:60:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):698 -> a
-    70:70:void computeLargestCfVersion():714:714 -> a
-    70:70:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):698 -> a
-    71:71:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):700:700 -> a
-    72:74:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):493:495 -> a
-    75:75:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):494:494 -> a
-    76:87:void lambda$pruneMapFromMembers$6(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):497:508 -> a
-    88:90:java.util.Map pruneMap(java.util.Map,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):521:523 -> a
-    91:91:java.util.Map pruneMap(java.util.Map,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):522:522 -> a
-    92:95:void lambda$pruneMap$7(java.util.Map,java.util.Set):525:528 -> a
-    96:99:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):590:593 -> a
-    100:100:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):591:591 -> a
-    101:102:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):595:596 -> a
-    103:103:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    103:103:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):596 -> a
-    104:123:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):598:617 -> a
-    124:124:boolean isBootstrapMethod(com.android.tools.r8.graph.ProgramMethod):762:762 -> a
-    125:125:boolean isBootstrapMethod(com.android.tools.r8.graph.DexMethod):758:758 -> a
-    125:125:boolean isBootstrapMethod(com.android.tools.r8.graph.ProgramMethod):762 -> a
-    126:141:void forEachReachableInterface(java.util.function.Consumer,java.lang.Iterable):848:863 -> a
-    142:175:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):882:915 -> a
-    176:176:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):885:885 -> a
-    177:177:void removeFromSingleTargetLookupCache(com.android.tools.r8.graph.DexClass):964:964 -> a
-    178:179:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):999:1000 -> a
-    180:180:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():941:941 -> a
-    180:180:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1001 -> a
-    181:181:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
+    46:48:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):493:495 -> a
+    49:49:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):494:494 -> a
+    50:61:void lambda$pruneMapFromMembers$6(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):497:508 -> a
+    62:64:java.util.Map pruneMap(java.util.Map,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):521:523 -> a
+    65:65:java.util.Map pruneMap(java.util.Map,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):522:522 -> a
+    66:69:void lambda$pruneMap$7(java.util.Map,java.util.Set):525:528 -> a
+    70:73:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):590:593 -> a
+    74:74:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):591:591 -> a
+    75:76:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):595:596 -> a
+    77:77:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    77:77:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):596 -> a
+    78:97:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):598:617 -> a
+    98:98:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):694:694 -> a
+    99:99:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    99:99:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):694 -> a
+    100:101:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):697:698 -> a
+    102:113:void computeLargestCfVersion():704:704 -> a
+    102:113:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):698 -> a
+    123:123:void computeLargestCfVersion():714:714 -> a
+    123:123:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):698 -> a
+    124:124:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):700:700 -> a
+    125:125:boolean isBootstrapMethod(com.android.tools.r8.graph.ProgramMethod):762:762 -> a
+    126:126:boolean isBootstrapMethod(com.android.tools.r8.graph.DexMethod):758:758 -> a
+    126:126:boolean isBootstrapMethod(com.android.tools.r8.graph.ProgramMethod):762 -> a
+    127:142:void forEachReachableInterface(java.util.function.Consumer,java.lang.Iterable):848:863 -> a
+    143:176:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):882:915 -> a
+    177:177:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):885:885 -> a
+    178:178:void removeFromSingleTargetLookupCache(com.android.tools.r8.graph.DexClass):964:964 -> a
+    179:180:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):999:1000 -> a
+    181:181:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():941:941 -> a
     181:181:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1001 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    182:185:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1002:1005 -> a
-    186:186:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1117:1117 -> a
-    186:186:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1009 -> a
-    187:187:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    187:187:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1118 -> a
-    187:187:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1009 -> a
-    188:188:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    188:188:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1118 -> a
+    182:182:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1001:1001 -> a
+    183:183:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
+    183:183:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1001 -> a
+    184:187:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1002:1005 -> a
+    188:188:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1117:1117 -> a
     188:188:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1009 -> a
-    189:190:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1031:1032 -> a
-    191:191:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1228,"2":1229,"3":1230}}
-    1228:1228:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1032:1032 -> a
-    1229:1229:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1032:1032 -> a
+    189:189:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    189:189:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1118 -> a
+    189:189:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1009 -> a
+    190:190:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    190:190:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1118 -> a
+    190:190:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1009 -> a
+    191:192:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1031:1032 -> a
+    193:193:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1230,"2":1231,"3":1232}}
     1230:1230:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1032:1032 -> a
-    1223:1227:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1032:1036 -> a
-    1231:1232:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMember):1089:1090 -> a
-    1233:1233:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):1139:1139 -> a
-    1234:1234:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1143:1143 -> a
-    1235:1235:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
-    1235:1235:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1143 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1236:1237:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1143:1144 -> a
-    1238:1238:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition):1148:1148 -> a
-    1239:1240:boolean isAccessModificationAllowed(com.android.tools.r8.graph.DexReference):1152:1153 -> a
-    1239:1240:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition):1148 -> a
-    1241:1251:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1157:1167 -> a
-    1252:1256:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):332:336 -> a
-    1252:1256:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1168 -> a
-    1257:1257:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1175:1175 -> a
-    1258:1261:com.android.tools.r8.utils.TraversalContinuation lambda$isRepackagingAllowed$10(com.android.tools.r8.graph.ProgramMember):1170:1173 -> a
-    1262:1263:boolean isPinned(com.android.tools.r8.graph.DexDefinition):1184:1185 -> a
-    1264:1265:boolean isPinned(com.android.tools.r8.graph.DexClassAndMember):1189:1190 -> a
-    1266:1266:void lambda$prunedCopyFrom$11(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder):1226:1226 -> a
-    1267:1267:void lambda$prunedCopyFrom$12(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):1227:1227 -> a
-    1268:1276:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1244:1252 -> a
-    1277:1327:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1247:1297 -> a
-    1328:1330:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap com.android.tools.r8.graph.GraphLens.rewriteReferenceKeys(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):663:665 -> a
-    1328:1330:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1298 -> a
-    1331:1337:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1298:1304 -> a
-    1338:1338:com.android.tools.r8.shaking.ProguardMemberRule lambda$rewrittenWithLens$14(com.android.tools.r8.graph.DexReference,java.util.List):1277:1277 -> a
-    1339:1339:com.android.tools.r8.shaking.ProguardMemberRule lambda$rewrittenWithLens$15(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexMember,java.util.List):1281:1281 -> a
-    1340:1340:java.util.Map rewriteInitClassReferences(com.android.tools.r8.graph.GraphLens):1308:1308 -> a
-    1341:1341:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1312:1312 -> a
-    1342:1342:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> a
-    1342:1342:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1312 -> a
-    1343:1344:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1312:1313 -> a
-    1345:1345:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> a
-    1345:1345:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1313 -> a
-    1346:1347:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1313:1314 -> a
-    1348:1348:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> a
-    1348:1348:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1314 -> a
-    1349:1349:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1315:1315 -> a
-    1350:1350:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> a
-    1350:1350:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1318 -> a
-    1351:1351:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1322:1322 -> a
-    1352:1357:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1345:1350 -> a
-    1352:1357:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
-    1358:1359:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1388:1389 -> a
-    1358:1359:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1352 -> a
-    1358:1359:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
-    1360:1360:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):626:626 -> a
-    1360:1360:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1360 -> a
-    1360:1360:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
-    1361:1361:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1360:1360 -> a
-    1361:1361:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
-    1362:1362:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodDefinitionOrNull(com.android.tools.r8.graph.DexClassAndMethod):258:258 -> a
-    1362:1362:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1360 -> a
-    1362:1362:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
-    1363:1363:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1358:1358 -> a
-    1363:1363:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
-    1364:1365:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1388:1389 -> a
-    1364:1365:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1354 -> a
-    1364:1365:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
-    1366:1366:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1356:1356 -> a
+    1231:1231:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1032:1032 -> a
+    1232:1232:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1032:1032 -> a
+    1225:1229:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1032:1036 -> a
+    1233:1234:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMember):1089:1090 -> a
+    1235:1235:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):1139:1139 -> a
+    1236:1236:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1143:1143 -> a
+    1237:1237:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():613:613 -> a
+    1237:1237:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1143 -> a
+    1238:1239:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1143:1144 -> a
+    1240:1240:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition):1148:1148 -> a
+    1241:1242:boolean isAccessModificationAllowed(com.android.tools.r8.graph.DexReference):1152:1153 -> a
+    1241:1242:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition):1148 -> a
+    1243:1253:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1157:1167 -> a
+    1254:1258:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):332:336 -> a
+    1254:1258:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1168 -> a
+    1259:1259:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1175:1175 -> a
+    1260:1263:com.android.tools.r8.utils.TraversalContinuation lambda$isRepackagingAllowed$10(com.android.tools.r8.graph.ProgramMember):1170:1173 -> a
+    1264:1265:boolean isPinned(com.android.tools.r8.graph.DexDefinition):1184:1185 -> a
+    1266:1267:boolean isPinned(com.android.tools.r8.graph.DexClassAndMember):1189:1190 -> a
+    1268:1268:void lambda$prunedCopyFrom$11(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder):1226:1226 -> a
+    1269:1269:void lambda$prunedCopyFrom$12(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):1227:1227 -> a
+    1270:1278:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1244:1252 -> a
+    1279:1329:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1247:1297 -> a
+    1330:1332:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap com.android.tools.r8.graph.GraphLens.rewriteReferenceKeys(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):687:689 -> a
+    1330:1332:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1298 -> a
+    1333:1333:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.GraphLens.rewriteReference(com.android.tools.r8.graph.DexReference):635:635 -> a
+    1333:1333:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap com.android.tools.r8.graph.GraphLens.rewriteReferenceKeys(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):689 -> a
+    1333:1333:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1298 -> a
+    1334:1334:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap com.android.tools.r8.graph.GraphLens.rewriteReferenceKeys(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):689:689 -> a
+    1334:1334:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1298 -> a
+    1335:1341:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1298:1304 -> a
+    1342:1342:com.android.tools.r8.shaking.ProguardMemberRule lambda$rewrittenWithLens$14(com.android.tools.r8.graph.DexReference,java.util.List):1277:1277 -> a
+    1343:1343:com.android.tools.r8.shaking.ProguardMemberRule lambda$rewrittenWithLens$15(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexMember,java.util.List):1281:1281 -> a
+    1344:1344:java.util.Map rewriteInitClassReferences(com.android.tools.r8.graph.GraphLens):1308:1308 -> a
+    1345:1345:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1312:1312 -> a
+    1346:1346:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> a
+    1346:1346:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1312 -> a
+    1347:1348:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1312:1313 -> a
+    1349:1349:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> a
+    1349:1349:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1313 -> a
+    1350:1351:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1313:1314 -> a
+    1352:1352:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> a
+    1352:1352:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1314 -> a
+    1353:1353:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1315:1315 -> a
+    1354:1354:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> a
+    1354:1354:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1318 -> a
+    1355:1355:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1322:1322 -> a
+    1356:1361:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1345:1350 -> a
+    1356:1361:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
+    1362:1363:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1388:1389 -> a
+    1362:1363:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1352 -> a
+    1362:1363:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
+    1364:1364:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):626:626 -> a
+    1364:1364:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1360 -> a
+    1364:1364:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
+    1365:1365:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1360:1360 -> a
+    1365:1365:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
+    1366:1366:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodDefinitionOrNull(com.android.tools.r8.graph.DexClassAndMethod):258:258 -> a
+    1366:1366:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1360 -> a
     1366:1366:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
-    1367:1367:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371:1371 -> a
-    1368:1369:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1377:1378 -> a
-    1370:1401:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1400:1431 -> a
-    1402:1402:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> a
-    1402:1402:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1431 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1403:1404:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1432:1433 -> a
-    1405:1408:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1497:1500 -> a
-    1405:1408:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
-    1409:1409:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    1409:1409:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1502 -> a
-    1409:1409:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
-    1410:1410:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1207:1207 -> a
-    1410:1410:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1503 -> a
-    1410:1410:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
-    1411:1411:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1504:1504 -> a
-    1411:1411:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
-    1412:1412:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
-    1412:1412:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1504 -> a
-    1412:1412:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
-    1413:1417:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1505:1509 -> a
-    1413:1417:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
-    1418:1432:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1507:1521 -> a
-    1418:1432:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
-    1433:1445:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1443:1455 -> a
-    1446:1466:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1454:1474 -> a
-    1467:1477:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1473:1483 -> a
-    1478:1480:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1528:1530 -> a
-    1481:1506:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer,java.util.Collection,java.util.Set,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1562:1587 -> a
-    1507:1507:void lambda$forEachTypeInHierarchyOfLiveProgramClasses$20(java.util.Set,com.android.tools.r8.graph.DexProgramClass):1563:1563 -> a
-    1508:1508:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1599:1599 -> a
-    1509:1510:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1609:1610 -> a
-    1511:1513:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):968:970 -> a
-    1511:1513:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1618 -> a
-    1511:1513:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1611 -> a
-    1514:1514:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    1514:1514:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):972 -> a
-    1514:1514:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1618 -> a
-    1514:1514:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1611 -> a
-    1515:1515:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):972:972 -> a
-    1515:1515:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1618 -> a
-    1515:1515:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1611 -> a
-    1516:1516:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1618:1618 -> a
-    1516:1516:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1611 -> a
-    1517:1517:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1612:1612 -> a
-    1518:1525:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeElement):1640:1647 -> a
-    1526:1526:boolean lambda$mayHaveFinalizeMethodDirectlyOrIndirectly$21(com.android.tools.r8.graph.DexType,java.lang.Boolean):1645:1645 -> a
-    1527:1527:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$23(com.android.tools.r8.ir.desugar.LambdaDescriptor):1670:1670 -> a
+    1367:1367:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1358:1358 -> a
+    1367:1367:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
+    1368:1369:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1388:1389 -> a
+    1368:1369:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1354 -> a
+    1368:1369:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
+    1370:1370:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1356:1356 -> a
+    1370:1370:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1371 -> a
+    1371:1371:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate) -> a
+    1372:1373:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1377:1378 -> a
+    1374:1405:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1400:1431 -> a
+    1406:1406:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> a
+    1406:1406:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1431 -> a
+    1407:1408:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1432:1433 -> a
+    1409:1412:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1497:1500 -> a
+    1409:1412:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
+    1413:1413:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    1413:1413:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1502 -> a
+    1413:1413:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
+    1414:1414:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1207:1207 -> a
+    1414:1414:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1503 -> a
+    1414:1414:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
+    1415:1415:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1504:1504 -> a
+    1415:1415:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
+    1416:1416:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
+    1416:1416:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1504 -> a
+    1416:1416:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
+    1417:1421:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1505:1509 -> a
+    1417:1421:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
+    1422:1436:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1507:1521 -> a
+    1422:1436:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1438 -> a
+    1437:1449:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1443:1455 -> a
+    1450:1470:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1454:1474 -> a
+    1471:1481:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1473:1483 -> a
+    1482:1484:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1528:1530 -> a
+    1485:1510:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer,java.util.Collection,java.util.Set,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1562:1587 -> a
+    1511:1511:void lambda$forEachTypeInHierarchyOfLiveProgramClasses$20(java.util.Set,com.android.tools.r8.graph.DexProgramClass):1563:1563 -> a
+    1512:1512:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1599:1599 -> a
+    1513:1514:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1609:1610 -> a
+    1515:1517:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):968:970 -> a
+    1515:1517:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1618 -> a
+    1515:1517:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1611 -> a
+    1518:1518:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    1518:1518:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):972 -> a
+    1518:1518:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1618 -> a
+    1518:1518:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1611 -> a
+    1519:1519:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):972:972 -> a
+    1519:1519:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1618 -> a
+    1519:1519:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1611 -> a
+    1520:1520:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1618:1618 -> a
+    1520:1520:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1611 -> a
+    1521:1521:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1612:1612 -> a
+    1522:1529:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeElement):1640:1647 -> a
+    1530:1530:boolean lambda$mayHaveFinalizeMethodDirectlyOrIndirectly$21(com.android.tools.r8.graph.DexType,java.lang.Boolean):1645:1645 -> a
+    1531:1531:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$23(com.android.tools.r8.ir.desugar.LambdaDescriptor):1670:1670 -> a
     1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):87:87 -> b
     2:2:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):87:87 -> b
     3:5:boolean lambda$pruneMapFromMembers$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember):503:505 -> b
@@ -104865,31 +103863,30 @@
     1064:1064:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1043:1043 -> b
     1065:1065:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> b
     1065:1065:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1043 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1066:1067:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1045:1046 -> b
     1071:1074:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1066:1069 -> b
-    1075:1076:boolean isPinned(com.android.tools.r8.graph.DexReference):1179:1180 -> b
-    1077:1077:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
-    1077:1077:boolean isPinned(com.android.tools.r8.graph.DexReference):1180 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1078:1078:void lambda$prunedCopyFrom$13(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):1229:1229 -> b
-    1079:1079:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1239:1239 -> b
-    1080:1084:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):290:294 -> b
-    1080:1084:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1239 -> b
-    1085:1085:java.util.Collection com.android.tools.r8.utils.CollectionUtils.addAll(java.util.Collection,java.util.Collection):17:17 -> b
-    1085:1085:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):294 -> b
-    1085:1085:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1239 -> b
-    1086:1086:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):294:294 -> b
+    1075:1075:boolean com.android.tools.r8.graph.DexEncodedMethod.isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):472:472 -> b
+    1075:1075:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1069 -> b
+    1076:1077:boolean isPinned(com.android.tools.r8.graph.DexReference):1179:1180 -> b
+    1078:1078:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
+    1078:1078:boolean isPinned(com.android.tools.r8.graph.DexReference):1180 -> b
+    1079:1079:void lambda$prunedCopyFrom$13(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):1229:1229 -> b
+    1080:1080:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1239:1239 -> b
+    1081:1085:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):290:294 -> b
+    1081:1085:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1239 -> b
+    1086:1086:java.util.Collection com.android.tools.r8.utils.CollectionUtils.addAll(java.util.Collection,java.util.Collection):17:17 -> b
+    1086:1086:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):294 -> b
     1086:1086:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1239 -> b
-    1087:1087:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):288:288 -> b
+    1087:1087:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):294:294 -> b
     1087:1087:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1239 -> b
-    1088:1088:com.android.tools.r8.shaking.ProguardMemberRule lambda$rewrittenWithLens$16(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexMember,java.util.List):1284:1284 -> b
-    1089:1089:void forEachReferencedClasspathClass(java.util.function.Consumer):1540:1540 -> b
-    1090:1094:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1622:1626 -> b
-    1095:1097:boolean com.android.tools.r8.graph.DexEncodedMethod.isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):367:369 -> b
-    1095:1097:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1627 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1098:1102:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1627:1631 -> b
+    1088:1088:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):288:288 -> b
+    1088:1088:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1239 -> b
+    1089:1089:com.android.tools.r8.shaking.ProguardMemberRule lambda$rewrittenWithLens$16(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexMember,java.util.List):1284:1284 -> b
+    1090:1090:void forEachReferencedClasspathClass(java.util.function.Consumer):1540:1540 -> b
+    1091:1096:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1622:1627 -> b
+    1097:1099:boolean com.android.tools.r8.graph.DexEncodedMethod.isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):367:369 -> b
+    1097:1099:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1627 -> b
+    1100:1104:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1627:1631 -> b
     1:3:boolean lambda$pruneMembers$0(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember):413:415 -> c
     4:9:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):545:550 -> c
     10:15:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):678:683 -> c
@@ -104915,130 +103912,130 @@
     709:710:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):1019:1020 -> c
     711:711:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():941:941 -> c
     711:711:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):1021 -> c
-    712:712:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> c
-    712:712:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):1021 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    713:713:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):1022:1022 -> c
-    714:714:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1117:1117 -> c
-    714:714:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):1027 -> c
-    715:715:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> c
-    715:715:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1118 -> c
+    712:712:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):1021:1021 -> c
+    713:713:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> c
+    713:713:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):1021 -> c
+    714:714:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):1022:1022 -> c
+    715:715:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1117:1117 -> c
     715:715:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):1027 -> c
-    716:716:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> c
+    716:716:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> c
     716:716:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1118 -> c
     716:716:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):1027 -> c
-    717:732:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1217:1232 -> c
-    733:737:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):337:341 -> c
-    733:737:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    738:738:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
-    738:738:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):342 -> c
-    738:738:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    739:739:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):342:342 -> c
+    717:717:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> c
+    717:717:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1118 -> c
+    717:717:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):1027 -> c
+    718:733:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1217:1232 -> c
+    734:738:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):337:341 -> c
+    734:738:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
+    739:739:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
+    739:739:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):342 -> c
     739:739:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    740:740:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    740:740:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):343 -> c
+    740:740:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):342:342 -> c
     740:740:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    741:741:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):343:343 -> c
+    741:741:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    741:741:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):343 -> c
     741:741:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    742:742:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    742:742:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):344 -> c
+    742:742:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):343:343 -> c
     742:742:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    743:743:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):344:344 -> c
+    743:743:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    743:743:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):344 -> c
     743:743:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    744:744:java.util.Set pruneFields(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):396:396 -> c
-    744:744:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):345 -> c
+    744:744:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):344:344 -> c
     744:744:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    745:745:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):345:345 -> c
+    745:745:java.util.Set pruneFields(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):396:396 -> c
+    745:745:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):345 -> c
     745:745:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    746:746:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    746:746:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):346 -> c
+    746:746:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):345:345 -> c
     746:746:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    747:747:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):346:346 -> c
+    747:747:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    747:747:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):346 -> c
     747:747:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    748:748:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    748:748:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):347 -> c
+    748:748:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):346:346 -> c
     748:748:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    749:749:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):347:347 -> c
+    749:749:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    749:749:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):347 -> c
     749:749:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    750:750:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    750:750:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):349 -> c
+    750:750:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):347:347 -> c
     750:750:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    751:751:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):349:349 -> c
+    751:751:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    751:751:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):349 -> c
     751:751:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    752:752:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    752:752:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):351 -> c
+    752:752:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):349:349 -> c
     752:752:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    753:761:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):351:359 -> c
-    753:761:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    762:762:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    762:762:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):360 -> c
-    762:762:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    763:763:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):360:360 -> c
+    753:753:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    753:753:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):351 -> c
+    753:753:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
+    754:762:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):351:359 -> c
+    754:762:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
+    763:763:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    763:763:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):360 -> c
     763:763:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    764:764:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    764:764:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):361 -> c
+    764:764:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):360:360 -> c
     764:764:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    765:765:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):361:361 -> c
+    765:765:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    765:765:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):361 -> c
     765:765:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    766:766:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    766:766:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):362 -> c
+    766:766:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):361:361 -> c
     766:766:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    767:767:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):362:362 -> c
+    767:767:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    767:767:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):362 -> c
     767:767:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    768:768:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    768:768:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):363 -> c
+    768:768:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):362:362 -> c
     768:768:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    769:769:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):363:363 -> c
+    769:769:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    769:769:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):363 -> c
     769:769:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    770:770:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    770:770:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):364 -> c
+    770:770:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):363:363 -> c
     770:770:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    771:771:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):364:364 -> c
+    771:771:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    771:771:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):364 -> c
     771:771:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    772:772:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    772:772:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):365 -> c
+    772:772:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):364:364 -> c
     772:772:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    773:773:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):365:365 -> c
+    773:773:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    773:773:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):365 -> c
     773:773:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    774:774:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
-    774:774:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):366 -> c
+    774:774:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):365:365 -> c
     774:774:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    775:775:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):366:366 -> c
+    775:775:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):431:431 -> c
+    775:775:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):366 -> c
     775:775:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    776:776:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
-    776:776:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):368 -> c
+    776:776:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):366:366 -> c
     776:776:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    777:777:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):368:368 -> c
+    777:777:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
+    777:777:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):368 -> c
     777:777:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    778:778:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
-    778:778:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):369 -> c
+    778:778:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):368:368 -> c
     778:778:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    779:779:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):369:369 -> c
+    779:779:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
+    779:779:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):369 -> c
     779:779:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    780:780:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
-    780:780:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):370 -> c
+    780:780:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):369:369 -> c
     780:780:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    781:781:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):370:370 -> c
+    781:781:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
+    781:781:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):370 -> c
     781:781:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    782:782:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
-    782:782:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):371 -> c
+    782:782:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):370:370 -> c
     782:782:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    783:788:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):371:376 -> c
-    783:788:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    789:789:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
-    789:789:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):378 -> c
-    789:789:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    790:790:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):378:378 -> c
+    783:783:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
+    783:783:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):371 -> c
+    783:783:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
+    784:789:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):371:376 -> c
+    784:789:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
+    790:790:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):388:388 -> c
+    790:790:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):378 -> c
     790:790:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    791:791:java.util.Map pruneMapFromClasses(java.util.Map,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):457:457 -> c
-    791:791:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):379 -> c
+    791:791:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):378:378 -> c
     791:791:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    792:792:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):379:379 -> c
+    792:792:java.util.Map pruneMapFromClasses(java.util.Map,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):457:457 -> c
+    792:792:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):379 -> c
     792:792:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    793:793:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):336:336 -> c
+    793:793:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):379:379 -> c
     793:793:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
-    794:794:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1234:1234 -> c
-    795:799:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer):1549:1549 -> c
+    794:794:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):336:336 -> c
+    794:794:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1232 -> c
+    795:795:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1234:1234 -> c
+    796:800:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer):1549:1549 -> c
     1:1:boolean isMethodTargetedByInvokeDynamic(com.android.tools.r8.graph.ProgramMethod):770:770 -> d
     2:2:boolean isMethodTargetedByInvokeDynamic(com.android.tools.r8.graph.DexMethod):766:766 -> d
     2:2:boolean isMethodTargetedByInvokeDynamic(com.android.tools.r8.graph.ProgramMethod):770 -> d
@@ -105056,7 +104053,6 @@
     1066:1066:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1059:1059 -> d
     1067:1067:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> d
     1067:1067:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1059 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1068:1072:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1060:1064 -> d
     1076:1077:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):1122:1123 -> d
     1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):718:718 -> e
@@ -105065,22 +104061,22 @@
     4:5:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):986:987 -> e
     6:6:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():941:941 -> e
     6:6:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):988 -> e
-    7:7:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> e
-    7:7:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):988 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):990:990 -> e
-    9:9:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1207:1207 -> e
-    9:9:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):995 -> e
-    10:10:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):995:995 -> e
-    11:11:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):122:122 -> e
-    11:11:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):995 -> e
-    12:12:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramField():60:60 -> e
-    12:12:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):124 -> e
+    7:7:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):988:988 -> e
+    8:8:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> e
+    8:8:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):988 -> e
+    9:9:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):990:990 -> e
+    10:10:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1207:1207 -> e
+    10:10:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):995 -> e
+    11:11:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):995:995 -> e
+    12:12:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):122:122 -> e
     12:12:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):995 -> e
-    13:14:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):126:127 -> e
-    13:14:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):995 -> e
-    15:15:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):995:995 -> e
-    16:20:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexField):1094:1098 -> e
+    13:13:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramField():60:60 -> e
+    13:13:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):124 -> e
+    13:13:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):995 -> e
+    14:15:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):126:127 -> e
+    14:15:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):995 -> e
+    16:16:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):995:995 -> e
+    17:21:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexField):1094:1098 -> e
     1:1:boolean isFailedResolutionTarget(com.android.tools.r8.graph.DexMethod):746:746 -> f
     2:3:boolean isNeverReprocessMethod(com.android.tools.r8.graph.ProgramMethod):834:835 -> f
     4:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):1073:1074 -> f
@@ -105127,7 +104123,7 @@
     1:1:com.android.tools.r8.graph.MethodAccessInfoCollection getMethodAccessInfoCollection():950:950 -> x
     1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl getMutableFieldAccessInfoCollection():945:945 -> y
     1:1:com.android.tools.r8.graph.ObjectAllocationInfoCollection getObjectAllocationInfoCollection():955:955 -> z
-com.android.tools.r8.shaking.AppInfoWithLivenessModifier -> com.android.tools.r8.shaking.j:
+com.android.tools.r8.shaking.AppInfoWithLivenessModifier -> com.android.tools.r8.shaking.i:
     java.util.Set noLongerInstantiatedClasses -> a
     java.util.Set noLongerWrittenFields -> b
     1:1:void <init>():20:20 -> <init>
@@ -105140,7 +104136,7 @@
     11:11:void modify(com.android.tools.r8.shaking.AppInfoWithLiveness):50 -> a
     12:12:void lambda$modify$0(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder):38:38 -> a
     13:15:void lambda$modify$1(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.DexField):44:46 -> a
-com.android.tools.r8.shaking.ClassInitFieldSynthesizer -> com.android.tools.r8.internal.U9:
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer -> com.android.tools.r8.internal.J9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexField clinitField -> b
     com.android.tools.r8.graph.InitClassLens$Builder lensBuilder -> c
@@ -105170,10 +104166,10 @@
     38:38:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):71 -> a
     39:49:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):77:87 -> a
     50:59:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):84:93 -> a
-com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.internal.T9:
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.internal.I9:
     int[] $SwitchMap$com$android$tools$r8$utils$Visibility -> a
     1:1:void <clinit>():101:101 -> <clinit>
-com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.m:
+com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.k:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> r
     int $r8$clinit -> s
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):73:87 -> <init>
@@ -105187,18 +104183,17 @@
     125:125:java.lang.String typeString():112:112 -> C
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type getType():95:95 -> D
     com.android.tools.r8.shaking.ClassInlineRule asClassInlineRule() -> q
-com.android.tools.r8.shaking.ClassInlineRule$1 -> com.android.tools.r8.shaking.k:
-com.android.tools.r8.shaking.ClassInlineRule$Builder -> com.android.tools.r8.shaking.l:
+com.android.tools.r8.shaking.ClassInlineRule$Builder -> com.android.tools.r8.shaking.j:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.ClassInlineRule$1):18:18 -> <init>
     2:2:void <init>():21:21 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ClassInlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.ka:
+com.android.tools.r8.shaking.ClassInlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Y9:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.gc:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.Lb:
     java.util.Map target2sources -> b
     com.android.tools.r8.experimental.graphinfo.GraphConsumer subConsumer -> a
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):23:23 -> <init>
@@ -105208,17 +104203,16 @@
     1:6:void acceptEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo):29:34 -> acceptEdge
     1:1:java.util.Map lambda$acceptEdge$0(com.android.tools.r8.experimental.graphinfo.GraphNode):30:30 -> b
     1:1:java.util.Set lambda$acceptEdge$1(com.android.tools.r8.experimental.graphinfo.GraphNode):31:31 -> c
-com.android.tools.r8.shaking.ConstantArgumentRule -> com.android.tools.r8.shaking.p:
+com.android.tools.r8.shaking.ConstantArgumentRule -> com.android.tools.r8.shaking.m:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ConstantArgumentRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:java.lang.String typeString():79:79 -> C
-com.android.tools.r8.shaking.ConstantArgumentRule$1 -> com.android.tools.r8.shaking.n:
-com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> com.android.tools.r8.shaking.o:
+com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> com.android.tools.r8.shaking.l:
     1:1:void <init>(com.android.tools.r8.shaking.ConstantArgumentRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry -> com.android.tools.r8.shaking.q:
+com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry -> com.android.tools.r8.shaking.n:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> f
     com.android.tools.r8.graph.AppView appView -> e
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> g
@@ -105273,13 +104267,13 @@
     1:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):67:68 -> g
     3:4:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):144:145 -> g
     1:2:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):150:151 -> h
-com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.ff:
+com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.Je:
     com.android.tools.r8.shaking.DefaultTreePrunerConfiguration INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.shaking.DefaultTreePrunerConfiguration getInstance():17:17 -> a
     2:2:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):22:22 -> a
-com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction -> com.android.tools.r8.shaking.r:
+com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction -> com.android.tools.r8.shaking.o:
     java.util.function.Consumer action -> c
     com.android.tools.r8.graph.ProgramMethod singleTarget -> b
     com.android.tools.r8.graph.ProgramMethod methodToKeep -> a
@@ -105289,7 +104283,7 @@
     1:1:java.util.function.Consumer getAction():42:42 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod getMethodToKeep():34:34 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod getSingleTarget():38:38 -> c
-com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection -> com.android.tools.r8.internal.if:
+com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection -> com.android.tools.r8.internal.Me:
     java.util.Map dependentMinimumKeepInfo -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -105307,7 +104301,6 @@
     13:13:void merge(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):92:92 -> a
     14:14:void com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.forEach(java.util.function.BiConsumer):38:38 -> a
     14:14:void merge(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):92 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:void lambda$merge$4(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.MinimumKeepInfoCollection):94:94 -> a
     16:16:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):98:98 -> a
     17:24:boolean lambda$pruneDeadItems$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.MinimumKeepInfoCollection):102:109 -> a
@@ -105343,11 +104336,11 @@
     60:60:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection rewrittenWithLens(com.android.tools.r8.graph.GraphLens):154 -> a
     61:62:void lambda$rewrittenWithLens$9(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.MinimumKeepInfoCollection):157:158 -> a
     1:1:com.android.tools.r8.shaking.MinimumKeepInfoCollection remove(com.android.tools.r8.shaking.EnqueuerEvent):123:123 -> b
-com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.shaking.s:
+com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.shaking.p:
     java.util.concurrent.ConcurrentHashMap stringCache -> a
     1:2:void <init>():9:10 -> <init>
     1:1:java.lang.String lookupString(com.android.tools.r8.graph.DexString):13:13 -> a
-com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.oh:
+com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.Wg:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     java.util.List failed -> c
@@ -105361,17 +104354,16 @@
     11:11:int lambda$run$0(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):60:60 -> a
     12:13:void checkClassAndMembers(com.android.tools.r8.graph.DexProgramClass):72:73 -> a
     14:18:boolean check(com.android.tools.r8.graph.ProgramDefinition):79:83 -> a
-    1:2:com.android.tools.r8.shaking.DiscardedChecker createForMainDex(com.android.tools.r8.graph.AppView):38:39 -> b
-    3:3:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> b
-    3:3:com.android.tools.r8.shaking.DiscardedChecker createForMainDex(com.android.tools.r8.graph.AppView):40 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.shaking.DiscardedChecker createForMainDex(com.android.tools.r8.graph.AppView):41:41 -> b
-    5:5:boolean isCheckDiscardedEnabled(com.android.tools.r8.graph.ProgramDefinition):66:66 -> b
-com.android.tools.r8.shaking.DiscardedChecker$1 -> com.android.tools.r8.internal.nh:
+    1:3:com.android.tools.r8.shaking.DiscardedChecker createForMainDex(com.android.tools.r8.graph.AppView):38:40 -> b
+    4:4:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> b
+    4:4:com.android.tools.r8.shaking.DiscardedChecker createForMainDex(com.android.tools.r8.graph.AppView):40 -> b
+    5:5:com.android.tools.r8.shaking.DiscardedChecker createForMainDex(com.android.tools.r8.graph.AppView):41:41 -> b
+    6:6:boolean isCheckDiscardedEnabled(com.android.tools.r8.graph.ProgramDefinition):66:66 -> b
+com.android.tools.r8.shaking.DiscardedChecker$1 -> com.android.tools.r8.internal.Vg:
     com.android.tools.r8.shaking.MinimumKeepInfoCollection val$unconditionalKeepInfo -> e
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MinimumKeepInfoCollection):41:41 -> <init>
     1:3:boolean isCheckDiscardedEnabled(com.android.tools.r8.graph.ProgramDefinition):45:45 -> b
-com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.shaking.y:
+com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.shaking.u:
     com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason indirectlyInitializedInterfaces -> D
     java.util.Map initClassReferences -> a0
     java.util.Map deferredAnnotations -> c0
@@ -105440,1591 +104432,1501 @@
     com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet liveMethods -> R
     1:1:void <clinit>():190:190 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):463:463 -> <init>
-    2:3881:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):240:4119 -> <init>
-    3882:3928:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):464:510 -> <init>
+    2:3912:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):240:4150 -> <init>
+    3913:3959:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):464:510 -> <init>
     1:1:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> a
-    1:1:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2875 -> a
-    2:4:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2878:2880 -> a
+    1:1:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2906 -> a
+    2:4:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2909:2911 -> a
     5:5:boolean com.android.tools.r8.shaking.EnqueuerEvent.isLiveClassEvent():0:0 -> a
-    5:5:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2884 -> a
-    6:6:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2885:2885 -> a
+    5:5:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2915 -> a
+    6:6:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2916:2916 -> a
     7:7:boolean com.android.tools.r8.shaking.EnqueuerEvent.isInstantiatedClassEvent():0:0 -> a
-    7:7:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2887 -> a
-    8:8:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2888:2888 -> a
+    7:7:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2918 -> a
+    8:8:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2919:2919 -> a
     9:10:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> a
-    9:10:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2888 -> a
-    11:11:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2891:2891 -> a
-    com.android.tools.r8.shaking.KeepReason lambda$keepClassAndAllMembers$45(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness) -> a
+    9:10:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2919 -> a
+    11:11:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2922:2922 -> a
+    com.android.tools.r8.shaking.KeepReason lambda$keepClassAndAllMembers$44(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness) -> a
     com.android.tools.r8.graph.DexApplication lambda$postProcessingDesugaring$100(com.android.tools.r8.graph.DexApplication) -> a
     12:12:com.android.tools.r8.graph.AppInfoWithClassHierarchy access$1000(com.android.tools.r8.shaking.Enqueuer):190:190 -> a
     13:13:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):190:190 -> a
-    14:17:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2732:2735 -> a
+    14:17:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2763:2766 -> a
     14:17:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):190 -> a
     18:18:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> a
-    18:18:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2736 -> a
+    18:18:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2767 -> a
     18:18:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):190 -> a
-    19:19:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2740:2740 -> a
+    19:19:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2771:2771 -> a
     19:19:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):190 -> a
     20:20:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):190:190 -> a
-    21:22:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):651:652 -> a
+    21:22:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):653:654 -> a
     21:22:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):190 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):190:190 -> a
-    24:24:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):769:769 -> a
+    24:24:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):768:768 -> a
     24:24:com.android.tools.r8.graph.DexProgramClass access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):190 -> a
     25:25:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):190:190 -> a
     26:26:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):190:190 -> a
     27:27:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):190:190 -> a
     28:28:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):190:190 -> a
     29:29:void access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):190:190 -> a
-    30:30:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):190:190 -> a
-    31:31:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
-    31:31:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1224 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:34:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1224:1226 -> a
-    35:35:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):87:87 -> a
-    35:35:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1228 -> a
-    36:36:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    36:36:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1229 -> a
-    37:41:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1230:1234 -> a
-    42:42:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):490:490 -> a
-    43:43:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):538:538 -> a
-    43:43:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):490 -> a
-    44:44:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):528:528 -> a
-    45:45:com.android.tools.r8.shaking.Enqueuer registerFieldAccessAnalysis(com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):543:543 -> a
-    46:46:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):548:548 -> a
-    47:47:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):558:558 -> a
-    48:48:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):568:568 -> a
-    49:49:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):582:582 -> a
-    50:50:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):589:589 -> a
-    50:50:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):584 -> a
-    51:51:boolean addLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):593:593 -> a
-    52:52:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):636:636 -> a
-    53:56:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):643:646 -> a
-    53:56:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):636 -> a
-    57:57:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):664:664 -> a
-    58:58:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):671:671 -> a
-    58:58:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):664 -> a
-    59:59:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):671:671 -> a
-    59:59:com.android.tools.r8.graph.DexClass access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):190 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    60:67:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):678:685 -> a
-    68:72:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):703:707 -> a
-    68:72:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):684 -> a
-    73:73:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):687:687 -> a
-    74:74:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):715:715 -> a
-    75:75:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    75:75:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):715 -> a
-    76:78:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):717:719 -> a
-    79:83:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):780:784 -> a
-    79:83:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):719 -> a
-    84:84:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):721:721 -> a
-    85:85:void com.android.tools.r8.graph.DexClass.forEachClassField(java.util.function.Consumer):144:144 -> a
-    85:85:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):721 -> a
-    86:86:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):728:728 -> a
-    87:87:void com.android.tools.r8.graph.DexClass.forEachClassMethod(java.util.function.Consumer):154:154 -> a
-    87:87:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):728 -> a
-    88:89:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):737:738 -> a
-    90:91:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):724:725 -> a
-    92:92:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):723:723 -> a
-    93:95:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):730:732 -> a
-    96:99:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):731:734 -> a
-    100:110:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):748:758 -> a
-    111:111:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):856:856 -> a
-    112:112:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    112:112:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):857 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    113:117:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):858:862 -> a
-    118:118:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
-    118:118:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
-    118:118:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):863 -> a
-    119:123:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):864:868 -> a
-    124:128:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):866:870 -> a
-    129:129:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):832:832 -> a
-    129:129:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):870 -> a
-    130:130:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):442:442 -> a
-    130:130:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):832 -> a
-    130:130:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):870 -> a
-    131:131:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):871:871 -> a
-    132:132:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):879:879 -> a
-    132:132:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):838 -> a
-    133:133:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> a
-    133:133:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):879 -> a
-    133:133:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):838 -> a
+    30:30:com.android.tools.r8.graph.DexClass access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):190:190 -> a
+    31:36:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):682:687 -> a
+    31:36:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):674 -> a
+    31:36:com.android.tools.r8.graph.DexClass access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):190 -> a
+    37:37:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):190:190 -> a
+    38:38:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2362:2362 -> a
+    38:38:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2366 -> a
+    38:38:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):190 -> a
+    39:39:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):190:190 -> a
+    40:40:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):190:190 -> a
+    41:41:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):490:490 -> a
+    42:42:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):538:538 -> a
+    42:42:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):490 -> a
+    43:43:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):528:528 -> a
+    44:44:com.android.tools.r8.shaking.Enqueuer registerFieldAccessAnalysis(com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):543:543 -> a
+    45:45:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):548:548 -> a
+    46:46:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):558:558 -> a
+    47:47:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):568:568 -> a
+    48:48:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):582:582 -> a
+    49:49:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):589:589 -> a
+    49:49:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):584 -> a
+    50:50:boolean addLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):593:593 -> a
+    51:54:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):626:629 -> a
+    55:60:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):682:687 -> a
+    55:60:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):674 -> a
+    55:60:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):633 -> a
+    61:61:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):637:637 -> a
+    62:65:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):645:648 -> a
+    66:66:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):666:666 -> a
+    67:72:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):682:687 -> a
+    67:72:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):674 -> a
+    67:72:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):666 -> a
+    73:73:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):714:714 -> a
+    74:74:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    74:74:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):714 -> a
+    75:77:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):716:718 -> a
+    78:82:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):780:784 -> a
+    78:82:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):718 -> a
+    83:83:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):720:720 -> a
+    84:84:void com.android.tools.r8.graph.DexClass.forEachClassField(java.util.function.Consumer):144:144 -> a
+    84:84:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):720 -> a
+    85:85:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):727:727 -> a
+    86:86:void com.android.tools.r8.graph.DexClass.forEachClassMethod(java.util.function.Consumer):154:154 -> a
+    86:86:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):727 -> a
+    87:88:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):736:737 -> a
+    89:90:void lambda$processNewLiveNonProgramType$2(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):723:724 -> a
+    91:91:void lambda$processNewLiveNonProgramType$2(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):722:722 -> a
+    92:94:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):729:731 -> a
+    95:98:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):730:733 -> a
+    99:109:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):747:757 -> a
+    110:110:void lambda$enqueueAllIfNotShrinking$4(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):838:838 -> a
+    111:111:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):840:840 -> a
+    112:113:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):856:857 -> a
+    114:114:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    114:114:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):857 -> a
+    115:119:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):858:862 -> a
+    120:120:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
+    120:120:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
+    120:120:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):863 -> a
+    121:125:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):864:868 -> a
+    126:130:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):866:870 -> a
+    131:131:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):832:832 -> a
+    131:131:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):870 -> a
+    132:132:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):442:442 -> a
+    132:132:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):832 -> a
+    132:132:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):870 -> a
+    133:133:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):871:871 -> a
     134:134:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):879:879 -> a
-    134:134:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):838 -> a
-    135:135:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
-    135:135:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):880 -> a
-    135:135:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):838 -> a
-    136:138:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):880:882 -> a
-    136:138:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):838 -> a
-    139:139:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
-    139:139:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):885 -> a
-    139:139:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):838 -> a
-    140:140:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):885:885 -> a
-    140:140:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):838 -> a
-    141:141:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):884:884 -> a
-    141:141:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):838 -> a
-    142:142:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):882:882 -> a
-    142:142:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):838 -> a
-    143:143:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:892 -> a
-    143:143:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):840 -> a
-    144:144:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> a
-    144:144:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892 -> a
-    144:144:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):840 -> a
-    145:145:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:892 -> a
-    145:145:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):840 -> a
-    146:146:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
-    146:146:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):893 -> a
-    146:146:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):840 -> a
-    147:149:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):893:895 -> a
-    147:149:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):840 -> a
-    150:150:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
-    150:150:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):898 -> a
-    150:150:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):840 -> a
-    151:151:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):898:898 -> a
-    151:151:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):840 -> a
-    152:152:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):897:897 -> a
-    152:152:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):840 -> a
-    153:153:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895:895 -> a
-    153:153:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):840 -> a
-    154:157:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):934:937 -> a
-    158:158:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):943:943 -> a
-    158:158:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1462 -> a
-    159:178:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1466:1485 -> a
-    179:179:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1688,"2":1689,"3":1690}}
-    1688:1688:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1485:1485 -> a
-    1689:1689:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1485:1485 -> a
-    1690:1690:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1485:1485 -> a
-    1666:1677:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1487:1498 -> a
-    1678:1678:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1678:1678:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1498 -> a
-    1679:1681:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1501:1503 -> a
-    1682:1684:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1769:1771 -> a
-    1682:1684:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1503 -> a
-    1685:1685:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1506:1506 -> a
-    1686:1686:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
-    1686:1686:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1507 -> a
-    1687:1687:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1506:1506 -> a
-    1691:1691:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):951:951 -> a
-    1691:1691:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1520 -> a
-    1692:1711:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1524:1543 -> a
-    1712:1712:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3276,"2":3277,"3":3278}}
-    3276:3276:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1543:1543 -> a
-    3277:3277:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1543:1543 -> a
-    3278:3278:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1543:1543 -> a
-    3257:3266:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1545:1554 -> a
-    3267:3267:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    3267:3267:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1554 -> a
-    3268:3270:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1557:1559 -> a
-    3271:3273:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1769:1771 -> a
-    3271:3273:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1559 -> a
-    3274:3274:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
-    3274:3274:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1562 -> a
-    3275:3275:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1563:1563 -> a
-    3279:3280:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):959:960 -> a
-    3281:3312:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):966:997 -> a
-    3313:3313:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1003:1003 -> a
-    3314:3314:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    3314:3314:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1003 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3315:3315:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1003:1003 -> a
-    3316:3319:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):281:284 -> a
-    3316:3319:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1003 -> a
-    3320:3320:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):906:906 -> a
-    3320:3320:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):284 -> a
-    3320:3320:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1003 -> a
-    3321:3322:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1004:1005 -> a
-    3323:3323:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):769:769 -> a
-    3323:3323:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1005 -> a
-    3324:3328:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1007:1011 -> a
-    3329:3329:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> a
-    3329:3329:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1013 -> a
-    3330:3331:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1013:1014 -> a
-    3332:3332:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    3332:3332:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1014 -> a
-    3333:3333:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015:1015 -> a
-    3334:3334:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
-    3334:3334:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1016 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3335:3342:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017:1024 -> a
-    3343:3343:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2445:2445 -> a
-    3343:3343:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3344:3347:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2452:2455 -> a
-    3344:3347:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3344:3347:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3348:3348:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3414,"2":3415,"3":3416}}
-    3414:3414:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2455:2455 -> a
-    3414:3414:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3414:3414:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3415:3415:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2455:2455 -> a
-    3415:3415:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3415:3415:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3416:3416:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2455:2455 -> a
-    3416:3416:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3416:3416:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3349:3349:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3418,"2":3419,"3":3420,"4":3421}}
-    3418:3418:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2457:2457 -> a
-    3418:3418:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3418:3418:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3419:3419:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2457:2457 -> a
-    3419:3419:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3419:3419:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3420:3420:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2457:2457 -> a
-    3420:3420:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3420:3420:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3421:3421:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2457:2457 -> a
-    3421:3421:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3421:3421:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3350:3355:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2458:2463 -> a
-    3350:3355:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3350:3355:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3356:3356:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3427,"2":3428,"3":3429}}
-    3427:3427:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2463:2463 -> a
-    3427:3427:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
+    135:135:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> a
+    135:135:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):879 -> a
+    136:137:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):879:880 -> a
+    138:138:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
+    138:138:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):880 -> a
+    139:144:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):880:885 -> a
+    145:145:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
+    145:145:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):885 -> a
+    146:146:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):885:885 -> a
+    147:147:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):884:884 -> a
+    148:148:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):882:882 -> a
+    149:149:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:892 -> a
+    150:150:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> a
+    150:150:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892 -> a
+    151:152:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:893 -> a
+    153:153:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
+    153:153:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):893 -> a
+    154:159:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):893:898 -> a
+    160:160:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
+    160:160:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):898 -> a
+    161:161:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):898:898 -> a
+    162:162:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):897:897 -> a
+    163:163:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895:895 -> a
+    164:167:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):934:937 -> a
+    168:168:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):943:943 -> a
+    168:168:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1462 -> a
+    169:188:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1466:1485 -> a
+    189:189:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1698,"2":1699,"3":1700}}
+    1698:1698:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1485:1485 -> a
+    1699:1699:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1485:1485 -> a
+    1700:1700:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1485:1485 -> a
+    1676:1687:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1487:1498 -> a
+    1688:1688:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1688:1688:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1498 -> a
+    1689:1691:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1501:1503 -> a
+    1692:1694:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1769:1771 -> a
+    1692:1694:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1503 -> a
+    1695:1695:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1506:1506 -> a
+    1696:1696:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
+    1696:1696:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1507 -> a
+    1697:1697:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1506:1506 -> a
+    1701:1701:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):951:951 -> a
+    1701:1701:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1520 -> a
+    1702:1721:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1524:1543 -> a
+    1722:1722:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3286,"2":3287,"3":3288}}
+    3286:3286:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1543:1543 -> a
+    3287:3287:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1543:1543 -> a
+    3288:3288:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1543:1543 -> a
+    3267:3276:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1545:1554 -> a
+    3277:3277:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    3277:3277:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1554 -> a
+    3278:3280:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1557:1559 -> a
+    3281:3283:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1769:1771 -> a
+    3281:3283:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1559 -> a
+    3284:3284:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
+    3284:3284:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1562 -> a
+    3285:3285:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1563:1563 -> a
+    3289:3290:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):959:960 -> a
+    3291:3322:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):966:997 -> a
+    3323:3323:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1003:1003 -> a
+    3324:3324:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    3324:3324:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1003 -> a
+    3325:3325:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1003:1003 -> a
+    3326:3329:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):281:284 -> a
+    3326:3329:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1003 -> a
+    3330:3330:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):906:906 -> a
+    3330:3330:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):284 -> a
+    3330:3330:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1003 -> a
+    3331:3332:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1004:1005 -> a
+    3333:3333:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):768:768 -> a
+    3333:3333:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1005 -> a
+    3334:3338:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1007:1011 -> a
+    3339:3339:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> a
+    3339:3339:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1013 -> a
+    3340:3341:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1013:1014 -> a
+    3342:3342:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
+    3342:3342:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1014 -> a
+    3343:3344:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015:1016 -> a
+    3345:3345:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
+    3345:3345:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1016 -> a
+    3346:3353:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017:1024 -> a
+    3354:3354:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2476:2476 -> a
+    3354:3354:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3355:3358:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2483:2486 -> a
+    3355:3358:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3355:3358:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3359:3359:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3425,"2":3426,"3":3427}}
+    3425:3425:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2486:2486 -> a
+    3425:3425:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3425:3425:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3426:3426:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2486:2486 -> a
+    3426:3426:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3426:3426:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3427:3427:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2486:2486 -> a
+    3427:3427:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
     3427:3427:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3428:3428:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2463:2463 -> a
-    3428:3428:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3428:3428:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3429:3429:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2463:2463 -> a
-    3429:3429:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
+    3360:3360:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3429,"2":3430,"3":3431,"4":3432}}
+    3429:3429:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2488:2488 -> a
+    3429:3429:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
     3429:3429:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3357:3357:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3433,"2":3434,"3":3435,"4":3436}}
-    3433:3433:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2467:2467 -> a
-    3433:3433:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3433:3433:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3434:3434:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2467:2467 -> a
-    3434:3434:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3434:3434:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3435:3435:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2467:2467 -> a
-    3435:3435:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3435:3435:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3436:3436:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2467:2467 -> a
-    3436:3436:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3436:3436:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3358:3359:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2469:2470 -> a
-    3358:3359:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2446 -> a
-    3358:3359:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3360:3360:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2447:2447 -> a
-    3360:3360:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3361:3361:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):17:17 -> a
-    3361:3361:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2477 -> a
-    3361:3361:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1027 -> a
-    3362:3362:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2477:2477 -> a
-    3362:3362:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1027 -> a
-    3363:3363:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2476:2476 -> a
-    3363:3363:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1027 -> a
-    3364:3395:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1028:1059 -> a
-    3396:3396:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    3396:3396:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1305 -> a
-    3396:3396:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1047 -> a
-    3397:3397:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1305:1305 -> a
-    3397:3397:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1047 -> a
-    3398:3398:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    3398:3398:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1284 -> a
-    3398:3398:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1053 -> a
-    3399:3399:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1284:1284 -> a
-    3399:3399:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1053 -> a
-    3400:3400:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056:1056 -> a
-    3401:3401:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1423:1423 -> a
-    3401:3401:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
-    3402:3402:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    3402:3402:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1424 -> a
-    3402:3402:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
-    3403:3403:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1432:1432 -> a
-    3403:3403:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1423 -> a
-    3403:3403:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
-    3404:3404:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    3404:3404:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1434 -> a
-    3404:3404:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1423 -> a
-    3404:3404:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
-    3405:3408:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1434:1437 -> a
-    3405:3408:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1423 -> a
-    3405:3408:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
-    3409:3409:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1435:1435 -> a
-    3409:3409:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1423 -> a
-    3409:3409:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
-    3410:3410:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    3410:3410:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1381 -> a
-    3410:3410:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1050 -> a
-    3411:3411:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1381:1381 -> a
-    3411:3411:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1050 -> a
-    3412:3412:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    3412:3412:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1326 -> a
-    3412:3412:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1044 -> a
-    3413:3413:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1326:1326 -> a
-    3413:3413:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1044 -> a
-    3437:3437:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$7(com.android.tools.r8.graph.DexCallSite):1028:1028 -> a
-    3438:3438:void lambda$traceCallSite$8(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1029:1029 -> a
-    3439:3439:void lambda$traceCheckCast$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1064:1064 -> a
-    3440:3444:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1088:1092 -> a
-    3440:3444:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1078 -> a
-    3445:3445:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1079:1079 -> a
-    3446:3458:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1108:1120 -> a
-    3459:3459:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1584:1584 -> a
-    3459:3459:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1121 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3460:3467:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1121:1128 -> a
-    3468:3468:boolean lambda$isConstClassMaybeUsedAsLock$11(com.android.tools.r8.code.CfOrDexInstruction):1113:1113 -> a
-    3469:3469:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    3469:3469:boolean lambda$isConstClassMaybeUsedAsLock$11(com.android.tools.r8.code.CfOrDexInstruction):1113 -> a
-    3470:3470:boolean lambda$isConstClassMaybeUsedAsLock$11(com.android.tools.r8.code.CfOrDexInstruction):1114:1114 -> a
-    3471:3471:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    3471:3471:boolean lambda$isConstClassMaybeUsedAsLock$11(com.android.tools.r8.code.CfOrDexInstruction):1114 -> a
-    3472:3472:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$12(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1145:1145 -> a
-    3473:3473:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1242:1242 -> a
-    3473:3473:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1135 -> a
-    3474:3482:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1136:1144 -> a
-    3483:3483:void lambda$traceInvokeDirect$15(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1260:1260 -> a
-    3484:3486:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1272:1274 -> a
-    3487:3487:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1276:1276 -> a
-    3488:3488:boolean lambda$registerDeferredActionForDeadProtoBuilder$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1277:1277 -> a
-    3489:3494:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1289:1294 -> a
-    3495:3495:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    3495:3495:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1294 -> a
-    3496:3527:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2224:2255 -> a
-    3496:3527:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1296 -> a
-    3528:3528:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1297:1297 -> a
-    3529:3529:void lambda$traceInvokeDirect$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1297:1297 -> a
-    3530:3530:void lambda$traceNewInstance$23(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1409:1409 -> a
-    3531:3531:void lambda$traceInstanceFieldRead$24(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1469:1469 -> a
-    3532:3532:void lambda$traceStaticFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1592:1592 -> a
-    3533:3533:java.lang.Boolean lambda$traceStaticFieldRead$28(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1621:1621 -> a
-    3534:3546:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1753:1765 -> a
-    3547:3551:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1790:1794 -> a
-    3552:3552:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isFinalMainDexTracing():221:221 -> a
-    3552:3552:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1794 -> a
-    3553:3556:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1794:1794 -> a
-    3557:3557:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5481,"2":5482,"3":5483}}
-    5481:5481:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1794:1794 -> a
-    5482:5482:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1794:1794 -> a
-    5483:5483:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1794:1794 -> a
-    5354:5356:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1797:1799 -> a
-    5357:5357:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):28:28 -> a
-    5357:5357:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1799 -> a
-    5358:5388:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1799:1829 -> a
-    5389:5392:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):643:646 -> a
-    5389:5392:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1831 -> a
-    5393:5399:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1833:1839 -> a
-    5400:5400:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    5400:5400:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1839 -> a
-    5401:5401:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1842:1842 -> a
-    5402:5402:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
-    5402:5402:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1842 -> a
-    5403:5412:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1844:1853 -> a
-    5413:5416:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):789:792 -> a
-    5413:5416:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1857 -> a
-    5417:5417:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5484,"2":5485,"3":5486}}
-    5484:5484:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):792:792 -> a
-    5484:5484:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1857 -> a
-    5485:5485:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):792:792 -> a
-    5485:5485:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1857 -> a
-    5486:5486:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):792:792 -> a
-    5486:5486:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1857 -> a
-    5418:5420:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):795:797 -> a
-    5418:5420:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1857 -> a
-    5421:5433:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):792:804 -> a
-    5421:5433:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1857 -> a
-    5434:5434:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5498,"2":5499,"3":5500}}
-    5498:5498:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):804:804 -> a
-    5498:5498:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1857 -> a
-    5499:5499:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):804:804 -> a
-    5499:5499:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1857 -> a
-    5500:5500:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):804:804 -> a
-    5500:5500:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1857 -> a
-    5435:5437:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):807:809 -> a
-    5435:5437:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1857 -> a
-    5438:5438:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):804:804 -> a
-    5438:5438:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1857 -> a
-    5439:5442:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2732:2735 -> a
-    5439:5442:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1861 -> a
-    5443:5443:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> a
-    5443:5443:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2736 -> a
-    5443:5443:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1861 -> a
-    5444:5444:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2740:2740 -> a
-    5444:5444:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1861 -> a
-    5445:5447:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1878:1880 -> a
-    5448:5448:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828:828 -> a
-    5448:5448:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1880 -> a
-    5449:5449:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):446:446 -> a
-    5449:5449:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828 -> a
-    5449:5449:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1880 -> a
-    5450:5450:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):903:903 -> a
-    5450:5450:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1881 -> a
-    5451:5451:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828:828 -> a
-    5451:5451:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):903 -> a
-    5451:5451:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1881 -> a
-    5452:5452:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):446:446 -> a
-    5452:5452:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828 -> a
-    5452:5452:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):903 -> a
-    5452:5452:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1881 -> a
-    5453:5456:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):903:906 -> a
-    5453:5456:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1881 -> a
-    5457:5457:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828:828 -> a
-    5457:5457:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):906 -> a
-    5457:5457:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1881 -> a
-    5458:5458:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):446:446 -> a
-    5458:5458:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828 -> a
-    5458:5458:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):906 -> a
-    5458:5458:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1881 -> a
-    5459:5459:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):907:907 -> a
-    5459:5459:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1881 -> a
-    5460:5460:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
-    5460:5460:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
-    5460:5460:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):913 -> a
-    5460:5460:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1881 -> a
-    5461:5461:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):914:914 -> a
-    5461:5461:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1881 -> a
-    5462:5465:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1885:1888 -> a
-    5466:5466:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    5466:5466:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1891 -> a
-    5467:5473:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1892:1898 -> a
-    5474:5474:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1637:1637 -> a
-    5474:5474:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1898 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5475:5479:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):920:924 -> a
-    5475:5479:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1897 -> a
-    5480:5480:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1900:1900 -> a
-    5501:5501:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$markTypeAsLive$33(com.android.tools.r8.graph.ProgramDefinition):1894:1894 -> a
-    5502:5502:void lambda$markTypeAsLive$34(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1900:1900 -> a
-    5503:5506:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1908:1911 -> a
-    5507:5509:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1910:1912 -> a
-    5510:5510:boolean lambda$processDeferredAnnotations$35(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1911:1911 -> a
-    5511:5511:void lambda$processDeferredAnnotations$37(java.util.function.Function,com.android.tools.r8.graph.DexAnnotation,java.util.List):1914:1914 -> a
-    5512:5512:void lambda$processDeferredAnnotations$36(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1917:1917 -> a
-    5513:5513:void lambda$processDeferredAnnotations$36(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1916:1916 -> a
-    5514:5517:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1922:1925 -> a
-    5518:5520:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1924:1926 -> a
-    5521:5521:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):126:126 -> a
-    5521:5521:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1926 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5522:5522:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1931:1931 -> a
-    5523:5525:boolean lambda$ensureMethodsContinueToWidenAccess$39(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1933:1935 -> a
-    5526:5531:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):509:514 -> a
-    5526:5531:boolean lambda$ensureMethodsContinueToWidenAccess$39(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1935 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5532:5532:void lambda$ensureMethodsContinueToWidenAccess$40(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1936:1936 -> a
-    5533:5567:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1941:1975 -> a
-    5568:5568:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
-    5568:5568:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1977 -> a
-    5569:5569:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1978:1978 -> a
-    5570:5570:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> a
-    5570:5570:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1981 -> a
-    5571:5571:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1979:1979 -> a
-    5572:5572:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> a
-    5572:5572:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1949 -> a
-    5573:5576:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2016:2019 -> a
-    5577:5582:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2049:2054 -> a
-    5577:5582:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2020 -> a
-    5583:5583:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2024:2024 -> a
-    5584:5584:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():48:48 -> a
-    5584:5584:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2024 -> a
-    5585:5602:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2024:2041 -> a
-    5603:5603:java.util.List lambda$processAnnotation$43(com.android.tools.r8.graph.DexAnnotation):2028:2028 -> a
-    5604:5607:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2060:2063 -> a
-    5608:5609:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):651:652 -> a
-    5608:5609:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2062 -> a
-    5610:5611:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2065:2066 -> a
-    5612:5613:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):651:652 -> a
-    5612:5613:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2067 -> a
-    5614:5645:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2224:2255 -> a
-    5614:5645:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2219 -> a
-    5646:5659:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2260:2273 -> a
-    5660:5660:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
-    5660:5660:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2273 -> a
-    5661:5671:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2274:2284 -> a
-    5672:5672:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.Definition):27:27 -> a
-    5672:5672:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2284 -> a
-    5673:5674:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2289:2290 -> a
-    5675:5675:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7976,"2":7977,"3":7978}}
-    7976:7976:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2290:2290 -> a
-    7977:7977:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2290:2290 -> a
-    7978:7978:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2290:2290 -> a
-    7965:7975:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2290:2300 -> a
-    7979:7981:void lambda$ensureFromLibraryOrThrow$44(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2278:2280 -> a
-    7982:7984:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2312:2314 -> a
-    7985:7985:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2306:2306 -> a
-    7985:7985:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2315 -> a
-    7986:7986:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
-    7986:7986:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2306 -> a
-    7986:7986:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2315 -> a
-    7987:7987:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2307:2307 -> a
-    7987:7987:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2315 -> a
-    7988:7988:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2316:2316 -> a
-    7989:7989:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
-    7989:7989:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2316 -> a
-    7990:7990:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2322:2322 -> a
-    7991:7991:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2318:2318 -> a
-    7992:7992:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2306:2306 -> a
-    7992:7992:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2319 -> a
-    7993:7993:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
-    7993:7993:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2306 -> a
-    7993:7993:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2319 -> a
-    7994:7994:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2307:2307 -> a
-    7994:7994:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2319 -> a
-    7995:7995:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2320:2320 -> a
-    7996:7996:void lambda$keepClassAndAllMembers$47(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2324:2324 -> a
-    7997:7997:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2306:2306 -> a
-    7997:7997:void lambda$keepClassAndAllMembers$47(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2325 -> a
-    7998:7998:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
-    7998:7998:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2306 -> a
-    7998:7998:void lambda$keepClassAndAllMembers$47(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2325 -> a
-    7999:7999:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2307:2307 -> a
-    7999:7999:void lambda$keepClassAndAllMembers$47(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2325 -> a
-    8000:8000:void lambda$keepClassAndAllMembers$47(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2326:2326 -> a
-    8001:8001:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2331:2331 -> a
-    8001:8001:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2335 -> a
-    8001:8001:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):190 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8002:8002:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2331:2331 -> a
-    8002:8002:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2335 -> a
-    8003:8003:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2331:2331 -> a
-    8003:8003:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2339 -> a
-    8003:8003:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2344 -> a
-    8004:8004:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2384:2384 -> a
-    8005:8005:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    8005:8005:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2384 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8006:8012:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2384:2390 -> a
-    8013:8014:boolean markInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2419:2420 -> a
-    8013:8014:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2393 -> a
-    8015:8016:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2397:2398 -> a
-    8017:8017:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    8017:8017:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2398 -> a
-    8018:8020:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2401:2403 -> a
-    8021:8021:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    8021:8021:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2481 -> a
-    8021:8021:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2406 -> a
-    8022:8023:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2481:2482 -> a
-    8022:8023:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2406 -> a
-    8024:8024:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
-    8024:8024:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2484 -> a
-    8024:8024:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2406 -> a
-    8025:8025:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2484:2484 -> a
-    8025:8025:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2406 -> a
-    8026:8026:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2483:2483 -> a
-    8026:8026:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2406 -> a
-    8027:8030:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2668:2671 -> a
-    8027:8030:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2408 -> a
-    8031:8031:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
-    8031:8031:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2671 -> a
-    8031:8031:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2408 -> a
-    8032:8037:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2672:2677 -> a
-    8032:8037:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2408 -> a
-    8038:8038:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2681:2681 -> a
-    8038:8038:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2410 -> a
-    8039:8039:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    8039:8039:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2681 -> a
-    8039:8039:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2410 -> a
-    8040:8042:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2681:2683 -> a
-    8040:8042:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2410 -> a
-    8043:8043:void lambda$processNewlyInstantiatedClass$48(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2391:2391 -> a
-    8044:8044:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2425:2425 -> a
-    8045:8045:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    8045:8045:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2425 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8046:8050:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2425:2429 -> a
-    8051:8052:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2687:2688 -> a
-    8051:8052:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2430 -> a
-    8053:8061:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2496:2504 -> a
-    8062:8076:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2580:2594 -> a
-    8062:8076:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2506 -> a
-    8077:8077:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2591:2591 -> a
-    8077:8077:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2506 -> a
-    8078:8078:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    8078:8078:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2601 -> a
-    8078:8078:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2506 -> a
-    8079:8081:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2601:2603 -> a
-    8079:8081:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2506 -> a
-    8082:8086:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2602:2606 -> a
-    8082:8086:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2506 -> a
-    8087:8093:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2605:2611 -> a
-    8087:8093:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2506 -> a
-    8094:8094:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2608:2608 -> a
-    8094:8094:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2506 -> a
-    8095:8098:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2508:2511 -> a
-    8099:8099:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2522:2522 -> a
-    8100:8100:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
-    8100:8100:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2522 -> a
-    8101:8103:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2522:2522 -> a
-    8104:8104:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2517:2517 -> a
-    8104:8104:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2524 -> a
-    8105:8106:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2524:2525 -> a
-    8107:8121:void lambda$markProgramMethodOverridesAsLive$55(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):2527:2541 -> a
-    8122:8132:void lambda$markProgramMethodOverridesAsLive$54(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2543:2553 -> a
-    8133:8133:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
-    8133:8133:void lambda$markProgramMethodOverridesAsLive$54(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2553 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8134:8134:void lambda$markProgramMethodOverridesAsLive$54(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2561:2561 -> a
-    8135:8136:void lambda$markProgramMethodOverridesAsLive$49(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2548:2549 -> a
-    8137:8137:boolean lambda$markProgramMethodOverridesAsLive$50(com.android.tools.r8.graph.DexDefinition):2552:2552 -> a
-    8138:8138:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> a
-    8138:8138:boolean lambda$markProgramMethodOverridesAsLive$50(com.android.tools.r8.graph.DexDefinition):2552 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8139:8139:void lambda$markProgramMethodOverridesAsLive$52(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2555:2555 -> a
-    8140:8142:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$51(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2558:2558 -> a
-    8143:8147:void lambda$markProgramMethodOverridesAsLive$53(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2564:2568 -> a
-    8148:8148:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
-    8148:8148:void lambda$markProgramMethodOverridesAsLive$53(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2570 -> a
-    8149:8149:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> a
-    8149:8149:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
-    8149:8149:void lambda$markProgramMethodOverridesAsLive$53(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2570 -> a
-    8150:8150:void lambda$markProgramMethodOverridesAsLive$53(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2568:2568 -> a
-    8151:8151:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2620:2620 -> a
-    8152:8167:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4199:4214 -> a
-    8152:8167:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2624 -> a
-    8168:8176:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4250:4258 -> a
-    8168:8176:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4220 -> a
-    8168:8176:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2624 -> a
-    8177:8191:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4221:4235 -> a
-    8177:8191:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2624 -> a
-    8192:8200:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4250:4258 -> a
-    8192:8200:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4239 -> a
-    8192:8200:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2624 -> a
-    8201:8203:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4239:4241 -> a
-    8201:8203:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2624 -> a
-    8204:8204:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2627:2627 -> a
-    8205:8205:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    8205:8205:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2632 -> a
-    8206:8206:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2635:2635 -> a
-    8207:8207:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2634:2634 -> a
-    8208:8208:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$56(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2630:2630 -> a
-    8209:8220:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2641:2652 -> a
-    8221:8223:void lambda$markOverridesAsLibraryMethodOverrides$57(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2654:2656 -> a
-    8224:8230:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2752:2758 -> a
-    8231:8231:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2801:2801 -> a
-    8231:8231:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2759 -> a
-    8232:8232:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> a
-    8232:8232:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2801 -> a
-    8232:8232:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2759 -> a
-    8233:8234:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2802:2803 -> a
-    8233:8234:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2759 -> a
-    8235:8238:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2760:2763 -> a
-    8239:8239:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2801:2801 -> a
-    8239:8239:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2764 -> a
-    8240:8240:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> a
-    8240:8240:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2801 -> a
-    8240:8240:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2764 -> a
-    8241:8242:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2802:2803 -> a
-    8241:8242:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2764 -> a
-    8243:8246:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2768:2771 -> a
-    8247:8247:void lambda$markFieldAsLive$58(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2771:2771 -> a
-    8248:8248:void lambda$markFieldAsReachable$60(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2797:2797 -> a
-    8249:8251:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2808:2810 -> a
-    8252:8252:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2849:2849 -> a
-    8253:8254:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2859:2860 -> a
-    8255:8255:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2903:2903 -> a
-    8256:8256:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2907:2907 -> a
-    8256:8256:void lambda$desugar$89(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3607 -> a
-    8257:8257:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2903:2903 -> a
-    8257:8257:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2907 -> a
-    8257:8257:void lambda$desugar$89(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3607 -> a
-    8258:8258:void lambda$desugar$89(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3610:3610 -> a
-    8259:8260:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2919:2920 -> a
-    8261:8261:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2925:2925 -> a
-    8261:8261:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2920 -> a
-    8262:8263:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2929:2930 -> a
-    8262:8263:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2921 -> a
-    8264:8274:boolean isReachable(com.android.tools.r8.graph.Definition):2934:2944 -> a
-    8275:8275:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2845:2845 -> a
-    8275:8275:boolean isReachable(com.android.tools.r8.graph.Definition):2945 -> a
-    8276:8276:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):2841:2841 -> a
-    8276:8276:boolean isReachable(com.android.tools.r8.graph.Definition):2945 -> a
-    8277:8278:boolean isReachable(com.android.tools.r8.graph.Definition):2947:2948 -> a
-    8279:8279:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2907:2907 -> a
-    8279:8279:boolean isReachable(com.android.tools.r8.graph.Definition):2949 -> a
-    8280:8280:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2903:2903 -> a
-    8280:8280:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2907 -> a
-    8280:8280:boolean isReachable(com.android.tools.r8.graph.Definition):2949 -> a
-    8281:8281:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2915:2915 -> a
-    8281:8281:boolean isReachable(com.android.tools.r8.graph.Definition):2949 -> a
-    8282:8282:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2911:2911 -> a
-    8282:8282:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2915 -> a
-    8282:8282:boolean isReachable(com.android.tools.r8.graph.Definition):2949 -> a
-    8283:8283:boolean isReachable(com.android.tools.r8.graph.Definition):2953:2953 -> a
-    8284:8285:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2929:2930 -> a
-    8284:8285:boolean isReachable(com.android.tools.r8.graph.Definition):2953 -> a
-    8286:8286:void forAllLiveClasses(java.util.function.Consumer):2957:2957 -> a
-    8287:8303:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2962:2978 -> a
-    8304:8307:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2087:2090 -> a
-    8304:8307:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2982 -> a
-    8308:8313:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2089:2094 -> a
-    8308:8313:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2982 -> a
-    8314:8318:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2093:2097 -> a
-    8314:8318:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2982 -> a
-    8319:8319:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2987:2987 -> a
-    8320:8320:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():134:134 -> a
-    8320:8320:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2995 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8321:8321:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2998:2998 -> a
-    8322:8322:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2517:2517 -> a
-    8322:8322:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2999 -> a
-    8323:8331:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2999:3007 -> a
-    8332:8332:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    8332:8332:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3007 -> a
-    8333:8348:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3012:3027 -> a
-    8349:8349:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
-    8349:8349:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3034 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8350:8350:void lambda$markVirtualMethodAsReachable$63(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3031:3031 -> a
-    8351:8351:void lambda$markVirtualMethodAsReachable$66(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):3036:3036 -> a
-    8352:8354:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$65(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3039:3039 -> a
-    8355:8358:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):3045:3048 -> a
-    8359:8359:void lambda$markVirtualDispatchTargetAsLive$69(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3048:3048 -> a
-    8360:8362:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):3053:3055 -> a
-    8360:8362:void lambda$markVirtualDispatchTargetAsLive$67(java.util.function.Function,com.android.tools.r8.graph.DexClassAndMethod):3046 -> a
-    8363:8366:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3061:3064 -> a
-    8363:8366:void lambda$markVirtualDispatchTargetAsLive$68(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3047 -> a
-    8367:8367:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3063:3063 -> a
-    8367:8367:void lambda$markVirtualDispatchTargetAsLive$68(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3047 -> a
-    8368:8369:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3073:3074 -> a
-    8370:8373:void lambda$markFailedMethodResolutionTargets$70(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3076:3079 -> a
-    8374:8374:void lambda$markSuperMethodAsReachable$72(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3128:3128 -> a
-    8375:8375:void lambda$traceMainDex$74(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3169:3169 -> a
-    8376:8379:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3181:3184 -> a
-    8380:8380:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():201:201 -> a
-    8380:8380:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3184 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8381:8384:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3184:3187 -> a
-    8385:8385:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):538:538 -> a
-    8385:8385:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3187 -> a
-    8386:8388:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3191:3193 -> a
-    8389:8389:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):538:538 -> a
-    8389:8389:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3193 -> a
-    8390:8390:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3195:3195 -> a
-    8391:8391:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):538:538 -> a
-    8391:8391:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3195 -> a
-    8392:8414:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3198:3220 -> a
-    8415:8418:void finalizeLibraryMethodOverrideInformation():3679:3682 -> a
-    8415:8418:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3221 -> a
-    8419:8420:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3222:3223 -> a
-    8421:8423:boolean verifyKeptGraph():3689:3691 -> a
-    8421:8423:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3223 -> a
-    8424:8429:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3224:3229 -> a
-    8430:8430:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():233:233 -> a
-    8430:8430:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3229 -> a
-    8431:8431:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3234:3234 -> a
-    8432:8432:void lambda$traceApplication$78(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3222:3222 -> a
-    8433:8434:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3239:3240 -> a
-    8435:8440:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3248:3253 -> a
-    8441:8441:void lambda$applyMinimumKeepInfo$79(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3252:3252 -> a
-    8442:8445:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3261:3264 -> a
-    8446:8446:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8446:8446:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3265 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8447:8447:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3266:3266 -> a
-    8448:8448:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
-    8448:8448:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3266 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8449:8449:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):554:554 -> a
-    8449:8449:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
-    8449:8449:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3266 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8450:8450:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3268:3268 -> a
-    8451:8456:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3299:3304 -> a
-    8457:8457:void lambda$applyMinimumKeepInfo$81(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3303:3303 -> a
-    8458:8461:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3310:3313 -> a
-    8462:8462:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8462:8462:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3314 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8463:8463:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3315:3315 -> a
-    8464:8464:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
-    8464:8464:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3315 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8465:8465:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):554:554 -> a
-    8465:8465:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
-    8465:8465:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3315 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8466:8466:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3317:3317 -> a
-    8467:8472:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):3344:3349 -> a
-    8473:8473:void lambda$applyMinimumKeepInfo$83(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3348:3348 -> a
-    8474:8477:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3357:3360 -> a
-    8478:8478:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8478:8478:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3361 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8479:8479:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3362:3362 -> a
-    8480:8480:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
-    8480:8480:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3362 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8481:8481:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):554:554 -> a
-    8481:8481:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
-    8481:8481:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3362 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8482:8488:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3358:3364 -> a
-    8489:8492:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):3400:3403 -> a
-    8493:8493:void lambda$applyMinimumKeepInfoDependentOn$85(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3406:3406 -> a
-    8494:8494:void lambda$applyMinimumKeepInfoDependentOn$86(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3408:3408 -> a
-    8495:8495:void lambda$applyMinimumKeepInfoDependentOn$87(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3410:3410 -> a
-    8496:8509:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3586:3599 -> a
-    8510:8510:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):72:72 -> a
-    8510:8510:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3600 -> a
-    8511:8531:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3615:3635 -> a
-    8532:8532:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2907:2907 -> a
-    8532:8532:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3637 -> a
-    8533:8533:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2903:2903 -> a
-    8533:8533:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2907 -> a
-    8533:8533:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3637 -> a
-    8534:8542:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3638:3646 -> a
-    8543:8543:void lambda$desugar$90(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):3618:3618 -> a
-    8544:8544:void lambda$desugar$91(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3625:3625 -> a
-    8545:8547:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3650:3652 -> a
-    8548:8550:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):3657:3659 -> a
-    8551:8569:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3699:3717 -> a
-    8570:8570:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():201:201 -> a
-    8570:8570:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3717 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8571:8585:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3717:3731 -> a
-    8586:8586:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    8586:8586:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3731 -> a
-    8587:8587:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3732:3732 -> a
-    8588:8588:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    8588:8588:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3733 -> a
-    8589:8624:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3734:3769 -> a
-    8625:8627:java.util.Set toDescriptorSet(java.util.Set):3914:3916 -> a
-    8625:8627:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3769 -> a
-    8628:8634:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3769:3775 -> a
-    8635:8637:java.util.Set toDescriptorSet(java.util.Set):3914:3916 -> a
-    8635:8637:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3775 -> a
-    8638:8654:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3775:3791 -> a
-    8655:8660:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3923:3928 -> a
-    8655:8660:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3798 -> a
-    8661:8670:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3799:3808 -> a
-    8671:8671:void lambda$createEnqueuerResult$92(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3702:3702 -> a
-    8672:8672:boolean lambda$createEnqueuerResult$93(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3708:3708 -> a
-    8673:8673:void amendKeepInfoWithCompanionMethods():3818:3818 -> a
-    8674:8675:void forEachCompanionMethod(java.util.function.BiConsumer):3812:3813 -> a
-    8674:8675:void amendKeepInfoWithCompanionMethods():3818 -> a
-    8676:8678:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3820:3822 -> a
-    8679:8679:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):109:109 -> a
-    8679:8679:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3822 -> a
-    8680:8680:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramMethod():55:55 -> a
-    8680:8680:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):111 -> a
-    8680:8680:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3822 -> a
-    8681:8682:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):113:114 -> a
-    8681:8682:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3822 -> a
-    8683:8686:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3822:3825 -> a
-    8687:8687:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    8687:8687:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3825 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8688:8691:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3826:3829 -> a
-    8692:8692:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3828:3828 -> a
-    8693:8703:java.util.Set amendWithCompanionMethods(java.util.Set):3834:3844 -> a
-    8704:8705:void lambda$amendWithCompanionMethods$96(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3840:3841 -> a
-    8706:8714:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3862:3870 -> a
-    8715:8715:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16468,"2":16469,"3":16470,"4":16471,"5":16472}}
-    16468:16468:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3870:3870 -> a
-    16469:16469:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3870:3870 -> a
-    16470:16470:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3870:3870 -> a
-    16471:16471:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3870:3870 -> a
-    16472:16472:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3870:3870 -> a
-    12585:12588:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3870:3873 -> a
-    12589:12589:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16475,"2":16476,"3":16477,"4":16478,"5":16479}}
-    16475:16475:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3873:3873 -> a
-    16476:16476:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3873:3873 -> a
-    16477:16477:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3873:3873 -> a
-    16478:16478:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3873:3873 -> a
-    16479:16479:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3873:3873 -> a
-    16462:16467:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3873:3878 -> a
-    16480:16480:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3934:3934 -> a
-    16481:16483:long getNumberOfLiveItems():4082:4084 -> a
-    16481:16483:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3937 -> a
-    16484:16484:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3938:3938 -> a
-    16485:16485:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
-    16485:16485:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3938 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16486:16486:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3939:3939 -> a
-    16487:16487:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():322:322 -> a
-    16487:16487:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3939 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16488:16488:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3940:3940 -> a
-    16489:16491:long getNumberOfLiveItems():4082:4084 -> a
-    16489:16491:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3944 -> a
-    16492:16500:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948:3956 -> a
-    16501:16501:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer):2042:2042 -> a
-    16501:16501:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3957 -> a
-    16502:16511:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3958:3967 -> a
-    16512:16514:long getNumberOfLiveItems():4082:4084 -> a
-    16512:16514:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3967 -> a
-    16515:16516:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3967:3968 -> a
-    16517:16517:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
-    16517:16517:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3968 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16518:16522:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3975:3979 -> a
-    16523:16523:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
-    16523:16523:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3979 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16524:16525:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3985:3986 -> a
-    16526:16526:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
-    16526:16526:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3986 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16527:16543:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3991:4007 -> a
-    16544:16544:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
-    16544:16544:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4007 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16545:16560:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4015:4030 -> a
-    16561:16561:java.util.Set lambda$trace$97(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3953:3953 -> a
-    16562:16562:void lambda$trace$98(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3985:3985 -> a
-    16563:16563:void lambda$postProcessingDesugaring$99(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4045:4045 -> a
-    16564:16564:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    16564:16564:void lambda$postProcessingDesugaring$99(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4049 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16565:16568:void lambda$postProcessingDesugaring$99(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4049:4052 -> a
-    16569:16569:void com.android.tools.r8.shaking.MissingClasses$Builder.addNewMissingClassWithDesugarDiagnostic(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.errors.DesugarDiagnostic):93:93 -> a
-    16569:16569:void lambda$postProcessingDesugaring$99(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4045 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16570:16576:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):4092:4098 -> a
-    16577:16579:void lambda$addConsequentRootSet$101(com.android.tools.r8.graph.DexType,java.util.Set):4100:4102 -> a
-    16580:16584:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):920:924 -> a
-    16580:16584:void lambda$addConsequentRootSet$101(com.android.tools.r8.graph.DexType,java.util.Set):4103 -> a
-    16585:16592:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4124:4131 -> a
-    16593:16596:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4130:4133 -> a
-    16597:16597:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4132:4132 -> a
-    16598:16605:void retainAnnotationForFinalTreeShaking(java.util.List):4152:4159 -> a
-    16606:16606:void retainAnnotationForFinalTreeShaking(java.util.List):4156:4156 -> a
-    16607:16610:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4191:4194 -> a
-    16611:16617:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4266:4272 -> a
-    16618:16618:com.android.tools.r8.shaking.Enqueuer$Mode getMode():518:518 -> a
-    16618:16618:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4326 -> a
-    16618:16618:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4275 -> a
-    16619:16619:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4326:4326 -> a
-    16619:16619:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4275 -> a
-    16620:16620:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3561:3561 -> a
-    16620:16620:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4327 -> a
-    16620:16620:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4275 -> a
-    16621:16623:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):3555:3557 -> a
-    16621:16623:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3562 -> a
-    16621:16623:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4327 -> a
-    16621:16623:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4275 -> a
-    16624:16639:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3564:3579 -> a
-    16624:16639:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4327 -> a
-    16624:16639:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4275 -> a
-    16640:16640:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4332:4332 -> a
-    16640:16640:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4275 -> a
-    16641:16645:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4277:4281 -> a
-    16646:16646:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    16646:16646:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4281 -> a
-    16647:16647:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    16647:16647:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4283 -> a
-    16648:16648:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4283:4283 -> a
-    16649:16649:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    16649:16649:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4284 -> a
-    16650:16655:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4284:4289 -> a
-    16656:16656:void lambda$markMethodAsLive$102(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4289:4289 -> a
-    16657:16657:void lambda$markMethodAsTargeted$103(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4309:4309 -> a
-    16658:16658:void lambda$traceMethodDefinitionExcludingCode$104(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):4319:4319 -> a
-    16659:16659:void lambda$traceCode$105(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4340:4340 -> a
-    16660:16660:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4366:4366 -> a
-    16661:16676:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):4390:4405 -> a
-    16661:16676:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4368 -> a
-    16677:16677:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4372:4372 -> a
-    16678:16678:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    16678:16678:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4373 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16679:16683:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4374:4378 -> a
-    16684:16684:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
-    16684:16684:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
-    16684:16684:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4379 -> a
-    16685:16689:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4380:4384 -> a
-    16690:16690:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4381:4381 -> a
-    16691:16697:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4423:4429 -> a
-    16698:16705:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4532:4539 -> a
-    16698:16705:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4430 -> a
-    16706:16718:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4538:4550 -> a
-    16706:16718:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4430 -> a
-    16719:16719:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16719:16719:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4552 -> a
-    16719:16719:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4430 -> a
-    16720:16720:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4356:4356 -> a
-    16720:16720:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4553 -> a
-    16720:16720:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4430 -> a
-    16721:16721:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
-    16721:16721:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
-    16721:16721:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4357 -> a
-    16721:16721:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4553 -> a
-    16721:16721:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4430 -> a
-    16722:16724:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4358:4360 -> a
-    16722:16724:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4553 -> a
-    16722:16724:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4430 -> a
-    16725:16725:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4359:4359 -> a
-    16725:16725:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4553 -> a
-    16725:16725:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4430 -> a
-    16726:16727:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4554:4555 -> a
-    16726:16727:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4430 -> a
-    16728:16728:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4433:4433 -> a
-    16729:16750:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4562:4583 -> a
-    16729:16750:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4434 -> a
-    16751:16764:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4582:4595 -> a
-    16751:16764:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4434 -> a
-    16765:16765:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    16765:16765:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4595 -> a
-    16765:16765:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4434 -> a
-    16766:16814:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4600:4648 -> a
-    16766:16814:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4434 -> a
-    16815:16815:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16815:16815:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4653 -> a
-    16815:16815:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4434 -> a
-    16816:16816:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4356:4356 -> a
-    16816:16816:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4654 -> a
-    16816:16816:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4434 -> a
-    16817:16817:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
-    16817:16817:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
-    16817:16817:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4357 -> a
-    16817:16817:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4654 -> a
-    16817:16817:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4434 -> a
-    16818:16820:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4358:4360 -> a
-    16818:16820:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4654 -> a
-    16818:16820:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4434 -> a
-    16821:16821:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4359:4359 -> a
-    16821:16821:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4654 -> a
-    16821:16821:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4434 -> a
-    16822:16823:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4655:4656 -> a
-    16822:16823:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4434 -> a
-    16824:16824:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4437:4437 -> a
-    16825:16828:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4733:4736 -> a
-    16825:16828:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4438 -> a
-    16829:16829:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
-    16829:16829:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4737 -> a
-    16829:16829:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4438 -> a
-    16830:16830:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> a
-    16830:16830:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
-    16830:16830:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4737 -> a
-    16830:16830:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4438 -> a
-    16831:16831:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4737:4737 -> a
-    16831:16831:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4438 -> a
-    16832:16836:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4441:4445 -> a
-    16837:16837:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2156:2156 -> a
-    16837:16837:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4445 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16838:16844:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4743:4749 -> a
-    16838:16844:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16845:16845:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    16845:16845:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4749 -> a
-    16845:16845:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16846:16850:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4750:4754 -> a
-    16846:16850:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16851:16851:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16977,"2":16978,"3":16979}}
-    16977:16977:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4754:4754 -> a
-    16977:16977:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16978:16978:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4754:4754 -> a
-    16978:16978:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16979:16979:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4754:4754 -> a
-    16979:16979:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16852:16852:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16982,"2":16983,"3":16984}}
-    16982:16982:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4757:4757 -> a
-    16982:16982:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16983:16983:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4757:4757 -> a
-    16983:16983:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16984:16984:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4757:4757 -> a
-    16984:16984:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16853:16855:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4759:4761 -> a
-    16853:16855:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16856:16856:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4754:4754 -> a
-    16856:16856:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16857:16857:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16857:16857:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4766 -> a
-    16857:16857:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16858:16868:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4777:4787 -> a
-    16858:16868:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4766 -> a
-    16858:16868:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16869:16869:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4356:4356 -> a
-    16869:16869:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4788 -> a
-    16869:16869:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4766 -> a
-    16869:16869:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16870:16870:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
-    16870:16870:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
-    16870:16870:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4357 -> a
-    16870:16870:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4788 -> a
-    16870:16870:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4766 -> a
-    16870:16870:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16871:16873:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4358:4360 -> a
-    16871:16873:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4788 -> a
-    16871:16873:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4766 -> a
-    16871:16873:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16874:16874:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4359:4359 -> a
-    16874:16874:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4788 -> a
-    16874:16874:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4766 -> a
-    16874:16874:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
+    3430:3430:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2488:2488 -> a
+    3430:3430:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3430:3430:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3431:3431:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2488:2488 -> a
+    3431:3431:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3431:3431:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3432:3432:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2488:2488 -> a
+    3432:3432:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3432:3432:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3361:3366:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2489:2494 -> a
+    3361:3366:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3361:3366:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3367:3367:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3438,"2":3439,"3":3440}}
+    3438:3438:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2494:2494 -> a
+    3438:3438:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3438:3438:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3439:3439:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2494:2494 -> a
+    3439:3439:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3439:3439:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3440:3440:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2494:2494 -> a
+    3440:3440:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3440:3440:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3368:3368:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3444,"2":3445,"3":3446,"4":3447}}
+    3444:3444:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2498:2498 -> a
+    3444:3444:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3444:3444:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3445:3445:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2498:2498 -> a
+    3445:3445:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3445:3445:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3446:3446:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2498:2498 -> a
+    3446:3446:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3446:3446:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3447:3447:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2498:2498 -> a
+    3447:3447:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3447:3447:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3369:3370:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2500:2501 -> a
+    3369:3370:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2477 -> a
+    3369:3370:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3371:3371:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2478:2478 -> a
+    3371:3371:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
+    3372:3372:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):17:17 -> a
+    3372:3372:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2508 -> a
+    3372:3372:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1027 -> a
+    3373:3373:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2508:2508 -> a
+    3373:3373:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1027 -> a
+    3374:3374:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2507:2507 -> a
+    3374:3374:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1027 -> a
+    3375:3406:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1028:1059 -> a
+    3407:3407:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    3407:3407:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1305 -> a
+    3407:3407:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1047 -> a
+    3408:3408:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1305:1305 -> a
+    3408:3408:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1047 -> a
+    3409:3409:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    3409:3409:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1284 -> a
+    3409:3409:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1053 -> a
+    3410:3410:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1284:1284 -> a
+    3410:3410:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1053 -> a
+    3411:3411:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056:1056 -> a
+    3412:3412:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1423:1423 -> a
+    3412:3412:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
+    3413:3413:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    3413:3413:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1424 -> a
+    3413:3413:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
+    3414:3414:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1432:1432 -> a
+    3414:3414:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1423 -> a
+    3414:3414:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
+    3415:3415:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    3415:3415:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1434 -> a
+    3415:3415:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1423 -> a
+    3415:3415:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
+    3416:3419:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1434:1437 -> a
+    3416:3419:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1423 -> a
+    3416:3419:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
+    3420:3420:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1435:1435 -> a
+    3420:3420:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1423 -> a
+    3420:3420:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1056 -> a
+    3421:3421:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    3421:3421:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1381 -> a
+    3421:3421:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1050 -> a
+    3422:3422:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1381:1381 -> a
+    3422:3422:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1050 -> a
+    3423:3423:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    3423:3423:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1326 -> a
+    3423:3423:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1044 -> a
+    3424:3424:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1326:1326 -> a
+    3424:3424:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1044 -> a
+    3448:3448:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$6(com.android.tools.r8.graph.DexCallSite):1028:1028 -> a
+    3449:3449:void lambda$traceCallSite$7(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1029:1029 -> a
+    3450:3450:void lambda$traceCheckCast$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1064:1064 -> a
+    3451:3455:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1088:1092 -> a
+    3451:3455:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1078 -> a
+    3456:3456:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1079:1079 -> a
+    3457:3470:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1108:1121 -> a
+    3471:3471:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1584:1584 -> a
+    3471:3471:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1121 -> a
+    3472:3479:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1121:1128 -> a
+    3480:3480:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1113:1113 -> a
+    3481:3481:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    3481:3481:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1113 -> a
+    3482:3482:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1114:1114 -> a
+    3483:3483:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    3483:3483:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1114 -> a
+    3484:3484:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1145:1145 -> a
+    3485:3485:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1224:1224 -> a
+    3486:3486:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
+    3486:3486:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1224 -> a
+    3487:3489:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1224:1226 -> a
+    3490:3490:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):87:87 -> a
+    3490:3490:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1228 -> a
+    3491:3491:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    3491:3491:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1229 -> a
+    3492:3496:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1230:1234 -> a
+    3497:3497:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1242:1242 -> a
+    3497:3497:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1135 -> a
+    3498:3506:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1136:1144 -> a
+    3507:3507:void lambda$traceInvokeDirect$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1260:1260 -> a
+    3508:3510:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1272:1274 -> a
+    3511:3511:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1276:1276 -> a
+    3512:3512:boolean lambda$registerDeferredActionForDeadProtoBuilder$15(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1277:1277 -> a
+    3513:3518:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1289:1294 -> a
+    3519:3519:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    3519:3519:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1294 -> a
+    3520:3551:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2236:2267 -> a
+    3520:3551:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1296 -> a
+    3552:3552:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1297:1297 -> a
+    3553:3553:void lambda$traceInvokeDirect$17(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1297:1297 -> a
+    3554:3554:void lambda$traceNewInstance$22(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1409:1409 -> a
+    3555:3555:void lambda$traceInstanceFieldRead$23(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1469:1469 -> a
+    3556:3556:void lambda$traceStaticFieldRead$26(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1592:1592 -> a
+    3557:3557:java.lang.Boolean lambda$traceStaticFieldRead$27(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1621:1621 -> a
+    3558:3570:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1753:1765 -> a
+    3571:3575:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1790:1794 -> a
+    3576:3576:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isFinalMainDexTracing():221:221 -> a
+    3576:3576:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1794 -> a
+    3577:3580:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1794:1794 -> a
+    3581:3581:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5521,"2":5522,"3":5523}}
+    5521:5521:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1794:1794 -> a
+    5522:5522:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1794:1794 -> a
+    5523:5523:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1794:1794 -> a
+    5378:5380:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1797:1799 -> a
+    5381:5381:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):28:28 -> a
+    5381:5381:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1799 -> a
+    5382:5392:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1799:1809 -> a
+    5393:5399:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1808:1814 -> a
+    5400:5436:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1813:1849 -> a
+    5437:5437:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    5437:5437:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1849 -> a
+    5438:5438:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1852:1852 -> a
+    5439:5439:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
+    5439:5439:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1852 -> a
+    5440:5449:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1854:1863 -> a
+    5450:5453:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):789:792 -> a
+    5450:5453:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1867 -> a
+    5454:5454:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5524,"2":5525,"3":5526}}
+    5524:5524:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):792:792 -> a
+    5524:5524:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1867 -> a
+    5525:5525:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):792:792 -> a
+    5525:5525:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1867 -> a
+    5526:5526:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):792:792 -> a
+    5526:5526:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1867 -> a
+    5455:5457:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):795:797 -> a
+    5455:5457:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1867 -> a
+    5458:5470:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):792:804 -> a
+    5458:5470:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1867 -> a
+    5471:5471:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5538,"2":5539,"3":5540}}
+    5538:5538:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):804:804 -> a
+    5538:5538:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1867 -> a
+    5539:5539:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):804:804 -> a
+    5539:5539:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1867 -> a
+    5540:5540:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):804:804 -> a
+    5540:5540:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1867 -> a
+    5472:5474:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):807:809 -> a
+    5472:5474:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1867 -> a
+    5475:5475:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):804:804 -> a
+    5475:5475:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1867 -> a
+    5476:5479:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2763:2766 -> a
+    5476:5479:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1871 -> a
+    5480:5480:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> a
+    5480:5480:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2767 -> a
+    5480:5480:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1871 -> a
+    5481:5481:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2771:2771 -> a
+    5481:5481:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1871 -> a
+    5482:5484:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1888:1890 -> a
+    5485:5485:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828:828 -> a
+    5485:5485:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1890 -> a
+    5486:5486:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):446:446 -> a
+    5486:5486:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828 -> a
+    5486:5486:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1890 -> a
+    5487:5487:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):903:903 -> a
+    5487:5487:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1891 -> a
+    5488:5488:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828:828 -> a
+    5488:5488:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):903 -> a
+    5488:5488:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1891 -> a
+    5489:5489:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):446:446 -> a
+    5489:5489:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828 -> a
+    5489:5489:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):903 -> a
+    5489:5489:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1891 -> a
+    5490:5493:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):903:906 -> a
+    5490:5493:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1891 -> a
+    5494:5494:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828:828 -> a
+    5494:5494:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):906 -> a
+    5494:5494:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1891 -> a
+    5495:5495:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):446:446 -> a
+    5495:5495:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828 -> a
+    5495:5495:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):906 -> a
+    5495:5495:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1891 -> a
+    5496:5496:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):907:907 -> a
+    5496:5496:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1891 -> a
+    5497:5497:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
+    5497:5497:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
+    5497:5497:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):913 -> a
+    5497:5497:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1891 -> a
+    5498:5498:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):914:914 -> a
+    5498:5498:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1891 -> a
+    5499:5500:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1895:1896 -> a
+    5501:5501:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2008:2008 -> a
+    5501:5501:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1898 -> a
+    5502:5502:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
+    5502:5502:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2009 -> a
+    5502:5502:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1898 -> a
+    5503:5503:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014:2014 -> a
+    5503:5503:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2006 -> a
+    5503:5503:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1898 -> a
+    5504:5505:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2019:2020 -> a
+    5504:5505:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014 -> a
+    5504:5505:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2006 -> a
+    5504:5505:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1898 -> a
+    5506:5506:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    5506:5506:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1901 -> a
+    5507:5513:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1902:1908 -> a
+    5514:5514:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1662:1662 -> a
+    5514:5514:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1908 -> a
+    5515:5519:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):920:924 -> a
+    5515:5519:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1907 -> a
+    5520:5520:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1910:1910 -> a
+    5541:5541:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$markTypeAsLive$32(com.android.tools.r8.graph.ProgramDefinition):1904:1904 -> a
+    5542:5542:void lambda$markTypeAsLive$33(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1910:1910 -> a
+    5543:5546:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1918:1921 -> a
+    5547:5549:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1920:1922 -> a
+    5550:5550:boolean lambda$processDeferredAnnotations$34(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1921:1921 -> a
+    5551:5551:void lambda$processDeferredAnnotations$36(java.util.function.Function,com.android.tools.r8.graph.DexAnnotation,java.util.List):1924:1924 -> a
+    5552:5552:void lambda$processDeferredAnnotations$35(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1927:1927 -> a
+    5553:5553:void lambda$processDeferredAnnotations$35(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1926:1926 -> a
+    5554:5557:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1932:1935 -> a
+    5558:5560:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1934:1936 -> a
+    5561:5561:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):126:126 -> a
+    5561:5561:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1936 -> a
+    5562:5562:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1941:1941 -> a
+    5563:5565:boolean lambda$ensureMethodsContinueToWidenAccess$38(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1943:1945 -> a
+    5566:5571:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):509:514 -> a
+    5566:5571:boolean lambda$ensureMethodsContinueToWidenAccess$38(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1945 -> a
+    5572:5572:void lambda$ensureMethodsContinueToWidenAccess$39(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1946:1946 -> a
+    5573:5607:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1951:1985 -> a
+    5608:5608:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> a
+    5608:5608:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1987 -> a
+    5609:5609:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1988:1988 -> a
+    5610:5610:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> a
+    5610:5610:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1991 -> a
+    5611:5611:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1989:1989 -> a
+    5612:5612:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> a
+    5612:5612:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1959 -> a
+    5613:5616:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2026:2029 -> a
+    5617:5622:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2059:2064 -> a
+    5617:5622:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2030 -> a
+    5623:5623:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2034:2034 -> a
+    5624:5624:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():48:48 -> a
+    5624:5624:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2034 -> a
+    5625:5642:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2034:2051 -> a
+    5643:5643:java.util.List lambda$processAnnotation$42(com.android.tools.r8.graph.DexAnnotation):2038:2038 -> a
+    5644:5647:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2070:2073 -> a
+    5648:5649:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):653:654 -> a
+    5648:5649:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2072 -> a
+    5650:5651:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2075:2076 -> a
+    5652:5653:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):653:654 -> a
+    5652:5653:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2077 -> a
+    5654:5657:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2099:2102 -> a
+    5658:5663:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2101:2106 -> a
+    5664:5668:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2105:2109 -> a
+    5669:5700:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2236:2267 -> a
+    5669:5700:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2231 -> a
+    5701:5714:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2272:2285 -> a
+    5715:5715:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
+    5715:5715:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2285 -> a
+    5716:5726:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2286:2296 -> a
+    5727:5727:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.Definition):27:27 -> a
+    5727:5727:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2296 -> a
+    5728:5729:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2301:2302 -> a
+    5730:5730:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8043,"2":8044,"3":8045}}
+    8043:8043:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2302:2302 -> a
+    8044:8044:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2302:2302 -> a
+    8045:8045:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2302:2302 -> a
+    8032:8042:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2302:2312 -> a
+    8046:8048:void lambda$ensureFromLibraryOrThrow$43(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2290:2292 -> a
+    8049:8051:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2324:2326 -> a
+    8052:8052:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2318:2318 -> a
+    8052:8052:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2327 -> a
+    8053:8053:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():613:613 -> a
+    8053:8053:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2318 -> a
+    8053:8053:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2327 -> a
+    8054:8054:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2319:2319 -> a
+    8054:8054:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2327 -> a
+    8055:8055:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2328:2328 -> a
+    8056:8056:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
+    8056:8056:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2328 -> a
+    8057:8057:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2334:2334 -> a
+    8058:8058:void lambda$keepClassAndAllMembers$45(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2330:2330 -> a
+    8059:8059:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2318:2318 -> a
+    8059:8059:void lambda$keepClassAndAllMembers$45(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2331 -> a
+    8060:8060:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():613:613 -> a
+    8060:8060:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2318 -> a
+    8060:8060:void lambda$keepClassAndAllMembers$45(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2331 -> a
+    8061:8061:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2319:2319 -> a
+    8061:8061:void lambda$keepClassAndAllMembers$45(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2331 -> a
+    8062:8062:void lambda$keepClassAndAllMembers$45(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2332:2332 -> a
+    8063:8063:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2336:2336 -> a
+    8064:8064:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2318:2318 -> a
+    8064:8064:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2337 -> a
+    8065:8065:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():613:613 -> a
+    8065:8065:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2318 -> a
+    8065:8065:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2337 -> a
+    8066:8066:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2319:2319 -> a
+    8066:8066:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2337 -> a
+    8067:8067:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2338:2338 -> a
+    8068:8070:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2343:2345 -> a
+    8071:8073:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1769:1771 -> a
+    8071:8073:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2345 -> a
+    8074:8074:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2348:2348 -> a
+    8075:8075:void lambda$recordNonProgramClass$47(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2357:2357 -> a
+    8076:8076:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2362:2362 -> a
+    8076:8076:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2366 -> a
+    8077:8077:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2362:2362 -> a
+    8077:8077:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2370 -> a
+    8077:8077:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2375 -> a
+    8078:8078:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2415:2415 -> a
+    8079:8079:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    8079:8079:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2415 -> a
+    8080:8086:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2415:2421 -> a
+    8087:8088:boolean markInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2450:2451 -> a
+    8087:8088:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2424 -> a
+    8089:8090:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2428:2429 -> a
+    8091:8091:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    8091:8091:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2429 -> a
+    8092:8094:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2432:2434 -> a
+    8095:8095:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    8095:8095:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2512 -> a
+    8095:8095:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2437 -> a
+    8096:8097:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2512:2513 -> a
+    8096:8097:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2437 -> a
+    8098:8098:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
+    8098:8098:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2515 -> a
+    8098:8098:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2437 -> a
+    8099:8099:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2515:2515 -> a
+    8099:8099:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2437 -> a
+    8100:8100:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2514:2514 -> a
+    8100:8100:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2437 -> a
+    8101:8104:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2699:2702 -> a
+    8101:8104:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2439 -> a
+    8105:8105:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
+    8105:8105:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2702 -> a
+    8105:8105:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2439 -> a
+    8106:8111:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2703:2708 -> a
+    8106:8111:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2439 -> a
+    8112:8112:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2712:2712 -> a
+    8112:8112:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2441 -> a
+    8113:8113:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    8113:8113:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2712 -> a
+    8113:8113:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2441 -> a
+    8114:8116:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2712:2714 -> a
+    8114:8116:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2441 -> a
+    8117:8117:void lambda$processNewlyInstantiatedClass$48(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2422:2422 -> a
+    8118:8118:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2456:2456 -> a
+    8119:8119:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    8119:8119:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2456 -> a
+    8120:8124:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2456:2460 -> a
+    8125:8126:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2718:2719 -> a
+    8125:8126:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2461 -> a
+    8127:8135:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2527:2535 -> a
+    8136:8150:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2611:2625 -> a
+    8136:8150:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2537 -> a
+    8151:8151:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2622:2622 -> a
+    8151:8151:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2537 -> a
+    8152:8152:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    8152:8152:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2632 -> a
+    8152:8152:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2537 -> a
+    8153:8155:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2632:2634 -> a
+    8153:8155:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2537 -> a
+    8156:8160:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2633:2637 -> a
+    8156:8160:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2537 -> a
+    8161:8167:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2636:2642 -> a
+    8161:8167:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2537 -> a
+    8168:8168:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2639:2639 -> a
+    8168:8168:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2537 -> a
+    8169:8172:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2539:2542 -> a
+    8173:8173:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2553:2553 -> a
+    8174:8174:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
+    8174:8174:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2553 -> a
+    8175:8177:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2553:2553 -> a
+    8178:8178:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2548:2548 -> a
+    8178:8178:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2555 -> a
+    8179:8180:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2555:2556 -> a
+    8181:8195:void lambda$markProgramMethodOverridesAsLive$55(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):2558:2572 -> a
+    8196:8206:void lambda$markProgramMethodOverridesAsLive$54(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2574:2584 -> a
+    8207:8207:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
+    8207:8207:void lambda$markProgramMethodOverridesAsLive$54(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2584 -> a
+    8208:8208:void lambda$markProgramMethodOverridesAsLive$54(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2592:2592 -> a
+    8209:8210:void lambda$markProgramMethodOverridesAsLive$49(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2579:2580 -> a
+    8211:8211:boolean lambda$markProgramMethodOverridesAsLive$50(com.android.tools.r8.graph.DexDefinition):2583:2583 -> a
+    8212:8212:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> a
+    8212:8212:boolean lambda$markProgramMethodOverridesAsLive$50(com.android.tools.r8.graph.DexDefinition):2583 -> a
+    8213:8213:void lambda$markProgramMethodOverridesAsLive$52(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2586:2586 -> a
+    8214:8216:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$51(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2589:2589 -> a
+    8217:8221:void lambda$markProgramMethodOverridesAsLive$53(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2595:2599 -> a
+    8222:8222:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
+    8222:8222:void lambda$markProgramMethodOverridesAsLive$53(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2601 -> a
+    8223:8223:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> a
+    8223:8223:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
+    8223:8223:void lambda$markProgramMethodOverridesAsLive$53(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2601 -> a
+    8224:8224:void lambda$markProgramMethodOverridesAsLive$53(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2599:2599 -> a
+    8225:8225:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2651:2651 -> a
+    8226:8241:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4230:4245 -> a
+    8226:8241:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2655 -> a
+    8242:8250:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4281:4289 -> a
+    8242:8250:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4251 -> a
+    8242:8250:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2655 -> a
+    8251:8265:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4252:4266 -> a
+    8251:8265:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2655 -> a
+    8266:8274:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4281:4289 -> a
+    8266:8274:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4270 -> a
+    8266:8274:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2655 -> a
+    8275:8277:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4270:4272 -> a
+    8275:8277:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2655 -> a
+    8278:8278:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2658:2658 -> a
+    8279:8279:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    8279:8279:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2663 -> a
+    8280:8280:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2666:2666 -> a
+    8281:8281:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2665:2665 -> a
+    8282:8282:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$56(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2661:2661 -> a
+    8283:8294:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2672:2683 -> a
+    8295:8297:void lambda$markOverridesAsLibraryMethodOverrides$57(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2685:2687 -> a
+    8298:8304:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2783:2789 -> a
+    8305:8305:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2832:2832 -> a
+    8305:8305:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2790 -> a
+    8306:8306:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> a
+    8306:8306:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2832 -> a
+    8306:8306:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2790 -> a
+    8307:8307:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2833:2833 -> a
+    8307:8307:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2790 -> a
+    8308:8308:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2008:2008 -> a
+    8308:8308:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> a
+    8308:8308:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2790 -> a
+    8309:8309:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
+    8309:8309:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2009 -> a
+    8309:8309:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> a
+    8309:8309:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2790 -> a
+    8310:8310:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014:2014 -> a
+    8310:8310:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2006 -> a
+    8310:8310:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> a
+    8310:8310:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2790 -> a
+    8311:8312:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2019:2020 -> a
+    8311:8312:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014 -> a
+    8311:8312:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2006 -> a
+    8311:8312:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> a
+    8311:8312:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2790 -> a
+    8313:8316:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2791:2794 -> a
+    8317:8317:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2832:2832 -> a
+    8317:8317:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2795 -> a
+    8318:8318:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> a
+    8318:8318:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2832 -> a
+    8318:8318:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2795 -> a
+    8319:8319:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2833:2833 -> a
+    8319:8319:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2795 -> a
+    8320:8320:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2008:2008 -> a
+    8320:8320:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> a
+    8320:8320:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2795 -> a
+    8321:8321:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
+    8321:8321:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2009 -> a
+    8321:8321:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> a
+    8321:8321:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2795 -> a
+    8322:8322:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014:2014 -> a
+    8322:8322:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2006 -> a
+    8322:8322:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> a
+    8322:8322:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2795 -> a
+    8323:8324:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2019:2020 -> a
+    8323:8324:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014 -> a
+    8323:8324:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2006 -> a
+    8323:8324:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> a
+    8323:8324:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2795 -> a
+    8325:8328:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2799:2802 -> a
+    8329:8329:void lambda$markFieldAsLive$58(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2802:2802 -> a
+    8330:8330:void lambda$markFieldAsReachable$60(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2828:2828 -> a
+    8331:8333:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2839:2841 -> a
+    8334:8334:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2880:2880 -> a
+    8335:8336:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2890:2891 -> a
+    8337:8337:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2934:2934 -> a
+    8338:8338:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2938:2938 -> a
+    8338:8338:void lambda$desugar$89(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3638 -> a
+    8339:8339:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2934:2934 -> a
+    8339:8339:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2938 -> a
+    8339:8339:void lambda$desugar$89(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3638 -> a
+    8340:8340:void lambda$desugar$89(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3641:3641 -> a
+    8341:8342:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2950:2951 -> a
+    8343:8343:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2956:2956 -> a
+    8343:8343:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2951 -> a
+    8344:8345:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2960:2961 -> a
+    8344:8345:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2952 -> a
+    8346:8356:boolean isReachable(com.android.tools.r8.graph.Definition):2965:2975 -> a
+    8357:8357:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2876:2876 -> a
+    8357:8357:boolean isReachable(com.android.tools.r8.graph.Definition):2976 -> a
+    8358:8358:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):2872:2872 -> a
+    8358:8358:boolean isReachable(com.android.tools.r8.graph.Definition):2976 -> a
+    8359:8360:boolean isReachable(com.android.tools.r8.graph.Definition):2978:2979 -> a
+    8361:8361:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2938:2938 -> a
+    8361:8361:boolean isReachable(com.android.tools.r8.graph.Definition):2980 -> a
+    8362:8362:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2934:2934 -> a
+    8362:8362:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2938 -> a
+    8362:8362:boolean isReachable(com.android.tools.r8.graph.Definition):2980 -> a
+    8363:8363:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2946:2946 -> a
+    8363:8363:boolean isReachable(com.android.tools.r8.graph.Definition):2980 -> a
+    8364:8364:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2942:2942 -> a
+    8364:8364:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2946 -> a
+    8364:8364:boolean isReachable(com.android.tools.r8.graph.Definition):2980 -> a
+    8365:8365:boolean isReachable(com.android.tools.r8.graph.Definition):2984:2984 -> a
+    8366:8367:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2960:2961 -> a
+    8366:8367:boolean isReachable(com.android.tools.r8.graph.Definition):2984 -> a
+    8368:8368:void forAllLiveClasses(java.util.function.Consumer):2988:2988 -> a
+    8369:8401:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2993:3025 -> a
+    8402:8402:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():134:134 -> a
+    8402:8402:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3025 -> a
+    8403:8403:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3028:3028 -> a
+    8404:8404:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2548:2548 -> a
+    8404:8404:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3030 -> a
+    8405:8413:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3030:3038 -> a
+    8414:8414:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    8414:8414:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3038 -> a
+    8415:8437:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3043:3065 -> a
+    8438:8438:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
+    8438:8438:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3065 -> a
+    8439:8439:void lambda$markVirtualMethodAsReachable$63(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3062:3062 -> a
+    8440:8440:void lambda$markVirtualMethodAsReachable$66(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):3067:3067 -> a
+    8441:8443:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$65(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3070:3070 -> a
+    8444:8447:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):3076:3079 -> a
+    8448:8448:void lambda$markVirtualDispatchTargetAsLive$69(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3079:3079 -> a
+    8449:8451:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):3084:3086 -> a
+    8449:8451:void lambda$markVirtualDispatchTargetAsLive$67(java.util.function.Function,com.android.tools.r8.graph.DexClassAndMethod):3077 -> a
+    8452:8455:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3092:3095 -> a
+    8452:8455:void lambda$markVirtualDispatchTargetAsLive$68(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3078 -> a
+    8456:8456:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3094:3094 -> a
+    8456:8456:void lambda$markVirtualDispatchTargetAsLive$68(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3078 -> a
+    8457:8458:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3104:3105 -> a
+    8459:8462:void lambda$markFailedMethodResolutionTargets$70(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3107:3110 -> a
+    8463:8463:void lambda$markSuperMethodAsReachable$72(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3159:3159 -> a
+    8464:8464:void lambda$traceMainDex$74(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3200:3200 -> a
+    8465:8468:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3212:3215 -> a
+    8469:8469:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():201:201 -> a
+    8469:8469:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3215 -> a
+    8470:8473:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3215:3218 -> a
+    8474:8474:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):538:538 -> a
+    8474:8474:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3218 -> a
+    8475:8477:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3222:3224 -> a
+    8478:8478:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):538:538 -> a
+    8478:8478:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3224 -> a
+    8479:8479:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3226:3226 -> a
+    8480:8480:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):538:538 -> a
+    8480:8480:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3226 -> a
+    8481:8503:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3229:3251 -> a
+    8504:8507:void finalizeLibraryMethodOverrideInformation():3710:3713 -> a
+    8504:8507:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3252 -> a
+    8508:8509:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3253:3254 -> a
+    8510:8512:boolean verifyKeptGraph():3720:3722 -> a
+    8510:8512:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3254 -> a
+    8513:8518:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3255:3260 -> a
+    8519:8519:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():233:233 -> a
+    8519:8519:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3260 -> a
+    8520:8520:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3265:3265 -> a
+    8521:8521:void lambda$traceApplication$78(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3253:3253 -> a
+    8522:8523:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3270:3271 -> a
+    8524:8529:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3279:3284 -> a
+    8530:8530:void lambda$applyMinimumKeepInfo$79(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3283:3283 -> a
+    8531:8535:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3292:3296 -> a
+    8536:8536:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    8536:8536:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3296 -> a
+    8537:8539:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3297:3299 -> a
+    8540:8545:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3330:3335 -> a
+    8546:8546:void lambda$applyMinimumKeepInfo$81(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3334:3334 -> a
+    8547:8551:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3341:3345 -> a
+    8552:8552:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    8552:8552:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3345 -> a
+    8553:8555:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3346:3348 -> a
+    8556:8561:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):3375:3380 -> a
+    8562:8562:void lambda$applyMinimumKeepInfo$83(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3379:3379 -> a
+    8563:8567:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3388:3392 -> a
+    8568:8568:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    8568:8568:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3392 -> a
+    8569:8569:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3393:3393 -> a
+    8570:8576:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3389:3395 -> a
+    8577:8580:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):3431:3434 -> a
+    8581:8581:void lambda$applyMinimumKeepInfoDependentOn$85(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3437:3437 -> a
+    8582:8582:void lambda$applyMinimumKeepInfoDependentOn$86(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3439:3439 -> a
+    8583:8583:void lambda$applyMinimumKeepInfoDependentOn$87(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3441:3441 -> a
+    8584:8597:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3617:3630 -> a
+    8598:8598:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):72:72 -> a
+    8598:8598:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3631 -> a
+    8599:8619:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3646:3666 -> a
+    8620:8620:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2938:2938 -> a
+    8620:8620:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3668 -> a
+    8621:8621:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2934:2934 -> a
+    8621:8621:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2938 -> a
+    8621:8621:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3668 -> a
+    8622:8630:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3669:3677 -> a
+    8631:8631:void lambda$desugar$90(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):3649:3649 -> a
+    8632:8632:void lambda$desugar$91(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3656:3656 -> a
+    8633:8635:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3681:3683 -> a
+    8636:8638:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):3688:3690 -> a
+    8639:8657:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3730:3748 -> a
+    8658:8658:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():201:201 -> a
+    8658:8658:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3748 -> a
+    8659:8673:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3748:3762 -> a
+    8674:8674:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    8674:8674:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3762 -> a
+    8675:8675:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3763:3763 -> a
+    8676:8676:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    8676:8676:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3764 -> a
+    8677:8712:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3765:3800 -> a
+    8713:8715:java.util.Set toDescriptorSet(java.util.Set):3945:3947 -> a
+    8713:8715:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3800 -> a
+    8716:8722:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3800:3806 -> a
+    8723:8725:java.util.Set toDescriptorSet(java.util.Set):3945:3947 -> a
+    8723:8725:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3806 -> a
+    8726:8742:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3806:3822 -> a
+    8743:8748:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3954:3959 -> a
+    8743:8748:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3829 -> a
+    8749:8758:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3830:3839 -> a
+    8759:8759:void lambda$createEnqueuerResult$92(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3733:3733 -> a
+    8760:8760:boolean lambda$createEnqueuerResult$93(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3739:3739 -> a
+    8761:8761:void amendKeepInfoWithCompanionMethods():3849:3849 -> a
+    8762:8763:void forEachCompanionMethod(java.util.function.BiConsumer):3843:3844 -> a
+    8762:8763:void amendKeepInfoWithCompanionMethods():3849 -> a
+    8764:8766:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3851:3853 -> a
+    8767:8767:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):109:109 -> a
+    8767:8767:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3853 -> a
+    8768:8768:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramMethod():55:55 -> a
+    8768:8768:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):111 -> a
+    8768:8768:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3853 -> a
+    8769:8770:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):113:114 -> a
+    8769:8770:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3853 -> a
+    8771:8774:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3853:3856 -> a
+    8775:8775:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
+    8775:8775:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3856 -> a
+    8776:8779:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3857:3860 -> a
+    8780:8780:void lambda$amendKeepInfoWithCompanionMethods$95(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3859:3859 -> a
+    8781:8791:java.util.Set amendWithCompanionMethods(java.util.Set):3865:3875 -> a
+    8792:8793:void lambda$amendWithCompanionMethods$96(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3871:3872 -> a
+    8794:8802:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3893:3901 -> a
+    8803:8803:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16618,"2":16619,"3":16620,"4":16621,"5":16622}}
+    16618:16618:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3901:3901 -> a
+    16619:16619:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3901:3901 -> a
+    16620:16620:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3901:3901 -> a
+    16621:16621:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3901:3901 -> a
+    16622:16622:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3901:3901 -> a
+    12704:12707:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3901:3904 -> a
+    12708:12708:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16625,"2":16626,"3":16627,"4":16628,"5":16629}}
+    16625:16625:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3904:3904 -> a
+    16626:16626:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3904:3904 -> a
+    16627:16627:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3904:3904 -> a
+    16628:16628:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3904:3904 -> a
+    16629:16629:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3904:3904 -> a
+    16612:16617:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3904:3909 -> a
+    16630:16630:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3965:3965 -> a
+    16631:16633:long getNumberOfLiveItems():4113:4115 -> a
+    16631:16633:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3968 -> a
+    16634:16634:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3969:3969 -> a
+    16635:16635:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
+    16635:16635:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3969 -> a
+    16636:16636:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3970:3970 -> a
+    16637:16637:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():322:322 -> a
+    16637:16637:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3970 -> a
+    16638:16638:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3971:3971 -> a
+    16639:16641:long getNumberOfLiveItems():4113:4115 -> a
+    16639:16641:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3975 -> a
+    16642:16650:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3979:3987 -> a
+    16651:16651:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer):2067:2067 -> a
+    16651:16651:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3988 -> a
+    16652:16661:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3989:3998 -> a
+    16662:16664:long getNumberOfLiveItems():4113:4115 -> a
+    16662:16664:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3998 -> a
+    16665:16666:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3998:3999 -> a
+    16667:16667:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
+    16667:16667:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3999 -> a
+    16668:16672:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4006:4010 -> a
+    16673:16673:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
+    16673:16673:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4010 -> a
+    16674:16675:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4016:4017 -> a
+    16676:16676:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
+    16676:16676:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4017 -> a
+    16677:16693:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4022:4038 -> a
+    16694:16694:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
+    16694:16694:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4038 -> a
+    16695:16710:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4046:4061 -> a
+    16711:16711:java.util.Set lambda$trace$97(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3984:3984 -> a
+    16712:16712:void lambda$trace$98(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4016:4016 -> a
+    16713:16717:void lambda$postProcessingDesugaring$99(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4076:4080 -> a
+    16718:16718:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    16718:16718:void lambda$postProcessingDesugaring$99(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4080 -> a
+    16719:16722:void lambda$postProcessingDesugaring$99(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4080:4083 -> a
+    16723:16723:void lambda$postProcessingDesugaring$99(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4076:4076 -> a
+    16724:16724:void com.android.tools.r8.shaking.MissingClasses$Builder.addNewMissingClassWithDesugarDiagnostic(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.errors.DesugarDiagnostic):93:93 -> a
+    16724:16724:void lambda$postProcessingDesugaring$99(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4076 -> a
+    16725:16731:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):4123:4129 -> a
+    16732:16734:void lambda$addConsequentRootSet$101(com.android.tools.r8.graph.DexType,java.util.Set):4131:4133 -> a
+    16735:16739:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):920:924 -> a
+    16735:16739:void lambda$addConsequentRootSet$101(com.android.tools.r8.graph.DexType,java.util.Set):4134 -> a
+    16740:16747:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4155:4162 -> a
+    16748:16751:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4161:4164 -> a
+    16752:16752:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4163:4163 -> a
+    16753:16760:void retainAnnotationForFinalTreeShaking(java.util.List):4183:4190 -> a
+    16761:16761:void retainAnnotationForFinalTreeShaking(java.util.List):4187:4187 -> a
+    16762:16765:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4222:4225 -> a
+    16766:16772:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4297:4303 -> a
+    16773:16773:com.android.tools.r8.shaking.Enqueuer$Mode getMode():518:518 -> a
+    16773:16773:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4357 -> a
+    16773:16773:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4306 -> a
+    16774:16774:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4357:4357 -> a
+    16774:16774:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4306 -> a
+    16775:16775:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3592:3592 -> a
+    16775:16775:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4358 -> a
+    16775:16775:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4306 -> a
+    16776:16778:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):3586:3588 -> a
+    16776:16778:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3593 -> a
+    16776:16778:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4358 -> a
+    16776:16778:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4306 -> a
+    16779:16794:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3595:3610 -> a
+    16779:16794:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4358 -> a
+    16779:16794:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4306 -> a
+    16795:16795:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4363:4363 -> a
+    16795:16795:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4306 -> a
+    16796:16800:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4308:4312 -> a
+    16801:16801:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    16801:16801:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4312 -> a
+    16802:16802:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    16802:16802:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4314 -> a
+    16803:16803:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4314:4314 -> a
+    16804:16804:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    16804:16804:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4315 -> a
+    16805:16810:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4315:4320 -> a
+    16811:16811:void lambda$markMethodAsLive$102(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4320:4320 -> a
+    16812:16812:void lambda$markMethodAsTargeted$103(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4340:4340 -> a
+    16813:16813:void lambda$traceMethodDefinitionExcludingCode$104(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):4350:4350 -> a
+    16814:16814:void lambda$traceCode$105(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4371:4371 -> a
+    16815:16815:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4397:4397 -> a
+    16816:16831:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):4421:4436 -> a
+    16816:16831:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4399 -> a
+    16832:16833:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4403:4404 -> a
+    16834:16834:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    16834:16834:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4404 -> a
+    16835:16839:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4405:4409 -> a
+    16840:16840:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
+    16840:16840:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
+    16840:16840:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4410 -> a
+    16841:16845:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4411:4415 -> a
+    16846:16846:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4412:4412 -> a
+    16847:16853:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4454:4460 -> a
+    16854:16861:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4563:4570 -> a
+    16854:16861:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4461 -> a
+    16862:16874:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4569:4581 -> a
+    16862:16874:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4461 -> a
     16875:16875:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16875:16875:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4768 -> a
-    16875:16875:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16876:16876:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4769:4769 -> a
-    16876:16876:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16877:16887:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4777:4787 -> a
-    16877:16887:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4770 -> a
-    16877:16887:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16888:16888:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4356:4356 -> a
-    16888:16888:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4788 -> a
-    16888:16888:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4770 -> a
-    16888:16888:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16889:16889:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
-    16889:16889:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
-    16889:16889:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4357 -> a
-    16889:16889:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4788 -> a
-    16889:16889:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4770 -> a
-    16889:16889:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16890:16892:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4358:4360 -> a
-    16890:16892:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4788 -> a
-    16890:16892:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4770 -> a
-    16890:16892:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16893:16893:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4359:4359 -> a
-    16893:16893:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4788 -> a
-    16893:16893:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4770 -> a
-    16893:16893:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4446 -> a
-    16894:16903:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4449:4458 -> a
-    16904:16904:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    16904:16904:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4458 -> a
-    16905:16909:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4459:4463 -> a
-    16910:16910:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16910:16910:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4467 -> a
-    16911:16911:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4467:4467 -> a
-    16912:16912:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644:644 -> a
-    16912:16912:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4468 -> a
-    16913:16913:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    16913:16913:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644 -> a
-    16913:16913:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4468 -> a
-    16914:16914:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644:644 -> a
-    16914:16914:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4468 -> a
-    16915:16945:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4468:4498 -> a
-    16946:16946:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16946:16946:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4499 -> a
-    16947:16952:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4498:4503 -> a
-    16953:16953:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16953:16953:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    16954:16968:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505:4519 -> a
-    16969:16969:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16969:16969:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4520 -> a
-    16970:16974:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4521:4525 -> a
-    16975:16976:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4522:4523 -> a
-    16985:16985:void lambda$handleReflectiveBehavior$108(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4504:4504 -> a
-    16986:16992:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4666:4672 -> a
-    16993:16993:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    16993:16993:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4672 -> a
-    16994:17007:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4677:4690 -> a
-    17008:17008:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    17008:17008:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4691 -> a
-    17009:17024:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4692:4707 -> a
-    17025:17025:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    17025:17025:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4708 -> a
-    17026:17026:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4709:4709 -> a
-    17027:17027:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
-    17027:17027:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4709 -> a
-    17028:17032:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4718:4722 -> a
-    17033:17033:void lambda$handleJavaLangReflectProxyNewProxyInstance$109(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4703:4703 -> a
-    17034:17036:void lambda$handleJavaLangReflectProxyNewProxyInstance$111(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4711:4713 -> a
-    17037:17037:void lambda$handleJavaLangReflectProxyNewProxyInstance$110(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4712:4712 -> a
+    16875:16875:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4583 -> a
+    16875:16875:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4461 -> a
+    16876:16876:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4387:4387 -> a
+    16876:16876:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4584 -> a
+    16876:16876:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4461 -> a
+    16877:16877:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
+    16877:16877:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
+    16877:16877:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4388 -> a
+    16877:16877:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4584 -> a
+    16877:16877:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4461 -> a
+    16878:16880:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4389:4391 -> a
+    16878:16880:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4584 -> a
+    16878:16880:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4461 -> a
+    16881:16881:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4390:4390 -> a
+    16881:16881:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4584 -> a
+    16881:16881:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4461 -> a
+    16882:16883:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4585:4586 -> a
+    16882:16883:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4461 -> a
+    16884:16884:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4464:4464 -> a
+    16885:16906:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4593:4614 -> a
+    16885:16906:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4465 -> a
+    16907:16920:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4613:4626 -> a
+    16907:16920:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4465 -> a
+    16921:16921:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    16921:16921:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4626 -> a
+    16921:16921:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4465 -> a
+    16922:16970:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4631:4679 -> a
+    16922:16970:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4465 -> a
+    16971:16971:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    16971:16971:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4684 -> a
+    16971:16971:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4465 -> a
+    16972:16972:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4387:4387 -> a
+    16972:16972:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4685 -> a
+    16972:16972:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4465 -> a
+    16973:16973:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
+    16973:16973:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
+    16973:16973:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4388 -> a
+    16973:16973:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4685 -> a
+    16973:16973:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4465 -> a
+    16974:16976:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4389:4391 -> a
+    16974:16976:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4685 -> a
+    16974:16976:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4465 -> a
+    16977:16977:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4390:4390 -> a
+    16977:16977:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4685 -> a
+    16977:16977:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4465 -> a
+    16978:16979:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4686:4687 -> a
+    16978:16979:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4465 -> a
+    16980:16980:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4468:4468 -> a
+    16981:16984:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4764:4767 -> a
+    16981:16984:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4469 -> a
+    16985:16985:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
+    16985:16985:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4768 -> a
+    16985:16985:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4469 -> a
+    16986:16986:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> a
+    16986:16986:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
+    16986:16986:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4768 -> a
+    16986:16986:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4469 -> a
+    16987:16987:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4768:4768 -> a
+    16987:16987:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4469 -> a
+    16988:16992:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4472:4476 -> a
+    16993:16993:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2156:2156 -> a
+    16993:16993:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4476 -> a
+    16994:17000:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4774:4780 -> a
+    16994:17000:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17001:17001:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    17001:17001:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4780 -> a
+    17001:17001:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17002:17006:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4781:4785 -> a
+    17002:17006:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17007:17007:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":17133,"2":17134,"3":17135}}
+    17133:17133:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4785:4785 -> a
+    17133:17133:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17134:17134:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4785:4785 -> a
+    17134:17134:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17135:17135:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4785:4785 -> a
+    17135:17135:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17008:17008:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":17138,"2":17139,"3":17140}}
+    17138:17138:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4788:4788 -> a
+    17138:17138:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17139:17139:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4788:4788 -> a
+    17139:17139:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17140:17140:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4788:4788 -> a
+    17140:17140:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17009:17011:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4790:4792 -> a
+    17009:17011:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17012:17012:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4785:4785 -> a
+    17012:17012:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17013:17013:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17013:17013:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4797 -> a
+    17013:17013:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17014:17024:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4808:4818 -> a
+    17014:17024:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4797 -> a
+    17014:17024:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17025:17025:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4387:4387 -> a
+    17025:17025:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4819 -> a
+    17025:17025:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4797 -> a
+    17025:17025:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17026:17026:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
+    17026:17026:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
+    17026:17026:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4388 -> a
+    17026:17026:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4819 -> a
+    17026:17026:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4797 -> a
+    17026:17026:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17027:17029:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4389:4391 -> a
+    17027:17029:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4819 -> a
+    17027:17029:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4797 -> a
+    17027:17029:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17030:17030:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4390:4390 -> a
+    17030:17030:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4819 -> a
+    17030:17030:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4797 -> a
+    17030:17030:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17031:17031:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17031:17031:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4799 -> a
+    17031:17031:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17032:17032:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4800:4800 -> a
+    17032:17032:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17033:17043:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4808:4818 -> a
+    17033:17043:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4801 -> a
+    17033:17043:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17044:17044:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4387:4387 -> a
+    17044:17044:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4819 -> a
+    17044:17044:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4801 -> a
+    17044:17044:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17045:17045:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> a
+    17045:17045:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():778 -> a
+    17045:17045:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4388 -> a
+    17045:17045:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4819 -> a
+    17045:17045:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4801 -> a
+    17045:17045:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17046:17048:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4389:4391 -> a
+    17046:17048:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4819 -> a
+    17046:17048:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4801 -> a
+    17046:17048:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17049:17049:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4390:4390 -> a
+    17049:17049:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4819 -> a
+    17049:17049:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4801 -> a
+    17049:17049:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4477 -> a
+    17050:17059:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4480:4489 -> a
+    17060:17060:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    17060:17060:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4489 -> a
+    17061:17065:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4490:4494 -> a
+    17066:17066:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17066:17066:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4498 -> a
+    17067:17067:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4498:4498 -> a
+    17068:17068:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644:644 -> a
+    17068:17068:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4499 -> a
+    17069:17069:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    17069:17069:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644 -> a
+    17069:17069:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4499 -> a
+    17070:17070:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644:644 -> a
+    17070:17070:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4499 -> a
+    17071:17101:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4499:4529 -> a
+    17102:17102:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17102:17102:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4530 -> a
+    17103:17108:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4529:4534 -> a
+    17109:17109:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17109:17109:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4536 -> a
+    17110:17124:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4536:4550 -> a
+    17125:17125:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17125:17125:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4551 -> a
+    17126:17130:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4552:4556 -> a
+    17131:17132:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4553:4554 -> a
+    17141:17141:void lambda$handleReflectiveBehavior$108(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4535:4535 -> a
+    17142:17148:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4697:4703 -> a
+    17149:17149:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    17149:17149:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4703 -> a
+    17150:17163:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4708:4721 -> a
+    17164:17164:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17164:17164:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4722 -> a
+    17165:17180:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4723:4738 -> a
+    17181:17181:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17181:17181:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4739 -> a
+    17182:17182:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4740:4740 -> a
+    17183:17183:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
+    17183:17183:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4740 -> a
+    17184:17188:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4749:4753 -> a
+    17189:17189:void lambda$handleJavaLangReflectProxyNewProxyInstance$109(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4734:4734 -> a
+    17190:17192:void lambda$handleJavaLangReflectProxyNewProxyInstance$111(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4742:4744 -> a
+    17193:17193:void lambda$handleJavaLangReflectProxyNewProxyInstance$110(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4743:4743 -> a
     com.android.tools.r8.graph.DexApplication lambda$synthesize$88(com.android.tools.r8.graph.DexApplication) -> b
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.ProgramMethod):79:79 -> b
-    1:1:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3111 -> b
-    2:6:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2075:2079 -> b
-    2:6:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3112 -> b
-    7:10:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2078:2081 -> b
-    7:10:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3112 -> b
-    11:14:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3117:3120 -> b
-    15:38:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3118:3141 -> b
-    39:39:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    39:39:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3140 -> b
-    40:43:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3143:3146 -> b
-    44:44:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> b
-    44:44:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3147 -> b
-    45:46:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3147:3148 -> b
-    47:47:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> b
-    47:47:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3149 -> b
-    48:48:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3149:3149 -> b
-    49:49:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder access$1100(com.android.tools.r8.shaking.Enqueuer):190:190 -> b
-    50:50:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):190:190 -> b
-    51:51:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():514:514 -> b
-    52:52:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):538:538 -> b
-    53:53:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):563:563 -> b
-    54:55:void setInitialDeadProtoTypes(java.util.Set):572:573 -> b
-    56:56:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):615:615 -> b
-    57:60:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):625:628 -> b
-    61:61:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):671:671 -> b
-    61:61:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):632 -> b
-    62:62:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):697:697 -> b
-    63:64:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):763:764 -> b
-    65:65:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):943:943 -> b
-    65:65:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1576 -> b
-    66:89:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1580:1603 -> b
-    90:90:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1727,"2":1728,"3":1729}}
-    1727:1727:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1603:1603 -> b
-    1728:1728:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1603:1603 -> b
-    1729:1729:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1603:1603 -> b
-    1695:1704:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1605:1614 -> b
-    1705:1705:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    1705:1705:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1614 -> b
-    1706:1710:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1618:1622 -> b
-    1711:1716:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1619:1624 -> b
-    1717:1717:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):589:589 -> b
-    1717:1717:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1624 -> b
-    1718:1721:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1628:1631 -> b
-    1722:1724:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1769:1771 -> b
-    1722:1724:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1631 -> b
-    1725:1725:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> b
-    1725:1725:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2745 -> b
-    1725:1725:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1634 -> b
-    1726:1726:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2745:2745 -> b
-    1726:1726:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1634 -> b
-    1730:1730:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):947:947 -> b
-    1731:1732:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1064:1065 -> b
-    1733:1733:void lambda$traceExceptionGuard$14(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1251:1251 -> b
-    1734:1734:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1251:1251 -> b
-    1735:1735:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1242:1242 -> b
-    1735:1735:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1252 -> b
-    1736:1741:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1310:1315 -> b
-    1742:1742:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    1742:1742:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1315 -> b
-    1743:1744:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1317:1318 -> b
-    1745:1745:void lambda$traceInvokeInterface$19(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1318:1318 -> b
-    1746:1746:void lambda$traceInstanceFieldWrite$25(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1527:1527 -> b
-    1747:1747:java.lang.Boolean lambda$traceStaticFieldWrite$30(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1689:1689 -> b
-    1748:1748:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$38(com.android.tools.r8.graph.DexType):1925:1925 -> b
-    1749:1749:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1998:1998 -> b
-    1750:1750:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> b
-    1750:1750:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1999 -> b
-    1751:1751:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2004:2004 -> b
-    1751:1751:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1996 -> b
-    1752:1753:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2009:2010 -> b
-    1752:1753:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2004 -> b
-    1752:1753:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1996 -> b
-    1754:1754:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2434:2434 -> b
-    1755:1755:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> b
-    1755:1755:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2434 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1756:1761:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2434:2439 -> b
-    1762:1763:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2687:2688 -> b
-    1762:1763:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2440 -> b
-    1764:1766:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2780:2782 -> b
-    1767:1767:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2781:2781 -> b
-    1768:1769:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> b
-    1768:1769:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2781 -> b
-    1770:1776:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2783:2789 -> b
-    1777:1777:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2801:2801 -> b
-    1777:1777:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2795 -> b
-    1778:1778:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> b
-    1778:1778:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2801 -> b
-    1778:1778:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2795 -> b
-    1779:1780:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2802:2803 -> b
-    1779:1780:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2795 -> b
-    1781:1781:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2797:2797 -> b
-    1782:1782:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2791:2791 -> b
-    1783:1791:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2814:2822 -> b
-    1792:1794:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1725:1727 -> b
-    1792:1794:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2822 -> b
-    1795:1795:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2823:2823 -> b
-    1796:1796:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2836:2836 -> b
-    1797:1797:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2845:2845 -> b
-    1798:1798:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2911:2911 -> b
-    1799:1799:boolean lambda$markVirtualMethodAsReachable$64(com.android.tools.r8.graph.DexDefinition):3033:3033 -> b
-    1800:1800:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
-    1800:1800:boolean lambda$markVirtualMethodAsReachable$64(com.android.tools.r8.graph.DexDefinition):3033 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1801:1805:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3085:3089 -> b
-    1801:1805:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3097 -> b
-    1806:1806:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1823,"2":1824,"3":1825}}
-    1823:1823:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3089:3089 -> b
-    1823:1823:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3097 -> b
-    1824:1824:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3089:3089 -> b
-    1824:1824:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3097 -> b
-    1825:1825:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3089:3089 -> b
-    1825:1825:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3097 -> b
-    1807:1807:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3089:3089 -> b
-    1807:1807:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3097 -> b
-    1808:1813:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3088:3093 -> b
-    1808:1813:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3097 -> b
-    1814:1819:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3097:3102 -> b
-    1820:1820:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2306:2306 -> b
-    1820:1820:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3105 -> b
-    1821:1821:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> b
-    1821:1821:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2306 -> b
-    1821:1821:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3105 -> b
-    1822:1822:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2307:2307 -> b
-    1822:1822:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3105 -> b
-    1826:1826:void lambda$markEnumValuesAsReachable$71(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3104:3104 -> b
-    1827:1837:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3158:3168 -> b
-    1838:1838:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():217:217 -> b
-    1838:1838:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3168 -> b
-    1839:1842:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3169:3172 -> b
-    1843:1843:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():225:225 -> b
-    1843:1843:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3172 -> b
-    1844:1848:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3171:3175 -> b
-    1849:1849:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):406:406 -> b
-    1849:1849:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3176 -> b
-    1850:1850:void lambda$traceApplication$75(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3211:3211 -> b
-    1851:1851:void lambda$traceApplication$76(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3213:3213 -> b
-    1852:1852:void lambda$traceApplication$77(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3215:3215 -> b
-    1853:1853:void lambda$applyMinimumKeepInfoWhenLive$80(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3262:3262 -> b
-    1854:1854:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3275:3275 -> b
-    1855:1855:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
-    1855:1855:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3276 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1856:1856:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3277:3277 -> b
-    1857:1857:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1857:1857:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3277 -> b
-    1858:1858:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3277:3277 -> b
-    1859:1859:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
-    1859:1859:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):848 -> b
-    1859:1859:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3278 -> b
-    1860:1860:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):848:848 -> b
-    1860:1860:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3278 -> b
-    1861:1861:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1861:1861:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):849 -> b
-    1861:1861:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3278 -> b
-    1862:1863:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):849:850 -> b
-    1862:1863:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3278 -> b
-    1864:1864:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1864:1864:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):851 -> b
-    1864:1864:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3278 -> b
-    1865:1865:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):851:851 -> b
-    1865:1865:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3278 -> b
-    1866:1866:void lambda$applyMinimumKeepInfoWhenLive$82(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3311:3311 -> b
-    1867:1867:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3322:3322 -> b
-    1868:1868:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
-    1868:1868:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3323 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1869:1869:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3324:3324 -> b
-    1870:1870:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1870:1870:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3324 -> b
-    1871:1871:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3324:3324 -> b
-    1872:1872:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
-    1872:1872:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):879 -> b
-    1872:1872:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3325 -> b
-    1873:1873:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):879:879 -> b
-    1873:1873:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3325 -> b
+    1:1:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3142 -> b
+    2:10:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3143:3151 -> b
+    11:34:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3149:3172 -> b
+    35:35:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    35:35:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3171 -> b
+    36:39:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3174:3177 -> b
+    40:40:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> b
+    40:40:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3178 -> b
+    41:42:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3178:3179 -> b
+    43:43:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> b
+    43:43:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3180 -> b
+    44:44:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3180:3180 -> b
+    45:45:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder access$1100(com.android.tools.r8.shaking.Enqueuer):190:190 -> b
+    46:46:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):190:190 -> b
+    47:47:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():514:514 -> b
+    48:48:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):538:538 -> b
+    49:49:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):563:563 -> b
+    50:51:void setInitialDeadProtoTypes(java.util.Set):572:573 -> b
+    52:52:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):615:615 -> b
+    53:53:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):696:696 -> b
+    54:55:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):762:763 -> b
+    56:56:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):943:943 -> b
+    56:56:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1576 -> b
+    57:80:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1580:1603 -> b
+    81:81:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1718,"2":1719,"3":1720}}
+    1718:1718:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1603:1603 -> b
+    1719:1719:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1603:1603 -> b
+    1720:1720:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1603:1603 -> b
+    1686:1695:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1605:1614 -> b
+    1696:1696:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    1696:1696:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1614 -> b
+    1697:1701:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1618:1622 -> b
+    1702:1707:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1619:1624 -> b
+    1708:1708:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):589:589 -> b
+    1708:1708:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1624 -> b
+    1709:1712:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1628:1631 -> b
+    1713:1715:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1769:1771 -> b
+    1713:1715:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1631 -> b
+    1716:1716:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> b
+    1716:1716:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2776 -> b
+    1716:1716:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1634 -> b
+    1717:1717:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2776:2776 -> b
+    1717:1717:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1634 -> b
+    1721:1721:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):947:947 -> b
+    1722:1723:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1064:1065 -> b
+    1724:1724:void lambda$traceExceptionGuard$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1251:1251 -> b
+    1725:1725:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1251:1251 -> b
+    1726:1726:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1242:1242 -> b
+    1726:1726:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1252 -> b
+    1727:1732:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1310:1315 -> b
+    1733:1733:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    1733:1733:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1315 -> b
+    1734:1735:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1317:1318 -> b
+    1736:1736:void lambda$traceInvokeInterface$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1318:1318 -> b
+    1737:1737:void lambda$traceInstanceFieldWrite$24(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1527:1527 -> b
+    1738:1738:java.lang.Boolean lambda$traceStaticFieldWrite$29(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1689:1689 -> b
+    1739:1739:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$37(com.android.tools.r8.graph.DexType):1935:1935 -> b
+    1740:1743:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2085:2088 -> b
+    1744:1750:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2087:2093 -> b
+    1751:1753:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2353:2355 -> b
+    1754:1758:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):702:706 -> b
+    1754:1758:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2354 -> b
+    1759:1759:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2465:2465 -> b
+    1760:1760:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> b
+    1760:1760:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2465 -> b
+    1761:1766:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2465:2470 -> b
+    1767:1768:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2718:2719 -> b
+    1767:1768:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2471 -> b
+    1769:1771:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2811:2813 -> b
+    1772:1772:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2812:2812 -> b
+    1773:1774:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> b
+    1773:1774:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2812 -> b
+    1775:1781:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2814:2820 -> b
+    1782:1782:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2832:2832 -> b
+    1782:1782:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2826 -> b
+    1783:1783:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> b
+    1783:1783:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2832 -> b
+    1783:1783:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2826 -> b
+    1784:1784:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2833:2833 -> b
+    1784:1784:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2826 -> b
+    1785:1785:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2008:2008 -> b
+    1785:1785:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> b
+    1785:1785:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2826 -> b
+    1786:1786:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> b
+    1786:1786:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2009 -> b
+    1786:1786:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> b
+    1786:1786:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2826 -> b
+    1787:1787:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014:2014 -> b
+    1787:1787:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2006 -> b
+    1787:1787:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> b
+    1787:1787:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2826 -> b
+    1788:1789:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2019:2020 -> b
+    1788:1789:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014 -> b
+    1788:1789:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2006 -> b
+    1788:1789:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2834 -> b
+    1788:1789:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2826 -> b
+    1790:1790:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2828:2828 -> b
+    1791:1791:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2822:2822 -> b
+    1792:1800:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2845:2853 -> b
+    1801:1803:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1725:1727 -> b
+    1801:1803:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2853 -> b
+    1804:1804:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2854:2854 -> b
+    1805:1805:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2867:2867 -> b
+    1806:1806:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2876:2876 -> b
+    1807:1807:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2942:2942 -> b
+    1808:1808:boolean lambda$markVirtualMethodAsReachable$64(com.android.tools.r8.graph.DexDefinition):3064:3064 -> b
+    1809:1809:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
+    1809:1809:boolean lambda$markVirtualMethodAsReachable$64(com.android.tools.r8.graph.DexDefinition):3064 -> b
+    1810:1814:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3116:3120 -> b
+    1810:1814:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3128 -> b
+    1815:1815:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1832,"2":1833,"3":1834}}
+    1832:1832:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3120:3120 -> b
+    1832:1832:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3128 -> b
+    1833:1833:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3120:3120 -> b
+    1833:1833:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3128 -> b
+    1834:1834:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3120:3120 -> b
+    1834:1834:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3128 -> b
+    1816:1816:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3120:3120 -> b
+    1816:1816:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3128 -> b
+    1817:1822:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3119:3124 -> b
+    1817:1822:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3128 -> b
+    1823:1828:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3128:3133 -> b
+    1829:1829:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2318:2318 -> b
+    1829:1829:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3136 -> b
+    1830:1830:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():613:613 -> b
+    1830:1830:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2318 -> b
+    1830:1830:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3136 -> b
+    1831:1831:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2319:2319 -> b
+    1831:1831:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3136 -> b
+    1835:1835:void lambda$markEnumValuesAsReachable$71(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3135:3135 -> b
+    1836:1846:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3189:3199 -> b
+    1847:1847:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():217:217 -> b
+    1847:1847:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3199 -> b
+    1848:1851:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3200:3203 -> b
+    1852:1852:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():225:225 -> b
+    1852:1852:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3203 -> b
+    1853:1857:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3202:3206 -> b
+    1858:1858:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):406:406 -> b
+    1858:1858:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3207 -> b
+    1859:1859:void lambda$traceApplication$75(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3242:3242 -> b
+    1860:1860:void lambda$traceApplication$76(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3244:3244 -> b
+    1861:1861:void lambda$traceApplication$77(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3246:3246 -> b
+    1862:1862:void lambda$applyMinimumKeepInfoWhenLive$80(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3293:3293 -> b
+    1863:1864:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3306:3307 -> b
+    1865:1865:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
+    1865:1865:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3307 -> b
+    1866:1866:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3308:3308 -> b
+    1867:1867:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
+    1867:1867:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3308 -> b
+    1868:1868:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3308:3308 -> b
+    1869:1869:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
+    1869:1869:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):848 -> b
+    1869:1869:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3309 -> b
+    1870:1870:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):848:848 -> b
+    1870:1870:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3309 -> b
+    1871:1871:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
+    1871:1871:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):849 -> b
+    1871:1871:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3309 -> b
+    1872:1873:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):849:850 -> b
+    1872:1873:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3309 -> b
     1874:1874:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1874:1874:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):880 -> b
-    1874:1874:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3325 -> b
-    1875:1877:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):880:882 -> b
-    1875:1877:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3325 -> b
-    1878:1878:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1878:1878:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):885 -> b
-    1878:1878:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3325 -> b
-    1879:1879:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):885:885 -> b
-    1879:1879:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3325 -> b
-    1880:1880:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):884:884 -> b
-    1880:1880:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3325 -> b
-    1881:1881:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):882:882 -> b
-    1881:1881:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3325 -> b
-    1882:1882:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$84(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3358:3358 -> b
-    1883:1883:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3371:3371 -> b
-    1884:1884:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
-    1884:1884:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3372 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1885:1885:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3373:3373 -> b
-    1886:1886:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1886:1886:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3373 -> b
-    1887:1887:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3373:3373 -> b
-    1888:1888:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
-    1888:1888:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892 -> b
-    1888:1888:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3374 -> b
-    1889:1889:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:892 -> b
-    1889:1889:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3374 -> b
-    1890:1890:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1890:1890:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):893 -> b
-    1890:1890:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3374 -> b
-    1891:1893:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):893:895 -> b
-    1891:1893:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3374 -> b
+    1874:1874:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):851 -> b
+    1874:1874:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3309 -> b
+    1875:1875:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):851:851 -> b
+    1875:1875:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3309 -> b
+    1876:1876:void lambda$applyMinimumKeepInfoWhenLive$82(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3342:3342 -> b
+    1877:1878:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3353:3354 -> b
+    1879:1879:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
+    1879:1879:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3354 -> b
+    1880:1880:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3355:3355 -> b
+    1881:1881:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
+    1881:1881:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3355 -> b
+    1882:1883:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3355:3356 -> b
+    1884:1884:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$84(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3389:3389 -> b
+    1885:1886:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3402:3403 -> b
+    1887:1887:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
+    1887:1887:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3403 -> b
+    1888:1888:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3404:3404 -> b
+    1889:1889:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
+    1889:1889:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3404 -> b
+    1890:1893:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3404:3407 -> b
     1894:1894:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1894:1894:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):898 -> b
-    1894:1894:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3374 -> b
-    1895:1895:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):898:898 -> b
-    1895:1895:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3374 -> b
-    1896:1896:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):897:897 -> b
-    1896:1896:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3374 -> b
-    1897:1897:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895:895 -> b
-    1897:1897:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3374 -> b
-    1898:1898:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3376:3376 -> b
-    1899:1899:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1899:1899:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3377 -> b
-    1900:1901:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):1991:1992 -> b
-    1900:1901:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3377 -> b
-    1902:1904:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3664:3666 -> b
-    1905:1909:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):4414:4418 -> b
-    1910:1910:void lambda$handleReflectiveBehavior$107(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4477:4477 -> b
+    1894:1894:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3408 -> b
+    1895:1896:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):2001:2002 -> b
+    1895:1896:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3408 -> b
+    1897:1899:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3695:3697 -> b
+    1900:1904:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):4445:4449 -> b
+    1905:1905:void lambda$handleReflectiveBehavior$107(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4508:4508 -> b
     1:1:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1200(com.android.tools.r8.shaking.Enqueuer):190:190 -> c
     2:2:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):553:553 -> c
     3:4:void setInitialPrunedTypes(java.util.Set):577:578 -> c
-    5:5:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):775:775 -> c
-    6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):671:671 -> c
-    6:6:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):775 -> c
-    7:7:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):776:776 -> c
-    8:8:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):951:951 -> c
-    8:8:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1647 -> c
-    9:28:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1651:1670 -> c
-    29:29:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1735,"2":1736,"3":1737}}
-    1735:1735:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1670:1670 -> c
-    1736:1736:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1670:1670 -> c
-    1737:1737:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1670:1670 -> c
-    1701:1710:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1672:1681 -> c
-    1711:1711:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    1711:1711:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1681 -> c
-    1712:1718:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1684:1690 -> c
-    1719:1724:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1687:1692 -> c
-    1725:1725:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):589:589 -> c
-    1725:1725:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1692 -> c
-    1726:1729:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1697:1700 -> c
-    1730:1732:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1769:1771 -> c
-    1730:1732:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1700 -> c
-    1733:1733:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> c
-    1733:1733:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2745 -> c
-    1733:1733:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1703 -> c
-    1734:1734:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2745:2745 -> c
-    1734:1734:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1703 -> c
-    1738:1738:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):955:955 -> c
-    1739:1750:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1159:1170 -> c
-    1751:1757:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1207:1213 -> c
-    1751:1757:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1170 -> c
-    1758:1762:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1169:1173 -> c
-    1763:1763:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> c
-    1763:1763:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1177 -> c
-    1764:1764:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1182:1182 -> c
-    1765:1769:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1207:1211 -> c
-    1765:1769:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1182 -> c
-    1770:1770:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1185:1185 -> c
-    1771:1771:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> c
-    1771:1771:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1185 -> c
-    1772:1775:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1185:1188 -> c
-    1776:1776:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> c
-    1776:1776:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1192 -> c
-    1777:1777:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1197:1197 -> c
-    1778:1778:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> c
-    1778:1778:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1201 -> c
-    1779:1779:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1201:1201 -> c
-    1780:1780:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> c
-    1780:1780:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1202 -> c
-    1781:1781:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1202:1202 -> c
-    1782:1782:void lambda$traceInstanceOf$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1246:1246 -> c
-    1783:1789:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1256:1262 -> c
-    1790:1790:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> c
-    1790:1790:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1266 -> c
-    1791:1791:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> c
-    1791:1791:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> c
-    1791:1791:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1266 -> c
-    1792:1792:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1266:1266 -> c
-    1793:1794:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1331:1332 -> c
-    1795:1795:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1576:1576 -> c
-    1795:1795:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1332 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1796:1808:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1332:1344 -> c
-    1809:1809:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2156:2156 -> c
-    1809:1809:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1344 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1810:1820:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1345:1355 -> c
-    1821:1821:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    1821:1821:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1355 -> c
-    1822:1826:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2075:2079 -> c
-    1822:1826:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2102 -> c
-    1822:1826:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1357 -> c
-    1827:1830:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2078:2081 -> c
-    1827:1830:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2102 -> c
-    1827:1830:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1357 -> c
-    1831:1845:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2103:2117 -> c
-    1831:1845:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1357 -> c
-    1846:1846:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1358:1358 -> c
-    1847:1847:void lambda$traceInvokeStatic$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1358:1358 -> c
-    1848:1848:void lambda$traceStaticFieldRead$26(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1582:1582 -> c
-    1849:1853:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1780:1784 -> c
-    1854:1856:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1783:1785 -> c
-    1857:1857:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1781:1781 -> c
-    1858:1858:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$31(com.android.tools.r8.graph.DexType):1784:1784 -> c
-    1859:1865:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2348:2348 -> c
-    1866:1866:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4240,"2":4241,"3":4242}}
-    4240:4240:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2348:2348 -> c
-    4241:4241:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2348:2348 -> c
-    4242:4242:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2348:2348 -> c
-    1867:1867:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4248,"2":4249,"3":4250,"4":4251}}
-    4248:4248:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2354:2354 -> c
-    4249:4249:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2354:2354 -> c
-    4250:4250:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2354:2354 -> c
-    4251:4251:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2354:2354 -> c
-    4221:4234:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2354:2367 -> c
-    4235:4235:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> c
-    4235:4235:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2367 -> c
-    4236:4236:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> c
-    4236:4236:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> c
-    4236:4236:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2367 -> c
-    4237:4239:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2368:2370 -> c
-    4252:4253:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2853:2854 -> c
-    4254:4254:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2915:2915 -> c
-    4255:4255:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2911:2911 -> c
-    4255:4255:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2915 -> c
-    4256:4256:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2925:2925 -> c
-    4257:4257:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$73(com.android.tools.r8.graph.DexEncodedMethod):3144:3144 -> c
-    4258:4263:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3286:3291 -> c
-    4264:4264:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> c
-    4264:4264:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3291 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4265:4265:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):554:554 -> c
-    4265:4265:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> c
-    4265:4265:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3291 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4266:4266:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3293:3293 -> c
-    4267:4267:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
-    4267:4267:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3293 -> c
-    4268:4268:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3294:3294 -> c
-    4269:4274:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3331:3336 -> c
-    4275:4275:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> c
-    4275:4275:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3336 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4276:4276:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):554:554 -> c
-    4276:4276:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> c
-    4276:4276:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3336 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4277:4277:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3338:3338 -> c
-    4278:4278:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
-    4278:4278:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3338 -> c
-    4279:4279:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3339:3339 -> c
-    4280:4285:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3386:3391 -> c
-    4286:4286:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> c
-    4286:4286:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3391 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4287:4287:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):554:554 -> c
-    4287:4287:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> c
-    4287:4287:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3391 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4288:4288:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3394:3394 -> c
-    4289:4289:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
-    4289:4289:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3394 -> c
-    4290:4290:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3395:3395 -> c
-    4291:4297:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3849:3855 -> c
-    4298:4309:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3885:3896 -> c
-    4298:4309:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3855 -> c
-    4310:4310:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2911:2911 -> c
-    4310:4310:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3896 -> c
-    4310:4310:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3855 -> c
-    4311:4311:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3897:3897 -> c
-    4311:4311:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3855 -> c
-    4312:4314:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3905:3907 -> c
-    4312:4314:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3897 -> c
-    4312:4314:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3855 -> c
-    4315:4315:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4109:4109 -> c
-    4316:4316:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):1984:1984 -> c
-    4316:4316:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4109 -> c
-    4317:4318:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4110:4111 -> c
-    4319:4328:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4139:4148 -> c
-    4319:4328:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4112 -> c
-    4329:4329:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4116:4116 -> c
-    4330:4343:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4166:4179 -> c
-    4344:4345:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> c
-    4344:4345:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4179 -> c
-    4346:4349:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4182:4185 -> c
+    5:5:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):774:774 -> c
+    6:11:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):682:687 -> c
+    6:11:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):674 -> c
+    6:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):775 -> c
+    12:12:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):776:776 -> c
+    13:13:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):951:951 -> c
+    13:13:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1647 -> c
+    14:33:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1651:1670 -> c
+    34:34:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1740,"2":1741,"3":1742}}
+    1740:1740:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1670:1670 -> c
+    1741:1741:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1670:1670 -> c
+    1742:1742:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1670:1670 -> c
+    1706:1715:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1672:1681 -> c
+    1716:1716:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    1716:1716:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1681 -> c
+    1717:1723:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1684:1690 -> c
+    1724:1729:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1687:1692 -> c
+    1730:1730:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):589:589 -> c
+    1730:1730:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1692 -> c
+    1731:1734:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1697:1700 -> c
+    1735:1737:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1769:1771 -> c
+    1735:1737:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1700 -> c
+    1738:1738:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> c
+    1738:1738:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2776 -> c
+    1738:1738:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1703 -> c
+    1739:1739:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2776:2776 -> c
+    1739:1739:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1703 -> c
+    1743:1743:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):955:955 -> c
+    1744:1755:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1159:1170 -> c
+    1756:1762:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1207:1213 -> c
+    1756:1762:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1170 -> c
+    1763:1767:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1169:1173 -> c
+    1768:1768:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> c
+    1768:1768:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1177 -> c
+    1769:1769:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1182:1182 -> c
+    1770:1774:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1207:1211 -> c
+    1770:1774:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1182 -> c
+    1775:1775:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1185:1185 -> c
+    1776:1776:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> c
+    1776:1776:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1185 -> c
+    1777:1780:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1185:1188 -> c
+    1781:1781:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> c
+    1781:1781:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1192 -> c
+    1782:1782:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1197:1197 -> c
+    1783:1783:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> c
+    1783:1783:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1201 -> c
+    1784:1784:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1201:1201 -> c
+    1785:1785:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> c
+    1785:1785:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1202 -> c
+    1786:1786:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1202:1202 -> c
+    1787:1787:void lambda$traceInstanceOf$12(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1246:1246 -> c
+    1788:1794:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1256:1262 -> c
+    1795:1795:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> c
+    1795:1795:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1266 -> c
+    1796:1796:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> c
+    1796:1796:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> c
+    1796:1796:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1266 -> c
+    1797:1797:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1266:1266 -> c
+    1798:1799:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1331:1332 -> c
+    1800:1800:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1576:1576 -> c
+    1800:1800:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1332 -> c
+    1801:1813:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1332:1344 -> c
+    1814:1814:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2156:2156 -> c
+    1814:1814:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1344 -> c
+    1815:1825:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1345:1355 -> c
+    1826:1826:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    1826:1826:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1355 -> c
+    1827:1842:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2114:2129 -> c
+    1827:1842:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1357 -> c
+    1843:1843:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1358:1358 -> c
+    1844:1844:void lambda$traceInvokeStatic$19(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1358:1358 -> c
+    1845:1845:void lambda$traceStaticFieldRead$25(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1582:1582 -> c
+    1846:1850:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1780:1784 -> c
+    1851:1853:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1783:1785 -> c
+    1854:1854:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1781:1781 -> c
+    1855:1855:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$30(com.android.tools.r8.graph.DexType):1784:1784 -> c
+    1856:1862:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2379:2379 -> c
+    1863:1863:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4268,"2":4269,"3":4270}}
+    4268:4268:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2379:2379 -> c
+    4269:4269:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2379:2379 -> c
+    4270:4270:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2379:2379 -> c
+    1864:1864:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4276,"2":4277,"3":4278,"4":4279}}
+    4276:4276:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2385:2385 -> c
+    4277:4277:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2385:2385 -> c
+    4278:4278:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2385:2385 -> c
+    4279:4279:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2385:2385 -> c
+    4249:4262:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2385:2398 -> c
+    4263:4263:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> c
+    4263:4263:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2398 -> c
+    4264:4264:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> c
+    4264:4264:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> c
+    4264:4264:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2398 -> c
+    4265:4267:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2399:2401 -> c
+    4280:4281:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2884:2885 -> c
+    4282:4282:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2946:2946 -> c
+    4283:4283:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2942:2942 -> c
+    4283:4283:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2946 -> c
+    4284:4284:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2956:2956 -> c
+    4285:4285:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$73(com.android.tools.r8.graph.DexEncodedMethod):3175:3175 -> c
+    4286:4293:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3317:3324 -> c
+    4294:4294:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
+    4294:4294:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3324 -> c
+    4295:4295:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3325:3325 -> c
+    4296:4303:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3362:3369 -> c
+    4304:4304:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
+    4304:4304:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3369 -> c
+    4305:4305:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3370:3370 -> c
+    4306:4314:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3417:3425 -> c
+    4315:4315:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
+    4315:4315:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3425 -> c
+    4316:4316:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3426:3426 -> c
+    4317:4323:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3880:3886 -> c
+    4324:4335:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3916:3927 -> c
+    4324:4335:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3886 -> c
+    4336:4336:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2942:2942 -> c
+    4336:4336:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3927 -> c
+    4336:4336:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3886 -> c
+    4337:4337:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3928:3928 -> c
+    4337:4337:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3886 -> c
+    4338:4340:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3936:3938 -> c
+    4338:4340:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3928 -> c
+    4338:4340:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3886 -> c
+    4341:4341:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4140:4140 -> c
+    4342:4342:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):2009:2009 -> c
+    4342:4342:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4140 -> c
+    4343:4344:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4141:4142 -> c
+    4345:4354:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4170:4179 -> c
+    4345:4354:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4143 -> c
+    4355:4355:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4147:4147 -> c
+    4356:4369:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4197:4210 -> c
+    4370:4371:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> c
+    4370:4371:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4210 -> c
+    4372:4375:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4213:4216 -> c
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> d
     1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1301 -> d
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> d
@@ -107032,41 +105934,41 @@
     2:2:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1301 -> d
     3:3:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1301:1301 -> d
     4:4:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> d
-    4:4:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$106(com.android.tools.r8.graph.ProgramMethod):4470 -> d
+    4:4:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$106(com.android.tools.r8.graph.ProgramMethod):4501 -> d
     5:5:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1900(com.android.tools.r8.shaking.Enqueuer):190:190 -> d
     6:10:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():526:530 -> d
     11:11:boolean addTargetedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):597:597 -> d
-    11:11:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4293 -> d
-    12:19:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4298:4305 -> d
-    20:21:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4409:4410 -> d
-    20:21:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4306 -> d
+    11:11:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4324 -> d
+    12:19:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4329:4336 -> d
+    20:21:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4440:4441 -> d
+    20:21:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4337 -> d
     22:22:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):189:189 -> d
-    22:22:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4410 -> d
-    22:22:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4306 -> d
-    23:23:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4409:4409 -> d
-    23:23:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4306 -> d
-    24:24:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4309:4309 -> d
-    25:25:void lambda$traceSafeCheckCast$10(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1069:1069 -> d
+    22:22:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4441 -> d
+    22:22:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4337 -> d
+    23:23:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4440:4440 -> d
+    23:23:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4337 -> d
+    24:24:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4340:4340 -> d
+    25:25:void lambda$traceSafeCheckCast$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1069:1069 -> d
     26:26:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1246:1246 -> d
     27:27:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1242:1242 -> d
     27:27:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1247 -> d
-    28:28:void lambda$traceInvokeSuper$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1373:1373 -> d
+    28:28:void lambda$traceInvokeSuper$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1373:1373 -> d
     29:36:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1386:1393 -> d
     37:49:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1388:1400 -> d
     50:50:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
     50:50:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1400 -> d
     51:52:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1402:1403 -> d
     53:53:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1443:1443 -> d
-    54:54:void lambda$traceStaticFieldWrite$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1654:1654 -> d
+    54:54:void lambda$traceStaticFieldWrite$28(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1654:1654 -> d
     55:63:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1737:1745 -> d
     64:64:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> d
     64:64:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1749 -> d
-    65:65:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$32(com.android.tools.r8.graph.DexType):1851:1851 -> d
-    66:70:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2864:2868 -> d
+    65:65:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$31(com.android.tools.r8.graph.DexType):1861:1861 -> d
+    66:70:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2895:2899 -> d
     71:71:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> d
-    71:71:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2868 -> d
-    72:73:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2870:2871 -> d
-    74:77:java.util.Set lambda$createEnqueuerResult$94(com.android.tools.r8.graph.DexProgramClass):3752:3755 -> d
+    71:71:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2899 -> d
+    72:73:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2901:2902 -> d
+    74:77:java.util.Set lambda$createEnqueuerResult$94(com.android.tools.r8.graph.DexProgramClass):3783:3786 -> d
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> e
     1:1:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1322 -> e
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> e
@@ -107087,55 +105989,55 @@
     27:27:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> e
     27:27:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):848 -> e
     27:27:void enqueueAllIfNotShrinking():836 -> e
-    28:28:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):848:848 -> e
-    28:28:void enqueueAllIfNotShrinking():836 -> e
-    29:29:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> e
-    29:29:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):849 -> e
-    29:29:void enqueueAllIfNotShrinking():836 -> e
-    30:31:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):849:850 -> e
-    30:31:void enqueueAllIfNotShrinking():836 -> e
-    32:32:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> e
-    32:32:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):851 -> e
-    32:32:void enqueueAllIfNotShrinking():836 -> e
-    33:33:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):851:851 -> e
-    33:33:void enqueueAllIfNotShrinking():836 -> e
-    34:34:void enqueueAllIfNotShrinking():837:837 -> e
-    35:35:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> e
-    35:35:void enqueueAllIfNotShrinking():837 -> e
-    36:36:void enqueueAllIfNotShrinking():839:839 -> e
-    37:37:void lambda$traceInvokeVirtual$22(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1403:1403 -> e
-    38:46:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1407:1415 -> e
-    47:47:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):34:34 -> e
-    47:47:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1419 -> e
-    48:48:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1432:1432 -> e
-    48:48:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1415 -> e
-    49:49:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> e
-    49:49:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1434 -> e
-    49:49:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1415 -> e
-    50:53:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1434:1437 -> e
-    50:53:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1415 -> e
-    54:54:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1435:1435 -> e
-    54:54:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1415 -> e
-    55:55:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1447:1447 -> e
-    56:56:java.util.Map lambda$processAnnotation$42(com.android.tools.r8.graph.DexType):2026:2026 -> e
-    57:57:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$59(com.android.tools.r8.graph.DexProgramClass):2788:2788 -> e
-    58:58:void lambda$markDirectStaticOrConstructorMethodAsLive$61(com.android.tools.r8.graph.ProgramMethod):2818:2818 -> e
-    59:61:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1725:1727 -> e
-    59:61:void lambda$markDirectStaticOrConstructorMethodAsLive$61(com.android.tools.r8.graph.ProgramMethod):2818 -> e
-    62:62:void lambda$markDirectStaticOrConstructorMethodAsLive$61(com.android.tools.r8.graph.ProgramMethod):2819:2819 -> e
-    63:63:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1732:1732 -> e
-    63:63:void lambda$markDirectStaticOrConstructorMethodAsLive$61(com.android.tools.r8.graph.ProgramMethod):2819 -> e
-    64:65:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2829:2830 -> e
-    66:66:boolean com.android.tools.r8.shaking.KeepReason.isDueToReflectiveUse():0:0 -> e
-    66:66:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2831 -> e
-    67:70:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2829:2832 -> e
+    28:29:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):848:849 -> e
+    28:29:void enqueueAllIfNotShrinking():836 -> e
+    30:30:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> e
+    30:30:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):849 -> e
+    30:30:void enqueueAllIfNotShrinking():836 -> e
+    31:33:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):849:851 -> e
+    31:33:void enqueueAllIfNotShrinking():836 -> e
+    34:34:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> e
+    34:34:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):851 -> e
+    34:34:void enqueueAllIfNotShrinking():836 -> e
+    35:35:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):851:851 -> e
+    35:35:void enqueueAllIfNotShrinking():836 -> e
+    36:36:void enqueueAllIfNotShrinking():837:837 -> e
+    37:37:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> e
+    37:37:void enqueueAllIfNotShrinking():837 -> e
+    38:38:void enqueueAllIfNotShrinking():839:839 -> e
+    39:39:void lambda$traceInvokeVirtual$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1403:1403 -> e
+    40:48:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1407:1415 -> e
+    49:49:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):34:34 -> e
+    49:49:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1419 -> e
+    50:50:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1432:1432 -> e
+    50:50:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1415 -> e
+    51:51:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> e
+    51:51:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1434 -> e
+    51:51:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1415 -> e
+    52:55:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1434:1437 -> e
+    52:55:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1415 -> e
+    56:56:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1435:1435 -> e
+    56:56:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1415 -> e
+    57:57:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1447:1447 -> e
+    58:58:java.util.Map lambda$processAnnotation$41(com.android.tools.r8.graph.DexType):2036:2036 -> e
+    59:59:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$59(com.android.tools.r8.graph.DexProgramClass):2819:2819 -> e
+    60:60:void lambda$markDirectStaticOrConstructorMethodAsLive$61(com.android.tools.r8.graph.ProgramMethod):2849:2849 -> e
+    61:63:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1725:1727 -> e
+    61:63:void lambda$markDirectStaticOrConstructorMethodAsLive$61(com.android.tools.r8.graph.ProgramMethod):2849 -> e
+    64:64:void lambda$markDirectStaticOrConstructorMethodAsLive$61(com.android.tools.r8.graph.ProgramMethod):2850:2850 -> e
+    65:65:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1732:1732 -> e
+    65:65:void lambda$markDirectStaticOrConstructorMethodAsLive$61(com.android.tools.r8.graph.ProgramMethod):2850 -> e
+    66:67:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2860:2861 -> e
+    68:68:boolean com.android.tools.r8.shaking.KeepReason.isDueToReflectiveUse():0:0 -> e
+    68:68:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2862 -> e
+    69:72:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2860:2863 -> e
     1:1:com.android.tools.r8.shaking.Enqueuer$Mode access$300(com.android.tools.r8.shaking.Enqueuer):190:190 -> f
     2:2:com.android.tools.r8.shaking.GraphReporter getGraphReporter():522:522 -> f
     3:3:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):601:601 -> f
-    4:4:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2331:2331 -> f
+    4:4:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2362:2362 -> f
     4:4:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):603 -> f
     5:7:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):604:606 -> f
-    8:12:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):703:707 -> f
+    8:12:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):702:706 -> f
     8:12:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):605 -> f
     13:14:void traceSafeCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1069:1070 -> f
     15:15:void traceInstanceFieldReadFromRecordMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1451:1451 -> f
@@ -107145,10 +106047,10 @@
     33:33:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> f
     33:33:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1370 -> f
     34:35:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1372:1373 -> f
-    36:36:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$41(com.android.tools.r8.graph.DexProgramClass):1972:1972 -> f
-    37:37:void lambda$markDirectStaticOrConstructorMethodAsLive$62(com.android.tools.r8.graph.ProgramMethod):2823:2823 -> f
+    36:36:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$40(com.android.tools.r8.graph.DexProgramClass):1982:1982 -> f
+    37:37:void lambda$markDirectStaticOrConstructorMethodAsLive$62(com.android.tools.r8.graph.ProgramMethod):2854:2854 -> f
     38:38:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1732:1732 -> f
-    38:38:void lambda$markDirectStaticOrConstructorMethodAsLive$62(com.android.tools.r8.graph.ProgramMethod):2823 -> f
+    38:38:void lambda$markDirectStaticOrConstructorMethodAsLive$62(com.android.tools.r8.graph.ProgramMethod):2854 -> f
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> g
     1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1377 -> g
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> g
@@ -107156,106 +106058,114 @@
     2:2:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1377 -> g
     3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1377:1377 -> g
     4:4:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.shaking.Enqueuer):190:190 -> g
-    5:5:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():693:693 -> g
+    5:5:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():692:692 -> g
     6:6:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1242:1242 -> g
     7:7:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1511:1511 -> g
-    8:19:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2122:2133 -> g
-    20:26:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):2154:2160 -> g
-    20:26:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2137 -> g
-    27:30:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2143:2146 -> g
-    31:35:void traceCode(com.android.tools.r8.graph.ProgramMethod):4336:4340 -> g
+    8:19:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2134:2145 -> g
+    20:26:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):2166:2172 -> g
+    20:26:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2149 -> g
+    27:30:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2155:2158 -> g
+    31:35:void traceCode(com.android.tools.r8.graph.ProgramMethod):4367:4371 -> g
     1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$500(com.android.tools.r8.shaking.Enqueuer):190:190 -> h
     2:2:com.android.tools.r8.shaking.Enqueuer$Mode getMode():518:518 -> h
     3:3:void traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1515:1515 -> h
-    4:19:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):2170:2185 -> h
-    20:20:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4344:4344 -> h
-    20:20:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4313 -> h
+    4:19:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):2182:2197 -> h
+    20:20:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4375:4375 -> h
+    20:20:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4344 -> h
     21:21:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1776:1776 -> h
-    21:21:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4344 -> h
-    21:21:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4313 -> h
-    22:25:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4349:4352 -> h
-    22:25:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4345 -> h
-    22:25:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4313 -> h
-    26:34:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4314:4322 -> h
+    21:21:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4375 -> h
+    21:21:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4344 -> h
+    22:25:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4380:4383 -> h
+    22:25:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4376 -> h
+    22:25:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4344 -> h
+    26:26:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2008:2008 -> h
+    26:26:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4345 -> h
+    27:27:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> h
+    27:27:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2009 -> h
+    27:27:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4345 -> h
+    28:28:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014:2014 -> h
+    28:28:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2006 -> h
+    28:28:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4345 -> h
+    29:30:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2019:2020 -> h
+    29:30:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014 -> h
+    29:30:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2006 -> h
+    29:30:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4345 -> h
+    31:37:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4347:4353 -> h
     1:1:com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet access$600(com.android.tools.r8.shaking.Enqueuer):190:190 -> i
     2:2:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():534:534 -> i
     3:4:void traceRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.ProgramMethod):1153:1154 -> i
     5:5:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1567:1567 -> i
-    6:23:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):2195:2212 -> i
+    6:23:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):2207:2224 -> i
     1:1:java.util.Set access$800(com.android.tools.r8.shaking.Enqueuer):190:190 -> j
     2:2:void traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1571:1571 -> j
-    3:36:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2692:2725 -> j
-    37:40:void postProcessingDesugaring():4035:4038 -> j
+    3:36:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2723:2756 -> j
+    37:40:void postProcessingDesugaring():4066:4069 -> j
     41:41:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> j
-    41:41:void postProcessingDesugaring():4038 -> j
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    42:62:void postProcessingDesugaring():4038:4058 -> j
-    63:66:void postProcessingDesugaring():4057:4060 -> j
-    67:83:void postProcessingDesugaring():4059:4075 -> j
+    41:41:void postProcessingDesugaring():4069 -> j
+    42:62:void postProcessingDesugaring():4069:4089 -> j
+    63:66:void postProcessingDesugaring():4088:4091 -> j
+    67:83:void postProcessingDesugaring():4090:4106 -> j
     84:84:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> j
-    84:84:void postProcessingDesugaring():4075 -> j
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    85:85:void postProcessingDesugaring():4076:4076 -> j
+    84:84:void postProcessingDesugaring():4106 -> j
+    85:85:void postProcessingDesugaring():4107:4107 -> j
     86:86:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():322:322 -> j
-    86:86:void postProcessingDesugaring():4076 -> j
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    87:87:void postProcessingDesugaring():4077:4077 -> j
+    86:86:void postProcessingDesugaring():4107 -> j
+    87:87:void postProcessingDesugaring():4108:4108 -> j
     1:1:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1638:1638 -> k
-    2:9:void synthesize():3531:3538 -> k
-    10:15:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3670:3675 -> k
-    10:15:void synthesize():3539 -> k
-    16:27:void synthesize():3540:3551 -> k
+    2:9:void synthesize():3562:3569 -> k
+    10:15:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3701:3706 -> k
+    10:15:void synthesize():3570 -> k
+    16:27:void synthesize():3571:3582 -> k
     1:1:void traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1642:1642 -> l
-com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.t:
-com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.shaking.u:
+com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.shaking.q:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
     com.android.tools.r8.graph.ProgramDefinition context -> a
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$1):4880:4880 -> <init>
-    2:4:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):4885:4887 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$1):4911:4911 -> <init>
+    2:4:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):4916:4918 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:24:boolean addField(com.android.tools.r8.graph.DexField):4897:4920 -> b
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
-    25:25:boolean addField(com.android.tools.r8.graph.DexField):4920 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    26:31:boolean addField(com.android.tools.r8.graph.DexField):4920:4925 -> b
-    32:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):4933:4948 -> b
-    48:48:boolean addType(com.android.tools.r8.graph.DexType):4976:4976 -> b
-com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.v:
+    1:24:boolean addField(com.android.tools.r8.graph.DexField):4928:4951 -> b
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> b
+    25:25:boolean addField(com.android.tools.r8.graph.DexField):4951 -> b
+    26:31:boolean addField(com.android.tools.r8.graph.DexField):4951:4956 -> b
+    32:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):4964:4979 -> b
+    48:48:boolean addType(com.android.tools.r8.graph.DexType):5007:5007 -> b
+com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.r:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
-    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):4985:4986 -> <init>
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):4990:4990 -> a
-    2:2:void lambda$definitionFor$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):4990:4990 -> a
-com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet -> com.android.tools.r8.shaking.w:
+    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):5016:5017 -> <init>
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):5021:5021 -> a
+    2:2:void lambda$definitionFor$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):5022:5022 -> a
+    3:3:void lambda$definitionFor$1(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):5022:5022 -> a
+com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet -> com.android.tools.r8.shaking.s:
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
     java.util.Set fields -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4830:4830 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4826:4831 -> <init>
-    1:1:java.util.Set access$1500(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4824:4824 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4835:4838 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4842:4842 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4846:4846 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4842:4842 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4846 -> a
-com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.x:
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4861:4861 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4857:4862 -> <init>
+    1:1:java.util.Set access$1500(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4855:4855 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4866:4869 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4873:4873 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4877:4877 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4873:4873 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4877 -> a
+com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.t:
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4856:4856 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4852:4857 -> <init>
-    1:1:java.util.Set access$1400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4850:4850 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4861:4864 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4868:4868 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4872:4872 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4868:4868 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4872 -> a
-    9:9:java.util.Set getItems():4876:4876 -> a
-com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.y$a:
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4887:4887 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4883:4888 -> <init>
+    1:1:java.util.Set access$1400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4881:4881 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4892:4895 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4899:4899 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4903:4903 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4899:4899 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4903 -> a
+    9:9:java.util.Set getItems():4907:4907 -> a
+com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.u$a:
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_MAIN_DEX_TRACING -> e
     com.android.tools.r8.shaking.Enqueuer$Mode INITIAL_MAIN_DEX_TRACING -> d
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_TREE_SHAKING -> c
@@ -107273,29 +106183,29 @@
     2:2:boolean isMainDexTracing():229 -> d
     3:3:boolean isGenerateMainDexList():225:225 -> d
     3:3:boolean isMainDexTracing():229 -> d
-com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey -> com.android.tools.r8.shaking.z:
+com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey -> com.android.tools.r8.shaking.v:
     boolean isInterface -> b
     com.android.tools.r8.graph.DexMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.Enqueuer$1):4994:4994 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMethod,boolean):4999:5001 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$2800(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4994:4994 -> a
-    1:1:boolean access$2900(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4994:4994 -> b
-    1:5:boolean equals(java.lang.Object):5006:5010 -> equals
-    1:1:int hashCode():5015:5015 -> hashCode
-com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.A:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.Enqueuer$1):5026:5026 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMethod,boolean):5031:5033 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$2900(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):5026:5026 -> a
+    1:1:boolean access$3000(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):5026:5026 -> b
+    1:5:boolean equals(java.lang.Object):5038:5042 -> equals
+    1:1:int hashCode():5047:5047 -> hashCode
+com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.w:
     java.util.Map deferredActions -> b
     java.util.Set items -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():4793:4793 -> <clinit>
-    1:4:void <init>():4793:4796 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4793:4793 -> <init>
-    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4793:4793 -> a
-    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4799:4801 -> a
-    5:5:boolean contains(java.lang.Object):4808:4808 -> a
-    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4812:4813 -> a
-    8:8:java.util.Set getItems():4820:4820 -> a
-    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4813:4813 -> b
-com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.B:
+    1:1:void <clinit>():4824:4824 -> <clinit>
+    1:4:void <init>():4824:4827 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4824:4824 -> <init>
+    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4824:4824 -> a
+    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4830:4832 -> a
+    5:5:boolean contains(java.lang.Object):4839:4839 -> a
+    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4843:4844 -> a
+    8:8:java.util.Set getItems():4851:4851 -> a
+    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4844:4844 -> b
+com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.x:
     java.util.Map methodProcessingContexts -> b
     java.util.Map liveMethods -> d
     boolean $assertionsDisabled -> i
@@ -107305,33 +106215,33 @@
     java.util.Map syntheticClasspathClasses -> f
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> a
     java.util.Map injectedInterfaces -> g
-    1:1:void <clinit>():3415:3415 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3438:3438 -> <init>
-    2:23:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3418:3439 -> <init>
-    1:1:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$getMethodContext$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):3444:3444 -> a
-    2:7:boolean isEmpty():3448:3453 -> a
-    8:9:void addLiveClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3458:3459 -> a
-    10:12:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3467:3469 -> a
-    13:15:void injectInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):3477:3479 -> a
-    16:16:java.util.Set lambda$injectInterface$1(com.android.tools.r8.graph.DexProgramClass):3478:3478 -> a
-    17:19:void addMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3495:3495 -> a
-    20:23:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3500:3503 -> a
+    1:1:void <clinit>():3446:3446 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3469:3469 -> <init>
+    2:23:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3449:3470 -> <init>
+    1:1:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$getMethodContext$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):3475:3475 -> a
+    2:7:boolean isEmpty():3479:3484 -> a
+    8:9:void addLiveClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3489:3490 -> a
+    10:12:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3498:3500 -> a
+    13:15:void injectInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):3508:3510 -> a
+    16:16:java.util.Set lambda$injectInterface$1(com.android.tools.r8.graph.DexProgramClass):3509:3509 -> a
+    17:19:void addMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3526:3526 -> a
+    20:23:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3531:3534 -> a
     24:24:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():71:71 -> a
-    24:24:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3503 -> a
-    25:43:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3505:3523 -> a
-    44:44:void lambda$enqueueWorkItems$2(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3510:3510 -> a
-    45:47:void lambda$enqueueWorkItems$3(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):3519:3519 -> a
-    48:48:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3526:3526 -> a
-    49:49:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3525:3525 -> a
-    1:1:void addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):3473:3473 -> b
-    1:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):3443:3443 -> c
-com.android.tools.r8.shaking.EnqueuerEvent -> com.android.tools.r8.internal.hi:
+    24:24:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3534 -> a
+    25:43:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3536:3554 -> a
+    44:44:void lambda$enqueueWorkItems$2(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3541:3541 -> a
+    45:47:void lambda$enqueueWorkItems$3(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):3550:3550 -> a
+    48:48:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3557:3557 -> a
+    49:49:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3556:3556 -> a
+    1:1:void addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):3504:3504 -> b
+    1:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):3474:3474 -> c
+com.android.tools.r8.shaking.EnqueuerEvent -> com.android.tools.r8.internal.Sh:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent asClassEvent() -> a
     com.android.tools.r8.graph.DexDefinition getDefinition(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     boolean isClassEvent() -> b
-com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent -> com.android.tools.r8.internal.di:
+com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent -> com.android.tools.r8.internal.Oh:
     com.android.tools.r8.graph.DexType clazz -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):53:54 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent asClassEvent() -> a
@@ -107340,41 +106250,41 @@
     2:2:com.android.tools.r8.graph.DexDefinition getDefinition(com.android.tools.r8.graph.DexDefinitionSupplier):59:59 -> a
     boolean isClassEvent() -> b
     1:1:com.android.tools.r8.graph.DexType getType():63:63 -> c
-com.android.tools.r8.shaking.EnqueuerEvent$InstantiatedClassEnqueuerEvent -> com.android.tools.r8.internal.ei:
+com.android.tools.r8.shaking.EnqueuerEvent$InstantiatedClassEnqueuerEvent -> com.android.tools.r8.internal.Ph:
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):123:123 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexType):127:127 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):142:142 -> a
     2:2:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":145,"2":146,"3":147}}
     145:145:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):142:142 -> a
-    146:146:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    146:146:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     146:146:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):142 -> a
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     147:147:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):142 -> a
     144:144:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):142:142 -> a
     1:3:boolean equals(java.lang.Object):150:152 -> equals
     1:1:int hashCode():159:159 -> hashCode
-com.android.tools.r8.shaking.EnqueuerEvent$LiveClassEnqueuerEvent -> com.android.tools.r8.internal.fi:
+com.android.tools.r8.shaking.EnqueuerEvent$LiveClassEnqueuerEvent -> com.android.tools.r8.internal.Qh:
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):80:80 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexType):84:84 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):99:99 -> a
     2:2:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":102,"2":103,"3":104}}
     102:102:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):99:99 -> a
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     103:103:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):99 -> a
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     104:104:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):99 -> a
     101:101:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):99:99 -> a
     1:3:boolean equals(java.lang.Object):107:109 -> equals
     1:1:int hashCode():116:116 -> hashCode
-com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent -> com.android.tools.r8.internal.gi:
+com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent -> com.android.tools.r8.internal.Rh:
     com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent INSTANCE -> a
     1:1:void <clinit>():165:165 -> <clinit>
     1:1:void <init>():167:167 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent get():170:170 -> c
-com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.C:
+com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.y:
     1:6:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.Set):31:36 -> a
     7:7:void lambda$createForFinalTreeShaking$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):35:35 -> a
     8:8:com.android.tools.r8.shaking.Enqueuer createForInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo):44:44 -> a
@@ -107382,15 +106292,15 @@
     10:10:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):71:71 -> a
     1:1:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo):22:22 -> b
     2:2:com.android.tools.r8.shaking.Enqueuer createForGenerateMainDexList(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):62:62 -> b
-com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.ji:
+com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.Uh:
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
-com.android.tools.r8.shaking.EnqueuerResult -> com.android.tools.r8.shaking.D:
+com.android.tools.r8.shaking.EnqueuerResult -> com.android.tools.r8.shaking.z:
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> a
     1:2:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):11:12 -> <init>
     1:1:com.android.tools.r8.shaking.AppInfoWithLiveness getAppInfo():16:16 -> a
-com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.ki:
+com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.Vh:
     com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.androidapi.AndroidApiLevelCompute) -> a
-com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.Z:
+com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.U:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
     java.util.Queue queue -> b
     1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.Queue,com.android.tools.r8.shaking.EnqueuerWorklist$1):23:23 -> <init>
@@ -107414,64 +106324,63 @@
     void enqueueTraceInvokeDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> b
     void enqueueTraceNewInstanceAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod) -> b
     com.android.tools.r8.shaking.EnqueuerWorklist nonPushable() -> b
-com.android.tools.r8.shaking.EnqueuerWorklist$1 -> com.android.tools.r8.shaking.E:
-com.android.tools.r8.shaking.EnqueuerWorklist$AssertAction -> com.android.tools.r8.shaking.F:
+com.android.tools.r8.shaking.EnqueuerWorklist$AssertAction -> com.android.tools.r8.shaking.A:
     com.android.tools.r8.utils.Action assertion -> a
     1:2:void <init>(com.android.tools.r8.utils.Action):32:33 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):38:38 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction -> com.android.tools.r8.internal.li:
+com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction -> com.android.tools.r8.internal.Wh:
     1:1:void <init>():25:25 -> <init>
     void run(com.android.tools.r8.shaking.Enqueuer) -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkAnnotationInstantiatedAction -> com.android.tools.r8.shaking.G:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkAnnotationInstantiatedAction -> com.android.tools.r8.shaking.B:
     com.android.tools.r8.graph.DexProgramClass target -> a
     com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reason -> b
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):123:125 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):130:130 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldAsReachableAction -> com.android.tools.r8.shaking.H:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldAsReachableAction -> com.android.tools.r8.shaking.C:
     com.android.tools.r8.graph.ProgramField field -> a
     com.android.tools.r8.shaking.KeepReason reason -> c
     com.android.tools.r8.graph.ProgramDefinition context -> b
     1:4:void <init>(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):83:86 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):91:91 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.shaking.I:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.shaking.D:
     com.android.tools.r8.graph.ProgramField field -> a
     com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness witness -> b
     1:3:void <init>(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):184:186 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):191:191 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.shaking.J:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.shaking.E:
     com.android.tools.r8.shaking.InstantiationReason instantiationReason -> c
     com.android.tools.r8.shaking.KeepReason keepReason -> d
     com.android.tools.r8.graph.DexProgramClass target -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     1:5:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):106:110 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):115:115 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkInterfaceInstantiatedAction -> com.android.tools.r8.shaking.K:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkInterfaceInstantiatedAction -> com.android.tools.r8.shaking.F:
     com.android.tools.r8.graph.DexProgramClass target -> a
     com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reason -> b
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):138:140 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):145:145 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.shaking.L:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.shaking.G:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.graph.ProgramMethod target -> a
     1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):169:171 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):176:176 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.shaking.M:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.shaking.H:
     com.android.tools.r8.graph.ProgramDefinition context -> b
     com.android.tools.r8.graph.ProgramMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):154:156 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):161:161 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.shaking.N:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.shaking.I:
     com.android.tools.r8.shaking.KeepReason reason -> c
     com.android.tools.r8.graph.ProgramDefinition context -> b
     com.android.tools.r8.graph.DexMethod target -> a
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):48:51 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):56:56 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.shaking.O:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.shaking.J:
     com.android.tools.r8.graph.ProgramMethod context -> b
     com.android.tools.r8.graph.DexMethod target -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):65:67 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):72:72 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$NonPushableEnqueuerWorklist -> com.android.tools.r8.shaking.P:
+com.android.tools.r8.shaking.EnqueuerWorklist$NonPushableEnqueuerWorklist -> com.android.tools.r8.shaking.K:
     1:1:void <init>(com.android.tools.r8.shaking.EnqueuerWorklist$PushableEnqueuerWorkList,com.android.tools.r8.shaking.EnqueuerWorklist$1):491:491 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.EnqueuerWorklist$PushableEnqueuerWorkList):494:494 -> <init>
     1:1:boolean enqueueAssertAction(com.android.tools.r8.utils.Action):508:508 -> a
@@ -107492,7 +106401,7 @@
     2:2:void enqueueTraceInvokeDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):594:594 -> b
     3:3:void enqueueTraceNewInstanceAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):599:599 -> b
     1:1:com.android.tools.r8.errors.Unreachable attemptToEnqueue():503:503 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist$PushableEnqueuerWorkList -> com.android.tools.r8.shaking.Q:
+com.android.tools.r8.shaking.EnqueuerWorklist$PushableEnqueuerWorkList -> com.android.tools.r8.shaking.L:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():371:371 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.Enqueuer):374:374 -> <init>
@@ -107503,12 +106412,10 @@
     6:6:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):416:416 -> a
     7:7:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
     7:7:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):416 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:10:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):416:418 -> a
     11:11:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):423:423 -> a
     12:12:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
     12:12:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):423 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:15:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):423:425 -> a
     16:19:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):438:441 -> a
     20:20:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):450:450 -> a
@@ -107521,54 +106428,52 @@
     2:2:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):430:430 -> b
     3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> b
     3:3:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):430 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:6:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):430:432 -> b
     7:7:void enqueueTraceInvokeDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):477:477 -> b
     8:8:void enqueueTraceNewInstanceAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):482:482 -> b
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceAnnotationAction -> com.android.tools.r8.shaking.S:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceAnnotationAction -> com.android.tools.r8.shaking.M:
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind annotatedKind -> c
     com.android.tools.r8.graph.DexAnnotation annotation -> b
     com.android.tools.r8.graph.ProgramDefinition annotatedItem -> a
     1:4:void <init>(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):201:204 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):209:209 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceCodeAction -> com.android.tools.r8.shaking.T:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceCodeAction -> com.android.tools.r8.shaking.N:
     com.android.tools.r8.graph.ProgramMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):216:217 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):222:222 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceConstClassAction -> com.android.tools.r8.shaking.U:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceConstClassAction -> com.android.tools.r8.shaking.O:
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     boolean ignoreCompatRules -> c
     1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):232:235 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):240:240 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceInvokeDirectAction -> com.android.tools.r8.shaking.V:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceInvokeDirectAction -> com.android.tools.r8.shaking.P:
     com.android.tools.r8.graph.ProgramMethod context -> b
     com.android.tools.r8.graph.DexMethod invokedMethod -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):249:251 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):256:256 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceMethodDefinitionExcludingCodeAction -> com.android.tools.r8.shaking.W:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceMethodDefinitionExcludingCodeAction -> com.android.tools.r8.shaking.Q:
     com.android.tools.r8.graph.ProgramMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):263:264 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):269:269 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceNewInstanceAction -> com.android.tools.r8.shaking.X:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceNewInstanceAction -> com.android.tools.r8.shaking.S:
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):278:280 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):285:285 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceStaticFieldReadAction -> com.android.tools.r8.shaking.Y:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceStaticFieldReadAction -> com.android.tools.r8.shaking.T:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):294:296 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):301:301 -> a
-com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier -> com.android.tools.r8.shaking.d0:
+com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier -> com.android.tools.r8.shaking.X:
     java.util.Map newFieldAccessContexts -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$1):17:17 -> <init>
     2:3:void <init>(java.util.Map):60:61 -> <init>
     1:1:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder builder():65:65 -> a
     2:3:void modify(com.android.tools.r8.graph.AppView):69:70 -> a
     4:7:void lambda$modify$0(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldAccessContexts):72:75 -> a
-com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$1 -> com.android.tools.r8.shaking.a0:
-com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder -> com.android.tools.r8.shaking.b0:
+com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder -> com.android.tools.r8.shaking.V:
     java.util.Map newFieldAccessContexts -> a
     1:1:void <init>():84:84 -> <init>
     2:2:void <init>():81:81 -> <init>
@@ -107579,7 +106484,7 @@
     2:2:void recordFieldWrittenInContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):100:100 -> b
     1:1:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder recordFieldReadInUnknownContext(com.android.tools.r8.graph.DexField):95:95 -> c
     1:1:void recordFieldWriteInUnknownContext(com.android.tools.r8.graph.DexField):104:104 -> d
-com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldAccessContexts -> com.android.tools.r8.shaking.c0:
+com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldAccessContexts -> com.android.tools.r8.shaking.W:
     com.android.tools.r8.graph.AbstractAccessContexts writesWithContexts -> b
     com.android.tools.r8.graph.AbstractAccessContexts readsWithContexts -> a
     boolean $assertionsDisabled -> c
@@ -107610,7 +106515,7 @@
     12:12:void addWriteContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):48 -> b
     13:13:void addWriteContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):48:48 -> b
     14:14:void recordWriteInUnknownContext():53:53 -> b
-com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.uk:
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.Zj:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -107629,8 +106534,8 @@
     1:1:boolean com.android.tools.r8.shaking.FilteredClassPath.isUnfiltered():123:123 -> toString
     1:1:java.lang.String toString():128 -> toString
     2:16:java.lang.String toString():129:143 -> toString
-com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.cm:
-com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.f0:
+com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.Fl:
+com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.Z:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map annotationNodes -> d
     boolean $assertionsDisabled -> j
@@ -107755,14 +106660,14 @@
     31:31:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):440:440 -> b
     31:31:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$1(com.android.tools.r8.graph.DexType):462 -> b
     32:34:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$1(com.android.tools.r8.graph.DexType):463:465 -> b
-com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.shaking.e0:
+com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.shaking.Y:
     com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness INSTANCE -> a
     1:1:void <clinit>():319:319 -> <clinit>
     1:1:void <init>():321:321 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():327:327 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):332:332 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():317:317 -> b
-com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.shaking.g0:
+com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.shaking.a0:
     1:1:void <init>():11:11 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
     2:22:boolean doEquivalent(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardIfRule):15:35 -> a
@@ -107777,7 +106682,7 @@
     41:45:int com.android.tools.r8.com.google.common.collect.Iterables.size(java.lang.Iterable):126 -> a
     41:45:int doHash(com.android.tools.r8.shaking.ProguardIfRule):56 -> a
     41:45:int doHash(java.lang.Object):11 -> a
-com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.shaking.h0:
+com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.shaking.b0:
     java.util.concurrent.ExecutorService executorService -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List futures -> e
@@ -107791,19 +106696,19 @@
     2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer,java.util.concurrent.ExecutorService,java.util.Map,com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder):48:64 -> <init>
     1:19:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():68:86 -> a
     20:28:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():85:93 -> a
-    29:29:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):814:814 -> a
+    29:29:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):815:815 -> a
     29:29:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):202 -> a
     29:29:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():95 -> a
-    30:31:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):818:819 -> a
+    30:31:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):819:820 -> a
     30:31:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):205 -> a
     30:31:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():95 -> a
     32:42:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):208:218 -> a
     32:42:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():95 -> a
     43:71:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():99:127 -> a
-    72:72:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):814:814 -> a
+    72:72:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):815:815 -> a
     72:72:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):202 -> a
     72:72:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():129 -> a
-    73:74:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):818:819 -> a
+    73:74:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):819:820 -> a
     73:74:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):205 -> a
     73:74:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():129 -> a
     75:85:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):208:218 -> a
@@ -107823,39 +106728,31 @@
     134:134:void lambda$run$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData,java.util.List,com.android.tools.r8.shaking.ProguardIfRule):137 -> a
     135:135:void lambda$run$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData,java.util.List,com.android.tools.r8.shaking.ProguardIfRule):138:138 -> a
     136:145:boolean isEffectivelyLive(com.android.tools.r8.graph.DexProgramClass):184:193 -> a
-    146:147:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):225:226 -> a
-    148:148:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():680:680 -> a
-    148:148:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):227 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    149:157:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):227:235 -> a
-    158:179:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):233:254 -> a
-    180:219:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):252:291 -> a
-    220:225:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):290:295 -> a
-    226:233:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):294:301 -> a
-    234:234:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():680:680 -> a
-    234:234:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):307 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    235:235:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):307:307 -> a
-    236:236:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):160:160 -> a
-    236:236:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):308 -> a
-    237:240:boolean lambda$evaluateIfRuleMembersAndMaterialize$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):256:259 -> a
-    241:241:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    241:241:boolean lambda$evaluateIfRuleMembersAndMaterialize$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):259 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    242:242:boolean lambda$evaluateIfRuleMembersAndMaterialize$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):259:259 -> a
-    243:243:com.android.tools.r8.graph.DexClassAndField lambda$evaluateIfRuleMembersAndMaterialize$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):291:291 -> a
-    244:245:boolean lambda$evaluateIfRuleMembersAndMaterialize$6(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):303:304 -> a
-    246:251:boolean isFieldInlinedByJavaC(com.android.tools.r8.graph.DexEncodedField):317:322 -> a
-    246:251:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):239 -> a
-    252:252:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
-    252:252:boolean isFieldInlinedByJavaC(com.android.tools.r8.graph.DexEncodedField):322 -> a
-    252:252:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):239 -> a
-    253:262:boolean isFieldInlinedByJavaC(com.android.tools.r8.graph.DexEncodedField):325:334 -> a
-    253:262:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):239 -> a
-    263:272:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):240:249 -> a
-    273:312:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):338:377 -> a
-    1:1:com.android.tools.r8.graph.DexClassAndMethod lambda$evaluateIfRuleMembersAndMaterialize$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):295:295 -> b
-com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.shaking.k0:
+    146:148:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):225:227 -> a
+    149:149:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():680:680 -> a
+    149:149:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):227 -> a
+    150:158:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):227:235 -> a
+    159:179:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):233:253 -> a
+    180:219:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):251:290 -> a
+    220:225:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):289:294 -> a
+    226:239:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):293:306 -> a
+    240:240:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():680:680 -> a
+    240:240:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):306 -> a
+    241:241:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):306:306 -> a
+    242:242:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):160:160 -> a
+    242:242:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):307 -> a
+    243:246:boolean lambda$evaluateIfRuleMembersAndMaterialize$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):255:258 -> a
+    247:247:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    247:247:boolean lambda$evaluateIfRuleMembersAndMaterialize$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):258 -> a
+    248:248:boolean lambda$evaluateIfRuleMembersAndMaterialize$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):258:258 -> a
+    249:249:com.android.tools.r8.graph.DexClassAndField lambda$evaluateIfRuleMembersAndMaterialize$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):290:290 -> a
+    250:251:boolean lambda$evaluateIfRuleMembersAndMaterialize$6(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):302:303 -> a
+    252:257:boolean isFieldInlinedByJavaC(com.android.tools.r8.graph.DexEncodedField):316:321 -> a
+    252:257:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):239 -> a
+    258:266:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):240:248 -> a
+    267:306:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):325:364 -> a
+    1:1:com.android.tools.r8.graph.DexClassAndMethod lambda$evaluateIfRuleMembersAndMaterialize$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):294:294 -> b
+com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.shaking.d0:
     com.android.tools.r8.shaking.InlineRule$Type type -> r
     int $r8$clinit -> s
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.InlineRule$Type):75:89 -> <init>
@@ -107871,18 +106768,17 @@
     127:127:java.lang.String typeString():106:106 -> C
     128:128:java.lang.String typeString():104:104 -> C
     1:1:com.android.tools.r8.shaking.InlineRule$Type getType():97:97 -> D
-com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.shaking.i0:
-com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.shaking.j0:
+com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.shaking.c0:
     com.android.tools.r8.shaking.InlineRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):20:20 -> <init>
     2:2:void <init>():23:23 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.InlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.tp:
+com.android.tools.r8.shaking.InlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Vo:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.shaking.InstantiatedObject -> com.android.tools.r8.shaking.n0:
+com.android.tools.r8.shaking.InstantiatedObject -> com.android.tools.r8.shaking.g0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():10:10 -> <init>
@@ -107895,17 +106791,17 @@
     com.android.tools.r8.graph.DexProgramClass asClass() -> a
     com.android.tools.r8.ir.desugar.LambdaDescriptor asLambda() -> b
     boolean isClass() -> c
-com.android.tools.r8.shaking.InstantiatedObject$InstantiatedClass -> com.android.tools.r8.shaking.l0:
+com.android.tools.r8.shaking.InstantiatedObject$InstantiatedClass -> com.android.tools.r8.shaking.e0:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():46:46 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass):49:51 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass asClass():61:61 -> a
-com.android.tools.r8.shaking.InstantiatedObject$InstantiatedLambda -> com.android.tools.r8.shaking.m0:
+com.android.tools.r8.shaking.InstantiatedObject$InstantiatedLambda -> com.android.tools.r8.shaking.f0:
     com.android.tools.r8.ir.desugar.LambdaDescriptor lambdaDescriptor -> b
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaDescriptor):68:69 -> <init>
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor asLambda():79:79 -> b
-com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.iq:
+com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.Kp:
     com.android.tools.r8.shaking.InstantiationReason NEW_INSTANCE_INSTRUCTION -> d
     com.android.tools.r8.shaking.InstantiationReason REFERENCED_IN_METHOD_HANDLE -> e
     com.android.tools.r8.shaking.InstantiationReason KEEP_RULE -> b
@@ -107913,7 +106809,7 @@
     com.android.tools.r8.shaking.InstantiationReason REFLECTION -> f
     1:5:void <clinit>():8:12 -> <clinit>
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
-com.android.tools.r8.shaking.KeepClassInfo -> com.android.tools.r8.shaking.r0:
+com.android.tools.r8.shaking.KeepClassInfo -> com.android.tools.r8.shaking.j0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.shaking.KeepClassInfo BOTTOM -> i
     com.android.tools.r8.shaking.KeepClassInfo TOP -> h
@@ -107940,8 +106836,7 @@
     1:1:com.android.tools.r8.shaking.KeepClassInfo$Joiner newEmptyJoiner():32 -> o
     2:2:com.android.tools.r8.shaking.KeepClassInfo$Joiner newEmptyJoiner():32:32 -> o
     1:1:com.android.tools.r8.shaking.KeepClassInfo top():24:24 -> p
-com.android.tools.r8.shaking.KeepClassInfo$1 -> com.android.tools.r8.shaking.o0:
-com.android.tools.r8.shaking.KeepClassInfo$Builder -> com.android.tools.r8.shaking.p0:
+com.android.tools.r8.shaking.KeepClassInfo$Builder -> com.android.tools.r8.shaking.h0:
     1:1:void <init>(com.android.tools.r8.shaking.KeepClassInfo$1):88:88 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.shaking.KeepClassInfo$1):88:88 -> <init>
     3:3:void <init>():91:91 -> <init>
@@ -107956,7 +106851,7 @@
     1:1:com.android.tools.r8.shaking.KeepClassInfo getTopInfo():100:100 -> i
     1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():88 -> i
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> t
-com.android.tools.r8.shaking.KeepClassInfo$Joiner -> com.android.tools.r8.shaking.q0:
+com.android.tools.r8.shaking.KeepClassInfo$Joiner -> com.android.tools.r8.shaking.i0:
     1:1:void <init>(com.android.tools.r8.shaking.KeepClassInfo):127:127 -> <init>
     com.android.tools.r8.shaking.KeepClassInfo$Joiner asClassJoiner() -> a
     1:1:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):124:124 -> a
@@ -107964,7 +106859,7 @@
     2:2:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):124 -> a
     3:3:com.android.tools.r8.shaking.KeepClassInfo$Joiner merge(com.android.tools.r8.shaking.KeepClassInfo$Joiner):138:138 -> a
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> k
-com.android.tools.r8.shaking.KeepFieldInfo -> com.android.tools.r8.shaking.v0:
+com.android.tools.r8.shaking.KeepFieldInfo -> com.android.tools.r8.shaking.m0:
     boolean $assertionsDisabled -> k
     com.android.tools.r8.shaking.KeepFieldInfo TOP -> i
     com.android.tools.r8.shaking.KeepFieldInfo BOTTOM -> j
@@ -107993,8 +106888,7 @@
     1:1:com.android.tools.r8.shaking.KeepFieldInfo$Joiner newEmptyJoiner():24 -> q
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Joiner newEmptyJoiner():24:24 -> q
     1:1:com.android.tools.r8.shaking.KeepFieldInfo top():16:16 -> r
-com.android.tools.r8.shaking.KeepFieldInfo$1 -> com.android.tools.r8.shaking.s0:
-com.android.tools.r8.shaking.KeepFieldInfo$Builder -> com.android.tools.r8.shaking.t0:
+com.android.tools.r8.shaking.KeepFieldInfo$Builder -> com.android.tools.r8.shaking.k0:
     boolean allowFieldTypeStrengthening -> i
     1:1:void <init>(com.android.tools.r8.shaking.KeepFieldInfo$1):64:64 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.KeepFieldInfo,com.android.tools.r8.shaking.KeepFieldInfo$1):64:64 -> <init>
@@ -108034,13 +106928,11 @@
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder setAllowFieldTypeStrengthening(boolean):92:92 -> x
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder allowFieldTypeStrengthening():97 -> x
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder makeBottom():84 -> x
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     1:1:com.android.tools.r8.shaking.KeepFieldInfo$Builder makeTop():79:79 -> y
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder setAllowFieldTypeStrengthening(boolean):92:92 -> y
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder disallowFieldTypeStrengthening():101 -> y
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder makeTop():79 -> y
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-com.android.tools.r8.shaking.KeepFieldInfo$Joiner -> com.android.tools.r8.shaking.u0:
+com.android.tools.r8.shaking.KeepFieldInfo$Joiner -> com.android.tools.r8.shaking.l0:
     1:1:void <init>(com.android.tools.r8.shaking.KeepFieldInfo):139:139 -> <init>
     1:1:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):136:136 -> a
     2:4:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):155:157 -> a
@@ -108048,7 +106940,7 @@
     com.android.tools.r8.shaking.KeepFieldInfo$Joiner asFieldJoiner() -> b
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> k
     1:1:com.android.tools.r8.shaking.KeepFieldInfo$Joiner disallowFieldTypeStrengthening():143:143 -> n
-com.android.tools.r8.shaking.KeepInfo -> com.android.tools.r8.shaking.y0:
+com.android.tools.r8.shaking.KeepInfo -> com.android.tools.r8.shaking.p0:
     boolean allowShrinking -> e
     boolean checkDiscarded -> f
     boolean requireAccessModificationForRepackaging -> g
@@ -108065,58 +106957,50 @@
     3:3:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$newEmptyJoinerFor$1(com.android.tools.r8.graph.DexField):57:57 -> a
     4:4:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$newEmptyJoinerFor$2(com.android.tools.r8.graph.DexMethod):58:58 -> a
     5:5:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108:108 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():613:613 -> a
     6:6:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:boolean internalIsMinificationAllowed():112:112 -> a
     7:7:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108 -> a
-    8:8:boolean internalIsAccessModificationAllowed():170:170 -> a
-    9:9:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):221:221 -> a
-    10:10:boolean internalIsAccessModificationAllowed():170:170 -> a
-    10:10:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):221 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):221:221 -> a
-    12:12:boolean internalIsAnnotationRemovalAllowed():74:74 -> a
-    12:12:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):222 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):222:222 -> a
-    14:14:boolean internalIsMinificationAllowed():112:112 -> a
-    14:14:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):223 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:15:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):223:223 -> a
-    16:16:boolean internalIsOptimizationAllowed():126:126 -> a
-    16:16:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):224 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):224:224 -> a
-    18:18:boolean internalIsShrinkingAllowed():140:140 -> a
-    18:18:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):225 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):225:225 -> a
-    20:20:boolean internalIsCheckDiscardedEnabled():82:82 -> a
-    20:20:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):226 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:22:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():689:690 -> a
-    21:22:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    23:23:boolean internalIsAccessModificationAllowed():170:170 -> a
-    23:23:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165 -> a
-    1:1:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122:122 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():617:617 -> b
-    2:2:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean internalIsOptimizationAllowed():126:126 -> b
-    3:3:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122 -> b
-    4:4:boolean internalIsAccessModificationRequiredForRepackaging():153:153 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():602 -> b
-    5:5:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):70 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    6:6:boolean internalIsAnnotationRemovalAllowed():74:74 -> b
-    6:6:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):70 -> b
+    8:8:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165:165 -> a
+    9:10:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():690:691 -> a
+    9:10:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165 -> a
+    11:11:boolean internalIsAccessModificationAllowed():170:170 -> a
+    11:11:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165 -> a
+    12:12:boolean internalIsAccessModificationAllowed():170:170 -> a
+    13:13:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):221:221 -> a
+    14:14:boolean internalIsAccessModificationAllowed():170:170 -> a
+    14:14:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):221 -> a
+    15:16:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):221:222 -> a
+    17:17:boolean internalIsAnnotationRemovalAllowed():74:74 -> a
+    17:17:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):222 -> a
+    18:19:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):222:223 -> a
+    20:20:boolean internalIsMinificationAllowed():112:112 -> a
+    20:20:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):223 -> a
+    21:22:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):223:224 -> a
+    23:23:boolean internalIsOptimizationAllowed():126:126 -> a
+    23:23:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):224 -> a
+    24:25:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):224:225 -> a
+    26:26:boolean internalIsShrinkingAllowed():140:140 -> a
+    26:26:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):225 -> a
+    27:28:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):225:226 -> a
+    29:29:boolean internalIsCheckDiscardedEnabled():82:82 -> a
+    29:29:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):226 -> a
+    1:1:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):70:70 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():628:628 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():603 -> b
+    2:2:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):70 -> b
+    3:3:boolean internalIsAnnotationRemovalAllowed():74:74 -> b
+    3:3:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):70 -> b
+    4:4:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122:122 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():618:618 -> b
+    5:5:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122 -> b
+    6:6:boolean internalIsOptimizationAllowed():126:126 -> b
+    6:6:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122 -> b
+    7:7:boolean internalIsAccessModificationRequiredForRepackaging():153:153 -> b
     1:1:boolean internalIsAnnotationRemovalAllowed():74:74 -> c
     2:2:boolean isPinned(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):98:98 -> c
     3:3:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):194:194 -> c
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> c
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():628:628 -> c
     4:4:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):197 -> c
     5:5:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):197:197 -> c
     1:1:boolean internalIsCheckDiscardedEnabled():82:82 -> d
@@ -108125,21 +107009,20 @@
     4:4:boolean isCheckDiscardedEnabled(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):78 -> d
     4:4:boolean isParameterRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):88 -> d
     5:5:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):136:136 -> d
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():607:607 -> d
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():608:608 -> d
     6:6:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):136 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:boolean internalIsShrinkingAllowed():140:140 -> d
     7:7:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):136 -> d
     1:1:boolean internalIsMinificationAllowed():112:112 -> e
     2:2:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):174:174 -> e
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> e
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():628:628 -> e
     3:3:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):177 -> e
     4:4:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):177:177 -> e
     1:1:boolean internalIsOptimizationAllowed():126:126 -> f
     1:1:boolean internalIsShrinkingAllowed():140:140 -> g
     1:1:boolean internalIsCheckDiscardedEnabled():82:82 -> h
     1:1:boolean isCheckDiscardedEnabled(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):78 -> h
-com.android.tools.r8.shaking.KeepInfo$Builder -> com.android.tools.r8.shaking.w0:
+com.android.tools.r8.shaking.KeepInfo$Builder -> com.android.tools.r8.shaking.n0:
     boolean allowOptimization -> e
     boolean allowShrinking -> f
     boolean checkDiscarded -> g
@@ -108225,7 +107108,7 @@
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> t
     1:2:com.android.tools.r8.shaking.KeepInfo$Builder setCheckDiscarded(boolean):383:384 -> u
     1:2:com.android.tools.r8.shaking.KeepInfo$Builder setCheckDiscarded():388 -> u
-com.android.tools.r8.shaking.KeepInfo$Joiner -> com.android.tools.r8.shaking.x0:
+com.android.tools.r8.shaking.KeepInfo$Joiner -> com.android.tools.r8.shaking.o0:
     java.util.Set rules -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.shaking.KeepInfo$Builder builder -> a
@@ -108249,7 +107132,7 @@
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> k
     1:2:com.android.tools.r8.shaking.KeepInfo$Joiner setCheckDiscarded():528:529 -> l
     1:2:com.android.tools.r8.shaking.KeepInfo$Joiner top():493:494 -> m
-com.android.tools.r8.shaking.KeepInfoCollection -> com.android.tools.r8.shaking.A0:
+com.android.tools.r8.shaking.KeepInfoCollection -> com.android.tools.r8.shaking.r0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():40:40 -> <clinit>
     1:1:void <init>():40:40 -> <init>
@@ -108302,7 +107185,7 @@
     35:35:com.android.tools.r8.shaking.KeepInfo getInfo(com.android.tools.r8.graph.ProgramDefinition):153:153 -> a
     void forEachPinnedMethod(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions) -> b
     void forEachPinnedType(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions) -> c
-com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection -> com.android.tools.r8.shaking.z0:
+com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection -> com.android.tools.r8.shaking.q0:
     java.util.Map keepClassInfo -> b
     java.util.Map keepMethodInfo -> c
     java.util.Map keepFieldInfo -> d
@@ -108328,73 +107211,74 @@
     27:34:void removeKeepInfoForMergedClasses(com.android.tools.r8.graph.PrunedItems):249:256 -> a
     35:94:com.android.tools.r8.shaking.KeepInfoCollection rewrite(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions):275:334 -> a
     95:95:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):278:278 -> a
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     96:96:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):278 -> a
     97:101:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):279:283 -> a
     102:102:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):282:282 -> a
     103:109:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):279:285 -> a
-    110:110:boolean lambda$rewrite$1(java.lang.Boolean):300:300 -> a
-    111:114:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):310:313 -> a
-    115:119:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):311:315 -> a
-    120:120:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):324:324 -> a
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    121:121:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):324 -> a
-    122:125:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):325:328 -> a
-    126:126:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    126:126:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):290 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    127:129:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):291:291 -> a
-    132:135:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):294:297 -> a
-    136:136:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():141:141 -> a
-    136:136:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):297 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    137:137:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):298:298 -> a
-    138:138:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():141:141 -> a
-    138:138:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):298 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    139:139:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):298:298 -> a
-    140:144:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):296:300 -> a
-    145:152:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):295:302 -> a
-    153:153:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    153:153:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):302 -> a
-    154:156:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):301:303 -> a
-    157:162:java.util.Map rewriteRuleInstances(java.util.Map,java.util.function.Function,java.util.function.Supplier):342:342 -> a
-    163:163:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$rewriteRuleInstances$5(java.util.function.Supplier,java.lang.Object,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.shaking.KeepInfo$Joiner):348:348 -> a
-    164:180:void forEachRuleInstance(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer):357:373 -> a
-    181:183:void lambda$forEachRuleInstance$6(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo$Joiner):359:361 -> a
-    184:187:void lambda$forEachRuleInstance$7(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):367:370 -> a
-    188:191:void lambda$forEachRuleInstance$8(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):376:379 -> a
-    192:192:void lambda$evaluateMethodRule$11(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):404:404 -> a
-    193:193:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):413:413 -> a
-    194:194:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):413:413 -> a
-    194:194:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):429 -> a
-    195:200:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):430:435 -> a
-    201:203:com.android.tools.r8.shaking.KeepInfo com.android.tools.r8.shaking.KeepInfo$Joiner.join():558:560 -> a
-    201:203:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):436 -> a
-    204:206:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):436:438 -> a
-    207:208:com.android.tools.r8.shaking.KeepMethodInfo getMethodInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):418:419 -> a
-    209:210:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):424:425 -> a
-    211:211:void keepMethod(com.android.tools.r8.graph.ProgramMethod):461:461 -> a
-    212:212:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():477:477 -> a
-    212:212:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):403 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    213:216:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):404:407 -> a
-    217:217:void keepField(com.android.tools.r8.graph.ProgramField):502:502 -> a
-    218:218:com.android.tools.r8.shaking.KeepInfoCollection mutate(java.util.function.Consumer):507:507 -> a
-    219:219:boolean verifyPinnedTypesAreLive(java.util.Set,com.android.tools.r8.utils.InternalOptions):513:513 -> a
-    220:220:void lambda$verifyPinnedTypesAreLive$12(com.android.tools.r8.utils.InternalOptions,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):515:515 -> a
-    221:222:void lambda$forEachPinnedType$13(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):524:525 -> a
-    223:224:void lambda$forEachPinnedMethod$14(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):534:535 -> a
-    225:225:void forEachPinnedField(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):542:542 -> a
-    226:227:void lambda$forEachPinnedField$15(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):544:545 -> a
+    110:110:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):290:290 -> a
+    111:111:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
+    111:111:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):290 -> a
+    112:114:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):291:291 -> a
+    117:120:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):294:297 -> a
+    121:121:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():141:141 -> a
+    121:121:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):297 -> a
+    122:122:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):298:298 -> a
+    123:123:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():141:141 -> a
+    123:123:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):298 -> a
+    124:124:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):298:298 -> a
+    125:129:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):296:300 -> a
+    130:137:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):295:302 -> a
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    138:138:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):302 -> a
+    139:141:void lambda$rewrite$2(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):301:303 -> a
+    142:142:boolean lambda$rewrite$1(java.lang.Boolean):300:300 -> a
+    143:143:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):310:310 -> a
+    144:144:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    144:144:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):310 -> a
+    145:148:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):311:311 -> a
+    151:152:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):314:315 -> a
+    153:153:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):324:324 -> a
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    154:154:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):324 -> a
+    155:158:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):325:328 -> a
+    159:164:java.util.Map rewriteRuleInstances(java.util.Map,java.util.function.Function,java.util.function.Supplier):342:342 -> a
+    165:165:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$rewriteRuleInstances$5(java.util.function.Supplier,java.lang.Object,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.shaking.KeepInfo$Joiner):348:348 -> a
+    166:182:void forEachRuleInstance(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer):357:373 -> a
+    183:185:void lambda$forEachRuleInstance$6(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo$Joiner):359:361 -> a
+    186:189:void lambda$forEachRuleInstance$7(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):367:370 -> a
+    190:193:void lambda$forEachRuleInstance$8(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):376:379 -> a
+    194:194:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):403:403 -> a
+    195:195:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():477:477 -> a
+    195:195:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):403 -> a
+    196:199:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):404:407 -> a
+    200:200:void lambda$evaluateMethodRule$11(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):404:404 -> a
+    201:201:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):413:413 -> a
+    202:202:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):413:413 -> a
+    202:202:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):429 -> a
+    203:208:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):430:435 -> a
+    209:211:com.android.tools.r8.shaking.KeepInfo com.android.tools.r8.shaking.KeepInfo$Joiner.join():558:560 -> a
+    209:211:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):436 -> a
+    212:214:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):436:438 -> a
+    215:216:com.android.tools.r8.shaking.KeepMethodInfo getMethodInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):418:419 -> a
+    217:218:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):424:425 -> a
+    219:219:void keepMethod(com.android.tools.r8.graph.ProgramMethod):461:461 -> a
+    220:220:void keepField(com.android.tools.r8.graph.ProgramField):502:502 -> a
+    221:221:com.android.tools.r8.shaking.KeepInfoCollection mutate(java.util.function.Consumer):507:507 -> a
+    222:222:boolean verifyPinnedTypesAreLive(java.util.Set,com.android.tools.r8.utils.InternalOptions):513:513 -> a
+    223:223:void lambda$verifyPinnedTypesAreLive$12(com.android.tools.r8.utils.InternalOptions,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):515:515 -> a
+    224:225:void lambda$forEachPinnedType$13(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):524:525 -> a
+    226:227:void lambda$forEachPinnedMethod$14(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):534:535 -> a
+    228:228:void forEachPinnedField(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):542:542 -> a
+    229:230:void lambda$forEachPinnedField$15(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):544:545 -> a
     1:8:void removeKeepInfoForPrunedItems(com.android.tools.r8.graph.PrunedItems):261:268 -> b
     9:9:void keepClass(com.android.tools.r8.graph.DexProgramClass):443:443 -> b
     10:10:void forEachPinnedMethod(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):532:532 -> b
     1:1:void forEachPinnedType(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):522:522 -> c
-com.android.tools.r8.shaking.KeepMemberInfo -> com.android.tools.r8.shaking.B0:
+com.android.tools.r8.shaking.KeepMemberInfo -> com.android.tools.r8.shaking.s0:
     1:1:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):15:15 -> <init>
     1:3:boolean isRepackagingAllowed(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):21:23 -> a
-com.android.tools.r8.shaking.KeepMethodInfo -> com.android.tools.r8.shaking.F0:
+com.android.tools.r8.shaking.KeepMethodInfo -> com.android.tools.r8.shaking.v0:
     boolean $assertionsDisabled -> o
     boolean allowInlining -> i
     boolean allowMethodStaticizing -> j
@@ -108412,12 +107296,11 @@
     1:1:boolean isInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):62:62 -> g
     2:2:boolean internalIsInliningAllowed():66:66 -> g
     2:2:boolean isInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):62 -> g
-    1:2:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):70:71 -> h
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():695:695 -> h
-    3:3:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):72 -> h
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean internalIsMethodStaticizingAllowed():77:77 -> h
-    4:4:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):73 -> h
+    1:3:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):70:72 -> h
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():696:696 -> h
+    4:4:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):72 -> h
+    5:5:boolean internalIsMethodStaticizingAllowed():77:77 -> h
+    5:5:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):73 -> h
     1:1:com.android.tools.r8.shaking.KeepMethodInfo access$200():7:7 -> i
     2:3:boolean isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):81:82 -> i
     4:4:boolean internalIsParameterTypeStrengtheningAllowed():87:87 -> i
@@ -108447,8 +107330,7 @@
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner newEmptyJoiner():24 -> t
     2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner newEmptyJoiner():24:24 -> t
     1:1:com.android.tools.r8.shaking.KeepMethodInfo top():16:16 -> u
-com.android.tools.r8.shaking.KeepMethodInfo$1 -> com.android.tools.r8.shaking.C0:
-com.android.tools.r8.shaking.KeepMethodInfo$Builder -> com.android.tools.r8.shaking.D0:
+com.android.tools.r8.shaking.KeepMethodInfo$Builder -> com.android.tools.r8.shaking.t0:
     boolean allowReturnTypeStrengthening -> m
     boolean allowClassInlining -> i
     boolean allowInlining -> j
@@ -108463,40 +107345,38 @@
     1:1:boolean isMethodStaticizingAllowed():171:171 -> C
     1:1:boolean isParameterTypeStrengtheningAllowed():188:188 -> D
     1:1:boolean isReturnTypeStrengtheningAllowed():205:205 -> E
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():269:269 -> F
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClassInlining(boolean):141:141 -> F
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowClassInlining():146 -> F
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():270 -> F
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowInlining(boolean):158:158 -> F
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowInlining():163 -> F
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():271 -> F
-    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowMethodStaticizing(boolean):175:175 -> F
-    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowMethodStaticizing():180 -> F
-    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():272 -> F
-    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterTypeStrengthening(boolean):192:192 -> F
-    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowParameterTypeStrengthening():197 -> F
-    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():273 -> F
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):209:209 -> F
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowReturnTypeStrengthening():214 -> F
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():274 -> F
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():259:259 -> G
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClassInlining(boolean):141:141 -> G
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowClassInlining():150 -> G
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():260 -> G
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowInlining(boolean):158:158 -> G
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowInlining():167 -> G
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():261 -> G
-    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowMethodStaticizing(boolean):175:175 -> G
-    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowMethodStaticizing():184 -> G
-    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():262 -> G
-    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterTypeStrengthening(boolean):192:192 -> G
-    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowParameterTypeStrengthening():201 -> G
-    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():263 -> G
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):209:209 -> G
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowReturnTypeStrengthening():218 -> G
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():264 -> G
+    1:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():269:270 -> F
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClassInlining(boolean):141:141 -> F
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowClassInlining():146 -> F
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():270 -> F
+    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowInlining(boolean):158:158 -> F
+    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowInlining():163 -> F
+    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():271 -> F
+    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowMethodStaticizing(boolean):175:175 -> F
+    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowMethodStaticizing():180 -> F
+    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():272 -> F
+    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterTypeStrengthening(boolean):192:192 -> F
+    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowParameterTypeStrengthening():197 -> F
+    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():273 -> F
+    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):209:209 -> F
+    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowReturnTypeStrengthening():214 -> F
+    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():274 -> F
+    1:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():259:260 -> G
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClassInlining(boolean):141:141 -> G
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowClassInlining():150 -> G
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():260 -> G
+    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowInlining(boolean):158:158 -> G
+    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowInlining():167 -> G
+    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():261 -> G
+    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowMethodStaticizing(boolean):175:175 -> G
+    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowMethodStaticizing():184 -> G
+    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():262 -> G
+    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterTypeStrengthening(boolean):192:192 -> G
+    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowParameterTypeStrengthening():201 -> G
+    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():263 -> G
+    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):209:209 -> G
+    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowReturnTypeStrengthening():218 -> G
+    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():264 -> G
     1:1:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):115:115 -> a
     2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):243:243 -> a
     2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):115 -> a
@@ -108582,7 +107462,7 @@
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowParameterTypeStrengthening():201 -> y
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):209:209 -> z
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowReturnTypeStrengthening():218 -> z
-com.android.tools.r8.shaking.KeepMethodInfo$Joiner -> com.android.tools.r8.shaking.E0:
+com.android.tools.r8.shaking.KeepMethodInfo$Joiner -> com.android.tools.r8.shaking.u0:
     1:1:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):281:281 -> <init>
     1:1:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):278:278 -> a
     2:7:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):317:322 -> a
@@ -108595,14 +107475,13 @@
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowMethodStaticizing():295:295 -> p
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterTypeStrengthening():300:300 -> q
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReturnTypeStrengthening():305:305 -> r
-com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.shaking.T0:
+com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.shaking.I0:
     1:1:void <init>():19:19 -> <init>
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind() -> a
     com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter) -> a
     1:1:com.android.tools.r8.shaking.KeepReason referencedInAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):67:67 -> a
     2:2:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.shaking.G0:
-com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.shaking.H0:
+com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.shaking.w0:
     com.android.tools.r8.graph.DexDefinition holder -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():253:253 -> <clinit>
@@ -108613,59 +107492,59 @@
     5:5:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
     5:5:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):270 -> a
     6:9:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):271:274 -> a
-com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.shaking.I0:
+com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.shaking.x0:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):90:90 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):94:95 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):106:106 -> a
-com.android.tools.r8.shaking.KeepReason$InstantiatedIn -> com.android.tools.r8.shaking.J0:
+com.android.tools.r8.shaking.KeepReason$InstantiatedIn -> com.android.tools.r8.shaking.y0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):110:110 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):113:113 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():118:118 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.shaking.K0:
+com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.shaking.z0:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():161:161 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):161:161 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):164:165 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():170:170 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.shaking.L0:
+com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.shaking.A0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):179:179 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):182:182 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():187:187 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.shaking.M0:
+com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.shaking.B0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):127:127 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):130:130 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():135:135 -> a
-com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.shaking.N0:
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.shaking.C0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):301:301 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):304:304 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():309:309 -> a
-com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.shaking.O0:
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.shaking.D0:
     com.android.tools.r8.graph.DexType type -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):213:213 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):217:218 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():223:223 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):228:228 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.shaking.P0:
+com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.shaking.E0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):196:196 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):199:199 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():204:204 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.shaking.Q0:
+com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.shaking.F0:
     com.android.tools.r8.graph.DexAnnotation annotation -> a
     com.android.tools.r8.graph.ProgramDefinition annotatedItem -> b
     1:1:void <init>(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason$1):232:232 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):237:239 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():244:244 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):249:249 -> a
-com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.shaking.R0:
+com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.shaking.G0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):279:279 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):282:282 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():292:292 -> a
-com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.shaking.S0:
+com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.shaking.H0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):144:144 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):147:147 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():152:152 -> a
-com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.KA:
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.Tz:
     java.util.List pruned -> b
     java.util.Set emulatedInterfaces -> a
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):29:29 -> <init>
@@ -108674,7 +107553,7 @@
     1:11:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):37:47 -> a
     12:26:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):44:58 -> a
     27:27:boolean lambda$prune$0(com.android.tools.r8.graph.DexType):52:52 -> a
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.MB:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.WA:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap escapeDebuggingCounters -> c
     java.util.Set nonEscapingClassesWithLibraryMethodOverrides -> b
@@ -108707,12 +107586,11 @@
     9:9:java.util.Set getInitialNonEscapingClassesWithLibraryMethodOverrides(com.android.tools.r8.graph.AppView):56:56 -> b
     10:14:void logResults():163:167 -> b
     15:22:void logResults():164:171 -> b
-    23:27:void logResults():168:172 -> b
-    28:28:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> b
-    28:28:void logResults():173 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    29:30:void logResults():173:174 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.LB:
+    23:28:void logResults():168:173 -> b
+    29:29:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> b
+    29:29:void logResults():173 -> b
+    30:31:void logResults():173:174 -> b
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.VA:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():185:185 -> <clinit>
     1:1:void <init>():188:188 -> <init>
@@ -108720,9 +107598,9 @@
     2:4:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):200:202 -> a
     5:27:boolean com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration.isLegitimateConstructorInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):212:234 -> a
     5:27:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):201 -> a
-com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.PB:
+com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.ZA:
     boolean isModeled(com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.BD:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.IC:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.function.Consumer consumer -> c
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector annotationDirectReferenceCollector -> a
@@ -108740,27 +107618,17 @@
     16:16:void run(java.util.Set):52:52 -> a
     17:17:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer.traceAnnotationsDirectDependencies(com.android.tools.r8.graph.DexAnnotationSet):96:96 -> a
     17:17:void run(java.util.Set):52 -> a
-    18:18:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> a
-    18:18:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer.traceAnnotationsDirectDependencies(com.android.tools.r8.graph.DexAnnotationSet):96 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:18:void run(java.util.Set):52 -> a
-    19:19:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
-    19:19:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
-    19:19:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer.traceAnnotationsDirectDependencies(com.android.tools.r8.graph.DexAnnotationSet):96 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    19:19:void run(java.util.Set):52 -> a
-    20:21:void run(java.util.Set):54:55 -> a
-    22:22:void lambda$run$0(com.android.tools.r8.graph.DexEncodedField):54:54 -> a
-    23:23:boolean lambda$run$1(com.android.tools.r8.graph.DexEncodedMethod):57:57 -> a
-    24:27:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer.traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):100:103 -> a
-    24:27:boolean lambda$run$1(com.android.tools.r8.graph.DexEncodedMethod):57 -> a
-    28:28:boolean lambda$run$1(com.android.tools.r8.graph.DexEncodedMethod):58:58 -> a
-    29:29:void runOnCode(com.android.tools.r8.graph.ProgramMethod):65:65 -> a
-    30:43:com.android.tools.r8.graph.DexProgramClass getFirstReferenceOutsideFromCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):79:92 -> a
-    44:48:void lambda$getFirstReferenceOutsideFromCode$2(com.android.tools.r8.graph.AppView,java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType):83:87 -> a
+    18:19:void run(java.util.Set):54:55 -> a
+    20:20:void lambda$run$0(com.android.tools.r8.graph.DexEncodedField):54:54 -> a
+    21:21:boolean lambda$run$1(com.android.tools.r8.graph.DexEncodedMethod):57:57 -> a
+    22:25:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer.traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):100:103 -> a
+    22:25:boolean lambda$run$1(com.android.tools.r8.graph.DexEncodedMethod):57 -> a
+    26:26:boolean lambda$run$1(com.android.tools.r8.graph.DexEncodedMethod):58:58 -> a
+    27:27:void runOnCode(com.android.tools.r8.graph.ProgramMethod):65:65 -> a
+    28:41:com.android.tools.r8.graph.DexProgramClass getFirstReferenceOutsideFromCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):79:92 -> a
+    42:46:void lambda$getFirstReferenceOutsideFromCode$2(com.android.tools.r8.graph.AppView,java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType):83:87 -> a
     1:1:java.util.function.Consumer access$300(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):30:30 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.yD:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.zD:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.GC:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):189:189 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):189:189 -> <init>
@@ -108772,7 +107640,7 @@
     1:2:boolean addField(com.android.tools.r8.graph.DexField):199:200 -> b
     3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):206:207 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):227:227 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.AD:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.HC:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> e
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):107:107 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.ProgramMethod):109:110 -> <init>
@@ -108798,7 +107666,7 @@
     1:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):120 -> g
     3:4:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector.registerFieldAccess(com.android.tools.r8.graph.DexField):169:170 -> g
     3:4:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):165 -> g
-com.android.tools.r8.shaking.MainDexInfo -> com.android.tools.r8.shaking.W0:
+com.android.tools.r8.shaking.MainDexInfo -> com.android.tools.r8.shaking.K0:
     java.util.Set tracedMethodRoots -> c
     com.android.tools.r8.shaking.MainDexInfo NONE -> f
     java.util.Set tracedDependencies -> d
@@ -108843,7 +107711,6 @@
     50:50:boolean disallowInliningIntoContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):209:209 -> a
     51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMember.getContextType():36:36 -> a
     51:51:boolean disallowInliningIntoContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):209 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     52:52:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup getMainDexGroupInternal(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):188:188 -> a
     52:52:boolean disallowInliningIntoContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):212 -> a
     53:58:boolean disallowInliningIntoContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):213:218 -> a
@@ -108867,16 +107734,16 @@
     93:112:com.android.tools.r8.shaking.MainDexInfo rewrittenWithLens(com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.GraphLens):281:300 -> a
     113:113:void lambda$rewrittenWithLens$7(com.android.tools.r8.graph.GraphLens,java.util.Set,com.android.tools.r8.graph.DexType):283:283 -> a
     114:114:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexType):285:285 -> a
-    115:115:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):289:289 -> a
-    116:116:boolean com.android.tools.r8.graph.GraphLens.isSyntheticFinalizationGraphLens():0:0 -> a
-    116:116:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):289 -> a
-    117:120:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):292:295 -> a
-    121:124:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):294:297 -> a
-    125:125:com.android.tools.r8.shaking.MainDexInfo$Builder builder():304:304 -> a
-    126:126:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    126:126:void lambda$rewrittenWithLens$9(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod):286 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    127:127:void lambda$rewrittenWithLens$9(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod):286:286 -> a
+    115:115:void lambda$rewrittenWithLens$9(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod):286:286 -> a
+    116:116:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
+    116:116:void lambda$rewrittenWithLens$9(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod):286 -> a
+    117:117:void lambda$rewrittenWithLens$9(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod):286:286 -> a
+    118:118:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):289:289 -> a
+    119:119:boolean com.android.tools.r8.graph.GraphLens.isSyntheticFinalizationGraphLens():0:0 -> a
+    119:119:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):289 -> a
+    120:123:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):292:295 -> a
+    124:127:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):294:297 -> a
+    128:128:com.android.tools.r8.shaking.MainDexInfo$Builder builder():304:304 -> a
     1:1:boolean isTracedRoot(com.android.tools.r8.graph.DexReference,com.android.tools.r8.synthesis.SyntheticItems):108:108 -> b
     1:1:boolean lambda$disallowInliningIntoContext$1(com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):223 -> b
     2:2:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup getMergeKey(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):181:181 -> b
@@ -108903,8 +107770,7 @@
     1:1:boolean isTracedMethodRootsCleared():134:134 -> e
     1:1:com.android.tools.r8.shaking.MainDexInfo none():232:232 -> f
     1:1:int size():236:236 -> g
-com.android.tools.r8.shaking.MainDexInfo$1 -> com.android.tools.r8.shaking.U0:
-com.android.tools.r8.shaking.MainDexInfo$Builder -> com.android.tools.r8.shaking.V0:
+com.android.tools.r8.shaking.MainDexInfo$Builder -> com.android.tools.r8.shaking.J0:
     java.util.Set methodRoots -> c
     java.util.Set dependencies -> d
     boolean tracedMethodRootsCleared -> e
@@ -108938,14 +107804,14 @@
     1:1:boolean contains(com.android.tools.r8.graph.DexType):384 -> e
     2:2:boolean isDependency(com.android.tools.r8.graph.DexType):376:376 -> e
     2:2:boolean contains(com.android.tools.r8.graph.DexType):384 -> e
-com.android.tools.r8.shaking.MainDexInfo$MainDexGroup -> com.android.tools.r8.internal.CD:
+com.android.tools.r8.shaking.MainDexInfo$MainDexGroup -> com.android.tools.r8.internal.JC:
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_DEPENDENCY -> d
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup NOT_IN_MAIN_DEX -> e
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_LIST -> b
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_ROOT -> c
     1:4:void <clinit>():38:41 -> <clinit>
     1:1:void <init>(java.lang.String,int):37:37 -> <init>
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.DD:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.KC:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.MainDexInfo$Builder mainDexInfoBuilder -> d
@@ -109027,7 +107893,7 @@
     27:27:void traceRuntimeAnnotationsWithEnumForMainDex():86:86 -> c
     28:34:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):306:312 -> c
     28:34:void traceRuntimeAnnotationsWithEnumForMainDex():86 -> c
-com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.shaking.Z0:
+com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.shaking.M0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> r
     int $r8$clinit -> s
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.shaking.MemberValuePropagationRule$1):11:11 -> <init>
@@ -109040,18 +107906,17 @@
     113:113:java.lang.String typeString():104:104 -> C
     110:110:java.lang.String typeString():104:104 -> C
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type getType():95:95 -> D
-com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.shaking.X0:
-com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.shaking.Y0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.shaking.L0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.MemberValuePropagationRule$1):17:17 -> <init>
     2:2:void <init>():21:21 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.uE:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.zD:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.shaking.MinimumKeepInfoCollection -> com.android.tools.r8.shaking.a1:
+com.android.tools.r8.shaking.MinimumKeepInfoCollection -> com.android.tools.r8.shaking.N0:
     java.util.Map minimumKeepInfo -> a
     com.android.tools.r8.shaking.MinimumKeepInfoCollection EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -109061,9 +107926,9 @@
     1:1:com.android.tools.r8.graph.DexReference lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":169,"2":170,"3":171}}
     169:169:com.android.tools.r8.graph.DexReference lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):163:163 -> a
-    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     170:170:com.android.tools.r8.graph.DexReference lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):163 -> a
-    171:171:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    171:171:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     171:171:com.android.tools.r8.graph.DexReference lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):163 -> a
     165:168:com.android.tools.r8.graph.DexReference lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):164:167 -> a
     172:172:com.android.tools.r8.shaking.MinimumKeepInfoCollection empty():46:46 -> a
@@ -109080,16 +107945,13 @@
     193:193:void merge(com.android.tools.r8.shaking.MinimumKeepInfoCollection):114:114 -> a
     194:194:void forEach(java.util.function.BiConsumer):50:50 -> a
     194:194:void merge(com.android.tools.r8.shaking.MinimumKeepInfoCollection):114 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     195:195:void mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
     196:196:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):554:554 -> a
     196:196:void mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     197:197:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):123:123 -> a
     198:198:boolean lambda$pruneDeadItems$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):126:126 -> a
     199:199:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():477:477 -> a
     199:199:boolean lambda$pruneDeadItems$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):126 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     200:210:boolean lambda$pruneDeadItems$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):126:136 -> a
     211:211:com.android.tools.r8.graph.ProgramDefinition lambda$pruneDeadItems$6(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):129:129 -> a
     212:212:com.android.tools.r8.graph.ProgramDefinition lambda$pruneDeadItems$7(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):132:132 -> a
@@ -109104,13 +107966,12 @@
     220:221:com.android.tools.r8.shaking.MinimumKeepInfoCollection rewrittenWithLens(com.android.tools.r8.graph.GraphLens):157:158 -> a
     222:222:void forEach(java.util.function.BiConsumer):50:50 -> a
     222:222:com.android.tools.r8.shaking.MinimumKeepInfoCollection rewrittenWithLens(com.android.tools.r8.graph.GraphLens):158 -> a
-    223:239:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):160:176 -> a
-    240:240:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):554:554 -> a
-    240:240:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):177 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    223:240:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):160:177 -> a
+    241:241:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):554:554 -> a
+    241:241:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):177 -> a
     1:1:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$getOrCreateMinimumKeepInfoFor$5(com.android.tools.r8.graph.DexReference):100:100 -> b
     2:2:boolean isEmpty():110:110 -> b
-com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.internal.zF:
+com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.internal.zE:
     java.util.Set missingClasses -> a
     1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.MissingClasses$1):37:37 -> <init>
     2:3:void <init>(java.util.Set):41:42 -> <init>
@@ -109118,8 +107979,7 @@
     2:2:void forEach(java.util.function.Consumer):54:54 -> a
     3:3:boolean contains(com.android.tools.r8.graph.DexType):58:58 -> a
     1:1:com.android.tools.r8.shaking.MissingClasses empty():50:50 -> b
-com.android.tools.r8.shaking.MissingClasses$1 -> com.android.tools.r8.internal.xF:
-com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.internal.yF:
+com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.internal.yE:
     java.util.Map newMissingClasses -> b
     java.util.Set newIgnoredMissingClasses -> c
     java.util.Set alreadyMissingClasses -> a
@@ -109215,78 +108075,74 @@
     1:1:java.util.Set lambda$addNewMissingClass$0(com.android.tools.r8.graph.DexType):80:80 -> c
     2:4:java.util.function.Predicate getIsCompilerSynthesizedAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):289:291 -> c
     1:1:boolean wasAlreadyMissing(com.android.tools.r8.graph.DexType):317:317 -> d
-com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule -> com.android.tools.r8.shaking.d1:
+com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule -> com.android.tools.r8.shaking.P0:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$1):11:11 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
     1:1:java.lang.String typeString():82:82 -> C
-com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$1 -> com.android.tools.r8.shaking.b1:
-com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.c1:
+com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.O0:
     1:1:void <init>(com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$1):15:15 -> <init>
     2:2:void <init>():19:19 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.NoHorizontalClassMergingRule -> com.android.tools.r8.shaking.g1:
+com.android.tools.r8.shaking.NoHorizontalClassMergingRule -> com.android.tools.r8.shaking.R0:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.NoHorizontalClassMergingRule$1):11:11 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
     1:1:java.lang.String typeString():82:82 -> C
-com.android.tools.r8.shaking.NoHorizontalClassMergingRule$1 -> com.android.tools.r8.shaking.e1:
-com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder -> com.android.tools.r8.shaking.f1:
+com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder -> com.android.tools.r8.shaking.Q0:
     1:1:void <init>(com.android.tools.r8.shaking.NoHorizontalClassMergingRule$1):15:15 -> <init>
     2:2:void <init>():19:19 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.NoMethodStaticizingRule -> com.android.tools.r8.shaking.i1:
+com.android.tools.r8.shaking.NoMethodStaticizingRule -> com.android.tools.r8.shaking.T0:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
     1:1:java.lang.String typeString():82:82 -> C
-com.android.tools.r8.shaking.NoMethodStaticizingRule$Builder -> com.android.tools.r8.shaking.h1:
+com.android.tools.r8.shaking.NoMethodStaticizingRule$Builder -> com.android.tools.r8.shaking.S0:
     1:1:void <init>():19:19 -> <init>
     1:11:com.android.tools.r8.shaking.NoMethodStaticizingRule build():29:39 -> a
     1:11:com.android.tools.r8.shaking.ProguardClassSpecification build():15 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.NoOptimizationBaseRule -> com.android.tools.r8.shaking.k1:
+com.android.tools.r8.shaking.NoOptimizationBaseRule -> com.android.tools.r8.shaking.V0:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):36:36 -> <init>
-com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder -> com.android.tools.r8.shaking.j1:
+com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder -> com.android.tools.r8.shaking.U0:
     1:1:void <init>():18:18 -> <init>
-com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule -> com.android.tools.r8.shaking.m1:
+com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule -> com.android.tools.r8.shaking.X0:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
     1:1:java.lang.String typeString():83:83 -> C
-com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.l1:
+com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.W0:
     1:1:void <init>():20:20 -> <init>
     1:11:com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule build():30:40 -> a
     1:11:com.android.tools.r8.shaking.ProguardClassSpecification build():16 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule -> com.android.tools.r8.shaking.o1:
+com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule -> com.android.tools.r8.shaking.Z0:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
     1:1:java.lang.String typeString():83:83 -> C
-com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.n1:
+com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.Y0:
     1:1:void <init>():20:20 -> <init>
     1:11:com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule build():30:40 -> a
     1:11:com.android.tools.r8.shaking.ProguardClassSpecification build():16 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule -> com.android.tools.r8.shaking.r1:
+com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule -> com.android.tools.r8.shaking.b1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):59:59 -> <init>
     1:1:java.lang.String typeString():81:81 -> C
-com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$1 -> com.android.tools.r8.shaking.p1:
-com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder -> com.android.tools.r8.shaking.q1:
+com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder -> com.android.tools.r8.shaking.a1:
     1:1:void <init>(com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$1):14:14 -> <init>
     2:2:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.NoVerticalClassMergingRule -> com.android.tools.r8.shaking.u1:
+com.android.tools.r8.shaking.NoVerticalClassMergingRule -> com.android.tools.r8.shaking.d1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.NoVerticalClassMergingRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):59:59 -> <init>
     1:1:java.lang.String typeString():81:81 -> C
-com.android.tools.r8.shaking.NoVerticalClassMergingRule$1 -> com.android.tools.r8.shaking.s1:
-com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder -> com.android.tools.r8.shaking.t1:
+com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder -> com.android.tools.r8.shaking.c1:
     1:1:void <init>(com.android.tools.r8.shaking.NoVerticalClassMergingRule$1):14:14 -> <init>
     2:2:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.KN:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.BM:
     java.util.List NAMES -> c
     int PPP_MASK -> b
     int flags -> a
@@ -109337,49 +108193,45 @@
     1:1:void setSynchronized():158:158 -> x
     1:1:void setSynthetic():182:182 -> y
     1:1:void setTransient():150:150 -> z
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.shaking.x1:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.shaking.f1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:java.lang.String typeString():85:85 -> C
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.shaking.v1:
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.shaking.w1:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.shaking.e1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.shaking.A1:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.shaking.h1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:java.lang.String typeString():87:87 -> C
     boolean applyToNonProgramClasses() -> p
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.shaking.y1:
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.shaking.z1:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.shaking.g1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.shaking.D1:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.shaking.j1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:java.lang.String typeString():82:82 -> C
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.shaking.B1:
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.shaking.C1:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.shaking.i1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.shaking.G1:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.shaking.l1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:java.lang.String typeString():89:89 -> C
     com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule() -> r
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.shaking.E1:
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.shaking.F1:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.shaking.k1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.shaking.I1:
+com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.shaking.m1:
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.shaking.ProguardClassFilter$1):11:11 -> <init>
@@ -109388,15 +108240,14 @@
     2:3:boolean matches(com.android.tools.r8.graph.DexType):53:54 -> a
     1:1:java.util.List getPatterns():45:45 -> b
     1:1:boolean isEmpty():49:49 -> c
-com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.shaking.H1:
-com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.shaking.I1$a:
+com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.shaking.m1$a:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassFilter$1):20:20 -> <init>
     2:2:void <init>():23:23 -> <init>
     3:3:void <init>():21:21 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder addPattern(com.android.tools.r8.shaking.ProguardClassNameList):27:27 -> a
     2:2:com.android.tools.r8.shaking.ProguardClassFilter build():32:32 -> a
-com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.shaking.K1:
+com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.shaking.n1:
     1:1:void <init>():24:24 -> <init>
     java.util.List asSpecificDexTypes() -> a
     boolean matches(com.android.tools.r8.graph.DexType) -> a
@@ -109409,15 +108260,14 @@
     1:1:boolean hasWildcards():94:94 -> d
     int size() -> e
     1:3:java.lang.String toString():74:76 -> toString
-com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.shaking.J1:
-com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.shaking.K1$a:
+com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.shaking.n1$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):40:40 -> <init>
     2:2:void <init>():47:47 -> <init>
     3:3:void <init>():45:45 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder addClassName(boolean,com.android.tools.r8.shaking.ProguardTypeMatcher):51:51 -> a
     2:9:com.android.tools.r8.shaking.ProguardClassNameList build():56:63 -> a
-com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.shaking.L1:
+com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.shaking.o1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap classNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardClassNameList$1):334:334 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):338:339 -> <init>
@@ -109431,7 +108281,7 @@
     1:1:int size():344:344 -> e
     1:5:boolean equals(java.lang.Object):367:371 -> equals
     1:1:int hashCode():376:376 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.shaking.M1:
+com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.shaking.p1:
     com.android.tools.r8.com.google.common.collect.ImmutableList classNames -> a
     1:1:void <init>(java.util.Collection,com.android.tools.r8.shaking.ProguardClassNameList$1):245:245 -> <init>
     2:3:void <init>(java.util.Collection):249:250 -> <init>
@@ -109448,7 +108298,7 @@
     1:1:int size():255:255 -> e
     1:5:boolean equals(java.lang.Object):275:279 -> equals
     1:1:int hashCode():284:284 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.shaking.K1$b:
+com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.shaking.n1$b:
     com.android.tools.r8.shaking.ProguardTypeMatcher className -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardClassNameList$1):177:177 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher):181:182 -> <init>
@@ -109461,7 +108311,7 @@
     int size() -> e
     1:5:boolean equals(java.lang.Object):200:204 -> equals
     1:1:int hashCode():209:209 -> hashCode
-com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.shaking.N1:
+com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.shaking.q1:
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceClassName -> k
     boolean $assertionsDisabled -> n
     com.android.tools.r8.shaking.ProguardClassType classType -> h
@@ -109505,7 +108355,7 @@
     1:1:java.lang.String getSource():245:245 -> n
     1:1:boolean hasInheritanceClassName():261:261 -> o
     1:1:java.lang.String toString():402:402 -> toString
-com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.shaking.N1$a:
+com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.shaking.q1$a:
     com.android.tools.r8.shaking.ProguardClassType classType -> i
     boolean inheritanceIsExtends -> m
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceClassName -> l
@@ -109536,7 +108386,7 @@
     3:3:java.util.List buildInheritanceAnnotations():120:120 -> c
     1:7:com.android.tools.r8.position.Position getPosition():73:79 -> d
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.RN:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.IM:
     com.android.tools.r8.shaking.ProguardClassType ANNOTATION_INTERFACE -> b
     com.android.tools.r8.shaking.ProguardClassType INTERFACE -> e
     com.android.tools.r8.shaking.ProguardClassType UNSPECIFIED -> f
@@ -109555,25 +108405,25 @@
     12:12:java.lang.String toString():46:46 -> toString
     13:13:java.lang.String toString():45:45 -> toString
     14:14:java.lang.String toString():44:44 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.LN:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.CM:
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):13:13 -> a
-com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.internal.MN:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.internal.DM:
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.internal.NN:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.internal.EM:
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):25:25 -> a
-com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.internal.ON:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.internal.FM:
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):31:31 -> a
-com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.internal.PN:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.internal.GM:
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardClassType$6 -> com.android.tools.r8.internal.QN:
+com.android.tools.r8.shaking.ProguardClassType$6 -> com.android.tools.r8.internal.HM:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardClassType -> a
     1:1:void <clinit>():43:43 -> <clinit>
-com.android.tools.r8.shaking.ProguardCompatibilityActions -> com.android.tools.r8.internal.UN:
+com.android.tools.r8.shaking.ProguardCompatibilityActions -> com.android.tools.r8.internal.KM:
     java.util.Set compatInstantiatedTypes -> a
     1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.ProguardCompatibilityActions$1):14:14 -> <init>
     2:3:void <init>(java.util.Set):18:19 -> <init>
@@ -109584,17 +108434,16 @@
     4:4:com.android.tools.r8.shaking.ProguardCompatibilityActions rewrittenWithLens(com.android.tools.r8.graph.GraphLens):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":50,"2":51,"3":52}}
     50:50:com.android.tools.r8.shaking.ProguardCompatibilityActions rewrittenWithLens(com.android.tools.r8.graph.GraphLens):43:43 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     51:51:com.android.tools.r8.shaking.ProguardCompatibilityActions rewrittenWithLens(com.android.tools.r8.graph.GraphLens):43 -> a
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     52:52:com.android.tools.r8.shaking.ProguardCompatibilityActions rewrittenWithLens(com.android.tools.r8.graph.GraphLens):43 -> a
     47:49:com.android.tools.r8.shaking.ProguardCompatibilityActions rewrittenWithLens(com.android.tools.r8.graph.GraphLens):43:45 -> a
     53:53:com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder com.android.tools.r8.shaking.ProguardCompatibilityActions.builder():23:23 -> a
     53:53:com.android.tools.r8.shaking.ProguardCompatibilityActions withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):31 -> a
     54:59:com.android.tools.r8.shaking.ProguardCompatibilityActions withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):32:37 -> a
     60:60:boolean isCompatInstantiated(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
-com.android.tools.r8.shaking.ProguardCompatibilityActions$1 -> com.android.tools.r8.internal.SN:
-com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder -> com.android.tools.r8.internal.TN:
+com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder -> com.android.tools.r8.internal.JM:
     java.util.Set compatInstantiatedTypes -> a
     1:3:void <init>():48:50 -> <init>
     1:1:void addCompatInstantiatedType(com.android.tools.r8.graph.DexProgramClass):53:53 -> a
@@ -109602,9 +108451,8 @@
     2:2:void addCompatInstantiatedType(com.android.tools.r8.graph.DexProgramClass):53 -> a
     3:3:void com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.addCompatInstantiatedType(com.android.tools.r8.graph.DexType):57:57 -> a
     3:3:void access$000(com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder,com.android.tools.r8.graph.DexType):48 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.shaking.ProguardCompatibilityActions build():61:61 -> a
-com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.shaking.P1:
+com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.shaking.r1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String packagePrefix -> f
     boolean $assertionsDisabled -> P
@@ -109691,7 +108539,6 @@
     1:2:java.lang.String toString():729:730 -> toString
     3:3:boolean com.android.tools.r8.shaking.ProguardKeepAttributes.isEmpty():216:216 -> toString
     3:3:java.lang.String toString():730 -> toString
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:11:java.lang.String toString():731:738 -> toString
     1:1:java.nio.file.Path getPrintMappingFile():587:587 -> u
     1:1:java.nio.file.Path getPrintUsageFile():627:627 -> v
@@ -109699,8 +108546,7 @@
     1:1:java.util.List getRules():660:660 -> x
     1:1:java.nio.file.Path getSeedFile():704:704 -> y
     1:1:boolean hasApplyMappingFile():591:591 -> z
-com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.shaking.O1:
-com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.shaking.P1$a:
+com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.shaking.r1$a:
     java.lang.String packagePrefix -> f
     java.nio.file.Path classObfuscationDictionary -> D
     boolean overloadAggressively -> N
@@ -109832,7 +108678,7 @@
     1:10:void synthesizeKeepRulesForRecompilation():317:326 -> v
     11:11:void synthesizeKeepRulesForRecompilation():323:323 -> v
     12:12:void synthesizeKeepRulesForRecompilation():322:322 -> v
-com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.shaking.Q1:
+com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.shaking.s1:
     com.android.tools.r8.shaking.ProguardConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     int $r8$clinit -> o
@@ -109897,18 +108743,18 @@
     337:337:void validate():156:156 -> n
     338:338:void validate():156:156 -> n
     330:333:void validate():156:159 -> n
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.shaking.Q1$a:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.shaking.s1$a:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     1:3:void <init>(java.lang.String,java.util.List):2239:2241 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2245:2245 -> a
     2:3:boolean hasBackreference():2253:2254 -> a
     1:15:boolean hasUnusualCharacters():2258:2272 -> b
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.shaking.R1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.shaking.t1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
     1:3:void <init>(java.lang.String,java.util.List,boolean):2283:2285 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.S1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.u1:
     boolean $assertionsDisabled -> j
     java.nio.file.Path baseDirectory -> g
     int lineStartPosition -> f
@@ -109940,11 +108786,9 @@
     22:22:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):851:851 -> a
     23:24:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> a
     23:24:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):851 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:25:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):851:851 -> a
     26:27:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> a
     26:27:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):851 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     28:30:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):852:854 -> a
     31:32:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:64 -> a
     31:32:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):855 -> a
@@ -109977,489 +108821,491 @@
     54:55:boolean parseNegation():1109:1110 -> a
     54:55:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1124 -> a
     54:55:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1006 -> a
-    56:56:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getNegatedClassAccessFlags():160:160 -> a
-    56:56:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1125 -> a
+    56:56:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1125:1125 -> a
     56:56:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1006 -> a
-    57:57:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAccessFlags():151:151 -> a
-    57:57:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1126 -> a
+    57:57:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getNegatedClassAccessFlags():160:160 -> a
+    57:57:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1125 -> a
     57:57:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1006 -> a
-    58:67:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1127:1136 -> a
-    58:67:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1006 -> a
-    68:70:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1149:1151 -> a
-    68:70:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    71:72:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassTypeNegated(boolean):146:147 -> a
-    71:72:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1152 -> a
-    71:72:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    73:76:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1154:1157 -> a
-    73:76:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    77:78:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    77:78:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1157 -> a
-    77:78:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    79:79:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1159:1159 -> a
-    79:79:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    80:81:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1144:1145 -> a
-    80:81:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1159 -> a
-    80:81:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    82:85:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1159:1162 -> a
-    82:85:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    86:87:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    86:87:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1162 -> a
-    86:87:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    88:89:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1163:1164 -> a
+    58:58:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1126:1126 -> a
+    58:58:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1006 -> a
+    59:59:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAccessFlags():151:151 -> a
+    59:59:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1126 -> a
+    59:59:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1006 -> a
+    60:69:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1127:1136 -> a
+    60:69:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1006 -> a
+    70:72:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1149:1151 -> a
+    70:72:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
+    73:74:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassTypeNegated(boolean):146:147 -> a
+    73:74:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1152 -> a
+    73:74:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
+    75:78:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1154:1157 -> a
+    75:78:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
+    79:80:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
+    79:80:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1157 -> a
+    79:80:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
+    81:81:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1159:1159 -> a
+    81:81:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
+    82:83:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1144:1145 -> a
+    82:83:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1159 -> a
+    82:83:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
+    84:87:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1159:1162 -> a
+    84:87:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
+    88:89:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
+    88:89:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1162 -> a
     88:89:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    90:91:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    90:91:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1164 -> a
+    90:91:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1163:1164 -> a
     90:91:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    92:93:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1165:1166 -> a
+    92:93:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
+    92:93:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1164 -> a
     92:93:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    94:95:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    94:95:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1166 -> a
+    94:95:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1165:1166 -> a
     94:95:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    96:96:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2059:2059 -> a
-    96:96:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
-    97:97:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> a
-    97:97:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> a
-    97:97:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> a
-    97:97:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
-    98:101:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2052:2052 -> a
-    98:101:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> a
-    98:101:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
-    104:104:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2055:2055 -> a
-    104:104:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> a
-    104:104:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
-    105:106:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2062:2063 -> a
-    105:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
-    107:107:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008:1008 -> a
-    108:109:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1175:1176 -> a
-    108:109:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    110:111:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:97 -> a
-    110:111:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1177 -> a
+    96:97:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
+    96:97:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1166 -> a
+    96:97:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
+    98:98:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2059:2059 -> a
+    98:98:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
+    99:99:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> a
+    99:99:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> a
+    99:99:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> a
+    99:99:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
+    100:103:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2052:2052 -> a
+    100:103:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> a
+    100:103:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
+    106:106:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2055:2055 -> a
+    106:106:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> a
+    106:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
+    107:108:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2062:2063 -> a
+    107:108:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
+    109:109:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008:1008 -> a
+    110:111:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1175:1176 -> a
     110:111:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    112:112:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1178:1178 -> a
-    112:112:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    113:114:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:97 -> a
-    113:114:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1179 -> a
-    113:114:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    115:117:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1091:1093 -> a
-    115:117:java.util.List parseAnnotationList():1081 -> a
-    115:117:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
-    115:117:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    118:118:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> a
-    118:118:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
-    118:118:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
-    118:118:java.util.List parseAnnotationList():1081 -> a
-    118:118:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
-    118:118:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    119:120:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2073:2074 -> a
-    119:120:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
-    119:120:java.util.List parseAnnotationList():1081 -> a
-    119:120:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
-    119:120:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    121:129:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1095:1103 -> a
-    121:129:java.util.List parseAnnotationList():1081 -> a
-    121:129:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
-    121:129:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    130:130:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1102:1102 -> a
-    130:130:java.util.List parseAnnotationList():1081 -> a
-    130:130:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
-    130:130:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    131:131:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> a
-    131:131:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
-    131:131:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
-    131:131:java.util.List parseAnnotationList():1081 -> a
-    131:131:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
-    131:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    132:136:java.util.List parseAnnotationList():1083:1087 -> a
-    132:136:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
-    132:136:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    137:137:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183:1183 -> a
-    137:137:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    138:138:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> a
-    138:138:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
-    138:138:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1184 -> a
-    138:138:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    139:140:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2073:2074 -> a
-    139:140:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1184 -> a
-    139:140:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    141:143:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1184:1184 -> a
-    141:143:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    144:145:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceClassName(com.android.tools.r8.shaking.ProguardTypeMatcher):109:110 -> a
-    144:145:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1184 -> a
-    144:145:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    146:146:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> a
-    146:146:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
-    146:146:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1184 -> a
-    146:146:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
-    147:148:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1194:1195 -> a
-    147:148:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    149:149:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1207:1207 -> a
-    149:149:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    149:149:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    150:152:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1091:1093 -> a
-    150:152:java.util.List parseAnnotationList():1081 -> a
-    150:152:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
-    150:152:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    150:152:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    153:153:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> a
-    153:153:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
-    153:153:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
-    153:153:java.util.List parseAnnotationList():1081 -> a
-    153:153:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
-    153:153:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    153:153:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    154:155:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2073:2074 -> a
-    154:155:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
-    154:155:java.util.List parseAnnotationList():1081 -> a
-    154:155:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
-    154:155:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    154:155:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    156:164:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1095:1103 -> a
-    156:164:java.util.List parseAnnotationList():1081 -> a
-    156:164:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
-    156:164:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    156:164:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    165:165:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1102:1102 -> a
-    165:165:java.util.List parseAnnotationList():1081 -> a
-    165:165:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
-    165:165:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    165:165:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    166:166:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> a
-    166:166:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
-    166:166:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
-    166:166:java.util.List parseAnnotationList():1081 -> a
-    166:166:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
-    166:166:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    166:166:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    167:171:java.util.List parseAnnotationList():1083:1087 -> a
-    167:171:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
-    167:171:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    167:171:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    172:172:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208:1208 -> a
-    172:172:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    172:172:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    173:173:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1216:1216 -> a
-    173:173:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
-    173:173:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    173:173:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    174:175:boolean parseNegation():1109:1110 -> a
-    174:175:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1218 -> a
-    174:175:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
-    174:175:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    174:175:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    176:221:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1220:1265 -> a
-    176:221:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
-    176:221:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    176:221:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    222:239:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1253:1270 -> a
-    222:239:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
-    222:239:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    222:239:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    240:245:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1244:1249 -> a
-    240:245:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
-    240:245:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    240:245:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    246:247:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1239:1240 -> a
-    246:247:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
-    246:247:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    246:247:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    248:249:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1234:1235 -> a
+    112:113:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:97 -> a
+    112:113:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1177 -> a
+    112:113:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    114:114:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1178:1178 -> a
+    114:114:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    115:116:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:97 -> a
+    115:116:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1179 -> a
+    115:116:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    117:119:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1091:1093 -> a
+    117:119:java.util.List parseAnnotationList():1081 -> a
+    117:119:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
+    117:119:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    120:120:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> a
+    120:120:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
+    120:120:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
+    120:120:java.util.List parseAnnotationList():1081 -> a
+    120:120:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
+    120:120:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    121:122:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2073:2074 -> a
+    121:122:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
+    121:122:java.util.List parseAnnotationList():1081 -> a
+    121:122:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
+    121:122:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    123:131:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1095:1103 -> a
+    123:131:java.util.List parseAnnotationList():1081 -> a
+    123:131:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
+    123:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    132:132:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1102:1102 -> a
+    132:132:java.util.List parseAnnotationList():1081 -> a
+    132:132:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
+    132:132:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    133:133:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> a
+    133:133:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
+    133:133:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
+    133:133:java.util.List parseAnnotationList():1081 -> a
+    133:133:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
+    133:133:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    134:138:java.util.List parseAnnotationList():1083:1087 -> a
+    134:138:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183 -> a
+    134:138:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    139:139:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1183:1183 -> a
+    139:139:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    140:140:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> a
+    140:140:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
+    140:140:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1184 -> a
+    140:140:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    141:142:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2073:2074 -> a
+    141:142:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1184 -> a
+    141:142:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    143:145:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1184:1184 -> a
+    143:145:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    146:147:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceClassName(com.android.tools.r8.shaking.ProguardTypeMatcher):109:110 -> a
+    146:147:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1184 -> a
+    146:147:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    148:148:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> a
+    148:148:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
+    148:148:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1184 -> a
+    148:148:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1009 -> a
+    149:150:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1194:1195 -> a
+    149:150:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    151:151:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1207:1207 -> a
+    151:151:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    151:151:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    152:154:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1091:1093 -> a
+    152:154:java.util.List parseAnnotationList():1081 -> a
+    152:154:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
+    152:154:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    152:154:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    155:155:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> a
+    155:155:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
+    155:155:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
+    155:155:java.util.List parseAnnotationList():1081 -> a
+    155:155:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
+    155:155:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    155:155:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    156:157:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2073:2074 -> a
+    156:157:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
+    156:157:java.util.List parseAnnotationList():1081 -> a
+    156:157:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
+    156:157:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    156:157:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    158:166:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1095:1103 -> a
+    158:166:java.util.List parseAnnotationList():1081 -> a
+    158:166:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
+    158:166:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    158:166:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    167:167:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1102:1102 -> a
+    167:167:java.util.List parseAnnotationList():1081 -> a
+    167:167:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
+    167:167:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    167:167:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    168:168:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> a
+    168:168:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2072 -> a
+    168:168:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1094 -> a
+    168:168:java.util.List parseAnnotationList():1081 -> a
+    168:168:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
+    168:168:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    168:168:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    169:173:java.util.List parseAnnotationList():1083:1087 -> a
+    169:173:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208 -> a
+    169:173:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    169:173:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    174:174:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1208:1208 -> a
+    174:174:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    174:174:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    175:175:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1216:1216 -> a
+    175:175:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
+    175:175:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    175:175:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    176:177:boolean parseNegation():1109:1110 -> a
+    176:177:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1218 -> a
+    176:177:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
+    176:177:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    176:177:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    178:223:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1220:1265 -> a
+    178:223:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
+    178:223:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    178:223:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    224:241:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1253:1270 -> a
+    224:241:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
+    224:241:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    224:241:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    242:247:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1244:1249 -> a
+    242:247:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
+    242:247:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    242:247:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    248:249:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1239:1240 -> a
     248:249:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
     248:249:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
     248:249:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    250:251:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1229:1230 -> a
+    250:251:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1234:1235 -> a
     250:251:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
     250:251:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
     250:251:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    252:308:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1224:1280 -> a
-    252:308:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
-    252:308:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    252:308:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    309:328:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1288:1307 -> a
-    309:328:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    309:328:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    309:328:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    329:334:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1800:1805 -> a
-    329:334:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1309 -> a
-    329:334:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    329:334:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    329:334:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    335:340:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1311:1316 -> a
-    335:340:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    335:340:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    335:340:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    341:349:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1449:1457 -> a
-    341:349:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1318 -> a
-    341:349:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    341:349:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    341:349:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    350:352:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1319:1321 -> a
-    350:352:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    350:352:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    350:352:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    353:353:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1458:1458 -> a
-    353:353:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1318 -> a
-    353:353:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    353:353:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    353:353:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    354:354:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1455:1455 -> a
-    354:354:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1318 -> a
-    354:354:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    354:354:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    354:354:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    355:357:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1323:1325 -> a
-    355:357:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    355:357:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    355:357:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    358:358:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
-    358:358:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1326 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    358:358:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    358:358:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    358:358:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    359:365:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1327:1333 -> a
-    359:365:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    359:365:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    359:365:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    366:374:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328:1336 -> a
-    366:374:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    366:374:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    366:374:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    375:375:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
-    375:375:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1337 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    375:375:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    375:375:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    375:375:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    376:382:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1338:1344 -> a
-    376:382:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    376:382:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    376:382:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    383:390:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1339:1346 -> a
-    383:390:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    383:390:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    383:390:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    391:396:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1800:1805 -> a
-    391:396:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1348 -> a
-    391:396:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    391:396:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    391:396:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    397:401:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1350:1354 -> a
-    397:401:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    397:401:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    397:401:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    402:410:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1449:1457 -> a
-    402:410:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1355 -> a
-    402:410:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    402:410:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    402:410:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    411:415:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1357:1361 -> a
-    411:415:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    411:415:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    411:415:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    416:418:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1360:1362 -> a
-    416:418:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    416:418:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    416:418:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    419:419:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1458:1458 -> a
-    419:419:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1355 -> a
-    419:419:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    419:419:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    419:419:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    420:420:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1455:1455 -> a
-    420:420:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1355 -> a
-    420:420:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    420:420:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    420:420:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    421:422:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1364:1365 -> a
-    421:422:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    421:422:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    421:422:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    423:429:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2188:2188 -> a
-    423:429:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1365 -> a
-    423:429:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    423:429:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    423:429:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    430:431:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1367:1368 -> a
-    430:431:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    430:431:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    430:431:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    432:438:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2188:2188 -> a
-    432:438:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1368 -> a
-    432:438:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    432:438:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    432:438:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    439:443:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1370:1374 -> a
-    439:443:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    439:443:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    439:443:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    444:460:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1373:1389 -> a
-    444:460:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    444:460:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    444:460:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    461:462:java.lang.String acceptFieldNameOrIntegerForReturn():1927:1928 -> a
-    461:462:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
-    461:462:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    461:462:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    461:462:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    463:463:boolean eof(int):1674:1674 -> a
-    463:463:java.lang.String acceptFieldNameOrIntegerForReturn():1930 -> a
-    463:463:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
-    463:463:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    463:463:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    463:463:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    464:464:java.lang.String acceptFieldNameOrIntegerForReturn():1931:1931 -> a
-    464:464:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
-    464:464:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    464:464:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    464:464:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    465:465:boolean eof(int):1674:1674 -> a
-    465:465:java.lang.String acceptFieldNameOrIntegerForReturn():1932 -> a
-    465:465:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
-    465:465:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    465:465:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    465:465:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    466:466:char peekCharAt(int):1725:1725 -> a
-    466:466:java.lang.String acceptFieldNameOrIntegerForReturn():1932 -> a
-    466:466:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
-    466:466:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    466:466:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    466:466:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    252:253:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1229:1230 -> a
+    252:253:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
+    252:253:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    252:253:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    254:310:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1224:1280 -> a
+    254:310:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1209 -> a
+    254:310:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    254:310:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    311:330:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1288:1307 -> a
+    311:330:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    311:330:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    311:330:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    331:336:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1800:1805 -> a
+    331:336:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1309 -> a
+    331:336:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    331:336:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    331:336:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    337:342:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1311:1316 -> a
+    337:342:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    337:342:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    337:342:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    343:351:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1449:1457 -> a
+    343:351:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1318 -> a
+    343:351:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    343:351:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    343:351:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    352:354:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1319:1321 -> a
+    352:354:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    352:354:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    352:354:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    355:355:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1458:1458 -> a
+    355:355:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1318 -> a
+    355:355:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    355:355:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    355:355:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    356:356:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1455:1455 -> a
+    356:356:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1318 -> a
+    356:356:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    356:356:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    356:356:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    357:360:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1323:1326 -> a
+    357:360:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    357:360:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    357:360:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    361:361:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
+    361:361:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1326 -> a
+    361:361:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    361:361:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    361:361:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    362:368:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1327:1333 -> a
+    362:368:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    362:368:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    362:368:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    369:378:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328:1337 -> a
+    369:378:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    369:378:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    369:378:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    379:379:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
+    379:379:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1337 -> a
+    379:379:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    379:379:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    379:379:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    380:386:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1338:1344 -> a
+    380:386:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    380:386:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    380:386:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    387:394:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1339:1346 -> a
+    387:394:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    387:394:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    387:394:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    395:400:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1800:1805 -> a
+    395:400:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1348 -> a
+    395:400:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    395:400:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    395:400:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    401:405:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1350:1354 -> a
+    401:405:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    401:405:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    401:405:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    406:414:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1449:1457 -> a
+    406:414:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1355 -> a
+    406:414:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    406:414:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    406:414:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    415:419:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1357:1361 -> a
+    415:419:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    415:419:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    415:419:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    420:422:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1360:1362 -> a
+    420:422:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    420:422:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    420:422:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    423:423:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1458:1458 -> a
+    423:423:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1355 -> a
+    423:423:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    423:423:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    423:423:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    424:424:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1455:1455 -> a
+    424:424:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1355 -> a
+    424:424:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    424:424:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    424:424:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    425:426:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1364:1365 -> a
+    425:426:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    425:426:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    425:426:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    427:433:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2188:2188 -> a
+    427:433:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1365 -> a
+    427:433:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    427:433:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    427:433:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    434:435:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1367:1368 -> a
+    434:435:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    434:435:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    434:435:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    436:442:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2188:2188 -> a
+    436:442:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1368 -> a
+    436:442:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    436:442:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    436:442:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    443:447:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1370:1374 -> a
+    443:447:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    443:447:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    443:447:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    448:464:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1373:1389 -> a
+    448:464:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    448:464:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    448:464:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    465:466:java.lang.String acceptFieldNameOrIntegerForReturn():1927:1928 -> a
+    465:466:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
+    465:466:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    465:466:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    465:466:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
     467:467:boolean eof(int):1674:1674 -> a
-    467:467:char peekCharAt(int):1725 -> a
-    467:467:java.lang.String acceptFieldNameOrIntegerForReturn():1932 -> a
+    467:467:java.lang.String acceptFieldNameOrIntegerForReturn():1930 -> a
     467:467:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
     467:467:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
     467:467:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
     467:467:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    468:469:char peekCharAt(int):1725:1726 -> a
-    468:469:java.lang.String acceptFieldNameOrIntegerForReturn():1932 -> a
-    468:469:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
-    468:469:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    468:469:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    468:469:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    470:482:java.lang.String acceptFieldNameOrIntegerForReturn():1936:1948 -> a
-    470:482:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
-    470:482:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    470:482:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    470:482:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    483:484:boolean isInteger(java.lang.String):1661:1662 -> a
-    483:484:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1392 -> a
-    483:484:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    483:484:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    483:484:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    485:499:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1393:1407 -> a
-    485:499:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    485:499:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    485:499:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    500:500:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1406:1406 -> a
-    500:500:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    500:500:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    500:500:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    501:513:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1404:1416 -> a
-    501:513:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    501:513:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    501:513:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    514:514:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1415:1415 -> a
-    514:514:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    514:514:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    514:514:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    515:520:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1414:1419 -> a
-    515:520:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    515:520:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    515:520:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    521:545:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1418:1442 -> a
-    521:545:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
-    521:545:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    521:545:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    546:546:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1211:1211 -> a
-    546:546:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
-    546:546:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    547:547:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> a
-    547:547:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1198 -> a
-    547:547:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    548:551:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1198:1201 -> a
-    548:551:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
-    552:552:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> a
-    552:552:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> a
-    552:552:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> a
-    552:552:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
-    553:553:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1168:1168 -> a
-    553:553:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    554:555:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1144:1145 -> a
-    554:555:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1168 -> a
-    554:555:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    556:556:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1168:1168 -> a
-    556:556:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
-    557:578:java.nio.file.Path parseFileName(boolean):1526:1547 -> a
-    579:579:java.nio.file.Path parseFileName(boolean):1545:1545 -> a
-    580:600:java.lang.String replaceSystemPropertyReferences(java.lang.String):1492:1512 -> a
-    580:600:java.nio.file.Path parseFileName(boolean):1550 -> a
-    601:601:java.nio.file.Path parseFileName(boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":618,"2":619,"3":620,"4":621,"5":622,"6":623}}
-    618:618:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1510 -> a
-    618:618:java.nio.file.Path parseFileName(boolean):1550 -> a
-    619:619:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1510 -> a
-    619:619:java.nio.file.Path parseFileName(boolean):1550 -> a
-    620:620:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1510 -> a
-    620:620:java.nio.file.Path parseFileName(boolean):1550 -> a
-    621:621:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1510 -> a
-    621:621:java.nio.file.Path parseFileName(boolean):1550 -> a
+    468:468:java.lang.String acceptFieldNameOrIntegerForReturn():1931:1931 -> a
+    468:468:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
+    468:468:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    468:468:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    468:468:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    469:469:boolean eof(int):1674:1674 -> a
+    469:469:java.lang.String acceptFieldNameOrIntegerForReturn():1932 -> a
+    469:469:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
+    469:469:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    469:469:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    469:469:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    470:470:char peekCharAt(int):1725:1725 -> a
+    470:470:java.lang.String acceptFieldNameOrIntegerForReturn():1932 -> a
+    470:470:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
+    470:470:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    470:470:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    470:470:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    471:471:boolean eof(int):1674:1674 -> a
+    471:471:char peekCharAt(int):1725 -> a
+    471:471:java.lang.String acceptFieldNameOrIntegerForReturn():1932 -> a
+    471:471:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
+    471:471:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    471:471:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    471:471:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    472:473:char peekCharAt(int):1725:1726 -> a
+    472:473:java.lang.String acceptFieldNameOrIntegerForReturn():1932 -> a
+    472:473:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
+    472:473:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    472:473:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    472:473:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    474:486:java.lang.String acceptFieldNameOrIntegerForReturn():1936:1948 -> a
+    474:486:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1390 -> a
+    474:486:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    474:486:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    474:486:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    487:488:boolean isInteger(java.lang.String):1661:1662 -> a
+    487:488:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1392 -> a
+    487:488:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    487:488:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    487:488:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    489:503:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1393:1407 -> a
+    489:503:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    489:503:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    489:503:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    504:504:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1406:1406 -> a
+    504:504:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    504:504:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    504:504:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    505:517:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1404:1416 -> a
+    505:517:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    505:517:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    505:517:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    518:518:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1415:1415 -> a
+    518:518:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    518:518:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    518:518:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    519:524:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1414:1419 -> a
+    519:524:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    519:524:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    519:524:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    525:549:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1418:1442 -> a
+    525:549:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1210 -> a
+    525:549:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    525:549:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    550:550:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1211:1211 -> a
+    550:550:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1197 -> a
+    550:550:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    551:551:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> a
+    551:551:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1198 -> a
+    551:551:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    552:555:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1198:1201 -> a
+    552:555:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1010 -> a
+    556:556:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> a
+    556:556:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> a
+    556:556:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> a
+    556:556:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1008 -> a
+    557:557:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1168:1168 -> a
+    557:557:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
+    558:559:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1144:1145 -> a
+    558:559:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1168 -> a
+    558:559:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
+    560:560:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1168:1168 -> a
+    560:560:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007 -> a
+    561:582:java.nio.file.Path parseFileName(boolean):1526:1547 -> a
+    583:583:java.nio.file.Path parseFileName(boolean):1545:1545 -> a
+    584:604:java.lang.String replaceSystemPropertyReferences(java.lang.String):1492:1512 -> a
+    584:604:java.nio.file.Path parseFileName(boolean):1550 -> a
+    605:605:java.nio.file.Path parseFileName(boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":622,"2":623,"3":624,"4":625,"5":626,"6":627}}
     622:622:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1510 -> a
     622:622:java.nio.file.Path parseFileName(boolean):1550 -> a
     623:623:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1510 -> a
     623:623:java.nio.file.Path parseFileName(boolean):1550 -> a
-    602:614:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1522 -> a
-    602:614:java.nio.file.Path parseFileName(boolean):1550 -> a
-    615:615:java.nio.file.Path parseFileName(boolean):1552:1552 -> a
-    616:616:java.nio.file.Path parseFileName(boolean):1541:1541 -> a
-    617:617:java.nio.file.Path parseFileName(boolean):1530:1530 -> a
-    624:626:boolean lambda$parseFileName$1(boolean,char,boolean,int):1536:1538 -> a
-    627:628:boolean acceptChar(char):1696:1697 -> a
-    629:629:int remainingChars():1734:1734 -> a
-    629:629:boolean acceptString(java.lang.String):1744 -> a
-    630:638:boolean acceptString(java.lang.String):1744:1752 -> a
-    639:639:boolean lambda$acceptQuotedOrUnquotedString$4(char,int):1762:1762 -> a
-    640:640:boolean isClassName(int):1778:1778 -> a
-    641:641:java.lang.String acceptClassName():1795:1795 -> a
-    642:652:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1810:1820 -> a
-    653:653:boolean eof(int):1674:1674 -> a
-    653:653:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1822 -> a
-    654:667:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1823:1836 -> a
-    668:670:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1831:1831 -> a
-    678:678:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1839:1839 -> a
-    679:679:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4526,"2":4527,"3":4528}}
-    4526:4526:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1839:1839 -> a
-    4527:4527:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1839:1839 -> a
-    4528:4528:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1839:1839 -> a
-    2519:2520:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1840:1841 -> a
-    2521:2533:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1839:1851 -> a
-    2534:2572:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1850:1888 -> a
-    2573:2573:boolean isPackageName(int):1788:1788 -> a
-    2573:2573:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1893 -> a
-    2574:2581:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1894:1901 -> a
-    2582:2582:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4590,"2":4591,"3":4592}}
-    4590:4590:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1901:1901 -> a
-    4591:4591:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1901:1901 -> a
-    4592:4592:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1901:1901 -> a
-    4483:4488:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1901:1901 -> a
-    4489:4489:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1895:1895 -> a
-    4490:4517:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1890:1917 -> a
-    4518:4525:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1916:1923 -> a
-    4593:4593:java.lang.String acceptString(java.util.function.IntPredicate):1994:1994 -> a
-    4594:4594:boolean eof(int):1674:1674 -> a
-    4594:4594:java.lang.String acceptString(java.util.function.IntPredicate):1996 -> a
-    4595:4606:java.lang.String acceptString(java.util.function.IntPredicate):1997:2008 -> a
-    4607:4607:boolean pathFilterMatcher(java.lang.Integer):2088:2088 -> a
-    4608:4609:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):2167:2168 -> a
-    4610:4613:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2202:2205 -> a
-    4614:4615:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2218:2219 -> a
-    4616:4616:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.access$1400(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):46:46 -> a
-    4616:4616:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2219 -> a
-    4617:4623:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2225:2231 -> a
-    4617:4623:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.access$1400(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):46 -> a
-    4617:4623:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2219 -> a
+    624:624:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1510 -> a
+    624:624:java.nio.file.Path parseFileName(boolean):1550 -> a
+    625:625:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1510 -> a
+    625:625:java.nio.file.Path parseFileName(boolean):1550 -> a
+    626:626:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1510 -> a
+    626:626:java.nio.file.Path parseFileName(boolean):1550 -> a
+    627:627:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1510 -> a
+    627:627:java.nio.file.Path parseFileName(boolean):1550 -> a
+    606:618:java.lang.String replaceSystemPropertyReferences(java.lang.String):1510:1522 -> a
+    606:618:java.nio.file.Path parseFileName(boolean):1550 -> a
+    619:619:java.nio.file.Path parseFileName(boolean):1552:1552 -> a
+    620:620:java.nio.file.Path parseFileName(boolean):1541:1541 -> a
+    621:621:java.nio.file.Path parseFileName(boolean):1530:1530 -> a
+    628:630:boolean lambda$parseFileName$1(boolean,char,boolean,int):1536:1538 -> a
+    631:632:boolean acceptChar(char):1696:1697 -> a
+    633:633:int remainingChars():1734:1734 -> a
+    633:633:boolean acceptString(java.lang.String):1744 -> a
+    634:642:boolean acceptString(java.lang.String):1744:1752 -> a
+    643:643:boolean lambda$acceptQuotedOrUnquotedString$4(char,int):1762:1762 -> a
+    644:644:boolean isClassName(int):1778:1778 -> a
+    645:645:java.lang.String acceptClassName():1795:1795 -> a
+    646:656:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1810:1820 -> a
+    657:657:boolean eof(int):1674:1674 -> a
+    657:657:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1822 -> a
+    658:671:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1823:1836 -> a
+    672:674:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1831:1831 -> a
+    682:682:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1839:1839 -> a
+    683:683:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4530,"2":4531,"3":4532}}
+    4530:4530:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1839:1839 -> a
+    4531:4531:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1839:1839 -> a
+    4532:4532:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1839:1839 -> a
+    2523:2524:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1840:1841 -> a
+    2525:2537:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1839:1851 -> a
+    2538:2576:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1850:1888 -> a
+    2577:2577:boolean isPackageName(int):1788:1788 -> a
+    2577:2577:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1893 -> a
+    2578:2585:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1894:1901 -> a
+    2586:2586:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4594,"2":4595,"3":4596}}
+    4594:4594:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1901:1901 -> a
+    4595:4595:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1901:1901 -> a
+    4596:4596:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1901:1901 -> a
+    4487:4492:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1901:1901 -> a
+    4493:4493:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1895:1895 -> a
+    4494:4521:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1890:1917 -> a
+    4522:4529:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1916:1923 -> a
+    4597:4597:java.lang.String acceptString(java.util.function.IntPredicate):1994:1994 -> a
+    4598:4598:boolean eof(int):1674:1674 -> a
+    4598:4598:java.lang.String acceptString(java.util.function.IntPredicate):1996 -> a
+    4599:4610:java.lang.String acceptString(java.util.function.IntPredicate):1997:2008 -> a
+    4611:4611:boolean pathFilterMatcher(java.lang.Integer):2088:2088 -> a
+    4612:4613:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):2167:2168 -> a
+    4614:4617:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2202:2205 -> a
+    4618:4619:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2218:2219 -> a
+    4620:4620:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.access$1400(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):46:46 -> a
+    4620:4620:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2219 -> a
+    4621:4627:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2225:2231 -> a
+    4621:4627:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.access$1400(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):46 -> a
+    4621:4627:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2219 -> a
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):784:784 -> b
     2:2:com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder com.android.tools.r8.shaking.ProguardCheckDiscardRule.builder():74:74 -> b
     2:2:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):784 -> b
@@ -110575,94 +109421,89 @@
     9:9:void skipSingleArgument():743 -> e
     9:9:boolean skipOptionWithOptionalSingleArg(java.lang.String):684 -> e
     10:10:boolean lambda$skipOptimizationName$0(int):733:733 -> e
-    11:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):749:749 -> e
-    12:12:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> e
-    12:12:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):750 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> e
-    13:13:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):751 -> e
-    14:15:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1014:1015 -> e
-    14:15:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    16:16:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    16:16:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1016 -> e
-    16:16:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    17:24:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1016:1023 -> e
-    17:24:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    25:25:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    25:25:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1024 -> e
-    25:25:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    26:28:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1024:1026 -> e
-    26:28:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    29:29:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    29:29:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1027 -> e
-    29:29:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    30:36:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1027:1033 -> e
-    30:36:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    37:40:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):564:564 -> e
-    37:40:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):559 -> e
-    37:40:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1034 -> e
-    37:40:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    41:48:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1037:1044 -> e
-    41:48:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    49:52:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):564:564 -> e
-    49:52:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):559 -> e
-    49:52:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1045 -> e
-    49:52:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    53:58:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1051:1056 -> e
-    53:58:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    53:58:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    59:59:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    59:59:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1057 -> e
-    59:59:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    59:59:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    60:61:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1057:1058 -> e
-    60:61:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    60:61:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    62:62:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    62:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1059 -> e
-    62:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    62:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    63:64:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1059:1060 -> e
-    63:64:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    63:64:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    65:65:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    65:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1061 -> e
-    65:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    65:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    66:67:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1061:1062 -> e
-    66:67:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    66:67:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    68:68:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    68:68:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1063 -> e
-    68:68:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    68:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    69:71:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1063:1065 -> e
-    69:71:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    69:71:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    72:72:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    72:72:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1066 -> e
-    72:72:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    72:72:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    73:76:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1066:1069 -> e
-    73:76:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    73:76:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    77:77:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    77:77:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1070 -> e
-    77:77:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    77:77:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    78:79:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1070:1071 -> e
-    78:79:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    78:79:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    80:80:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2197:2197 -> e
-    80:80:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1072 -> e
-    80:80:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    80:80:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    81:81:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":105,"2":106,"3":107,"4":108,"5":109}}
-    105:105:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2197:2197 -> e
-    105:105:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1072 -> e
-    105:105:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    105:105:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    11:12:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):749:750 -> e
+    13:13:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> e
+    13:13:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):750 -> e
+    14:14:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> e
+    14:14:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):751 -> e
+    15:16:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1014:1015 -> e
+    15:16:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    17:17:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    17:17:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1016 -> e
+    17:17:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    18:25:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1016:1023 -> e
+    18:25:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    26:26:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    26:26:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1024 -> e
+    26:26:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    27:29:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1024:1026 -> e
+    27:29:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    30:30:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder() -> e
+    30:30:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1027 -> e
+    30:30:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    31:37:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1027:1033 -> e
+    31:37:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    38:41:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):564:564 -> e
+    38:41:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):559 -> e
+    38:41:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1034 -> e
+    38:41:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    42:49:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1037:1044 -> e
+    42:49:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    50:53:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):564:564 -> e
+    50:53:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):559 -> e
+    50:53:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1045 -> e
+    50:53:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    54:59:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1051:1056 -> e
+    54:59:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    54:59:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    60:60:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    60:60:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1057 -> e
+    60:60:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    60:60:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    61:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1057:1058 -> e
+    61:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    61:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    63:63:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    63:63:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1059 -> e
+    63:63:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    63:63:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    64:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1059:1060 -> e
+    64:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    64:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    66:66:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    66:66:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1061 -> e
+    66:66:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    66:66:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    67:68:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1061:1062 -> e
+    67:68:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    67:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    69:69:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    69:69:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1063 -> e
+    69:69:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    69:69:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    70:72:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1063:1065 -> e
+    70:72:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    70:72:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    73:73:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    73:73:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1066 -> e
+    73:73:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    73:73:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    74:77:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1066:1069 -> e
+    74:77:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    74:77:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    78:78:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    78:78:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1070 -> e
+    78:78:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    78:78:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    79:80:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1070:1071 -> e
+    79:80:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    79:80:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    81:81:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2197:2197 -> e
+    81:81:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1072 -> e
+    81:81:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    81:81:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    82:82:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):0:0 -> e
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":106,"2":107,"3":108,"4":109,"5":110}}
     106:106:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2197:2197 -> e
     106:106:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1072 -> e
     106:106:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
@@ -110679,25 +109520,29 @@
     109:109:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1072 -> e
     109:109:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
     109:109:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    82:84:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2197:2197 -> e
-    82:84:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1072 -> e
-    82:84:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    82:84:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    85:85:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1074:1074 -> e
-    85:85:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
-    85:85:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
-    86:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):753:753 -> e
-    87:87:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> e
-    87:87:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):754 -> e
-    88:93:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):754:759 -> e
-    94:97:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):758:761 -> e
-    98:98:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> e
-    98:98:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):762 -> e
-    99:102:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):762:765 -> e
-    103:103:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> e
-    103:103:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):766 -> e
-    104:104:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):767:767 -> e
-    110:115:java.lang.String acceptQuotedOrUnquotedString():1761:1766 -> e
+    110:110:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2197:2197 -> e
+    110:110:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1072 -> e
+    110:110:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    110:110:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    83:85:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2197:2197 -> e
+    83:85:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1072 -> e
+    83:85:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    83:85:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    86:86:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1074:1074 -> e
+    86:86:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1047 -> e
+    86:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):752 -> e
+    87:87:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):753:753 -> e
+    88:88:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> e
+    88:88:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):754 -> e
+    89:94:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):754:759 -> e
+    95:98:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):758:761 -> e
+    99:99:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> e
+    99:99:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):762 -> e
+    100:103:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):762:765 -> e
+    104:104:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> e
+    104:104:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):766 -> e
+    105:105:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):767:767 -> e
+    111:116:java.lang.String acceptQuotedOrUnquotedString():1761:1766 -> e
     1:3:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):570:572 -> f
     4:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):0:0 -> f
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":579,"2":580,"3":581,"4":582,"5":583}}
@@ -111195,395 +110040,398 @@
     322:322:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):969:969 -> p
     322:322:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
     322:322:boolean parseOption():252 -> p
-    323:323:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    323:323:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):969 -> p
-    323:323:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
-    323:323:boolean parseOption():252 -> p
-    324:324:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    324:324:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):969 -> p
-    324:324:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
-    324:324:boolean parseOption():252 -> p
-    325:327:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):970:972 -> p
-    325:327:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
-    325:327:boolean parseOption():252 -> p
-    328:328:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    328:328:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):973 -> p
-    328:328:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
-    328:328:boolean parseOption():252 -> p
-    329:339:com.android.tools.r8.shaking.WhyAreYouNotInliningRule com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder.build():26:36 -> p
-    329:339:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):974 -> p
-    329:339:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
-    329:339:boolean parseOption():252 -> p
-    340:340:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):551:551 -> p
-    340:340:boolean parseOption():252 -> p
-    341:348:boolean parseOption():253:260 -> p
-    349:361:boolean parseOption():256:268 -> p
-    362:389:java.util.List acceptPatternList():1952:1979 -> p
-    362:389:void parseKeepAttributes():649 -> p
-    362:389:boolean parseOption():269 -> p
-    390:393:void parseKeepAttributes():650:653 -> p
-    390:393:boolean parseOption():269 -> p
-    394:394:void parseKeepAttributes():651:651 -> p
-    394:394:boolean parseOption():269 -> p
-    395:396:boolean parseOption():270:271 -> p
-    397:406:void parsePackageFilter(java.util.function.BiConsumer):2021:2030 -> p
-    397:406:boolean parseOption():271 -> p
-    407:410:void parsePackageFilter(java.util.function.BiConsumer):2029:2032 -> p
-    407:410:boolean parseOption():271 -> p
-    411:418:void parsePackageFilter(java.util.function.BiConsumer):2027:2034 -> p
-    411:418:boolean parseOption():271 -> p
-    419:429:boolean parseOption():272:282 -> p
-    430:434:void parsePathFilter(java.util.function.Consumer):2093:2097 -> p
-    430:434:boolean parseOption():282 -> p
-    435:438:boolean parseOption():283:286 -> p
-    439:439:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):772:772 -> p
-    439:439:boolean parseOption():287 -> p
-    440:440:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule.builder():74:74 -> p
-    440:440:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):772 -> p
-    440:440:boolean parseOption():287 -> p
-    441:441:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):772:772 -> p
-    441:441:boolean parseOption():287 -> p
-    442:442:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    442:442:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):773 -> p
-    442:442:boolean parseOption():287 -> p
-    443:443:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    443:443:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):774 -> p
+    323:324:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
+    323:324:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):969 -> p
+    323:324:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
+    323:324:boolean parseOption():252 -> p
+    325:325:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):969:969 -> p
+    325:325:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
+    325:325:boolean parseOption():252 -> p
+    326:327:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
+    326:327:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):969 -> p
+    326:327:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
+    326:327:boolean parseOption():252 -> p
+    328:331:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):969:972 -> p
+    328:331:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
+    328:331:boolean parseOption():252 -> p
+    332:332:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
+    332:332:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):973 -> p
+    332:332:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
+    332:332:boolean parseOption():252 -> p
+    333:343:com.android.tools.r8.shaking.WhyAreYouNotInliningRule com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder.build():26:36 -> p
+    333:343:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):974 -> p
+    333:343:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
+    333:343:boolean parseOption():252 -> p
+    344:344:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):551:551 -> p
+    344:344:boolean parseOption():252 -> p
+    345:352:boolean parseOption():253:260 -> p
+    353:365:boolean parseOption():256:268 -> p
+    366:393:java.util.List acceptPatternList():1952:1979 -> p
+    366:393:void parseKeepAttributes():649 -> p
+    366:393:boolean parseOption():269 -> p
+    394:397:void parseKeepAttributes():650:653 -> p
+    394:397:boolean parseOption():269 -> p
+    398:398:void parseKeepAttributes():651:651 -> p
+    398:398:boolean parseOption():269 -> p
+    399:400:boolean parseOption():270:271 -> p
+    401:410:void parsePackageFilter(java.util.function.BiConsumer):2021:2030 -> p
+    401:410:boolean parseOption():271 -> p
+    411:414:void parsePackageFilter(java.util.function.BiConsumer):2029:2032 -> p
+    411:414:boolean parseOption():271 -> p
+    415:422:void parsePackageFilter(java.util.function.BiConsumer):2027:2034 -> p
+    415:422:boolean parseOption():271 -> p
+    423:433:boolean parseOption():272:282 -> p
+    434:438:void parsePathFilter(java.util.function.Consumer):2093:2097 -> p
+    434:438:boolean parseOption():282 -> p
+    439:442:boolean parseOption():283:286 -> p
+    443:443:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):772:772 -> p
     443:443:boolean parseOption():287 -> p
-    444:446:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):775:777 -> p
-    444:446:boolean parseOption():287 -> p
-    447:447:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    447:447:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):778 -> p
+    444:444:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule.builder():74:74 -> p
+    444:444:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):772 -> p
+    444:444:boolean parseOption():287 -> p
+    445:445:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):772:772 -> p
+    445:445:boolean parseOption():287 -> p
+    446:446:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
+    446:446:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):773 -> p
+    446:446:boolean parseOption():287 -> p
+    447:447:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
+    447:447:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):774 -> p
     447:447:boolean parseOption():287 -> p
-    448:458:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:36 -> p
-    448:458:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):779 -> p
-    448:458:boolean parseOption():287 -> p
-    459:464:boolean parseOption():288:293 -> p
-    465:465:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
-    465:465:boolean parseOption():298 -> p
-    466:466:boolean parseOption():0:0 -> p
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":935,"2":936,"3":937,"4":938,"5":939}}
-    935:935:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
-    935:935:boolean parseOption():298 -> p
-    936:936:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
-    936:936:boolean parseOption():298 -> p
-    937:937:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
-    937:937:boolean parseOption():298 -> p
-    938:938:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
-    938:938:boolean parseOption():298 -> p
+    448:450:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):775:777 -> p
+    448:450:boolean parseOption():287 -> p
+    451:451:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
+    451:451:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):778 -> p
+    451:451:boolean parseOption():287 -> p
+    452:462:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:36 -> p
+    452:462:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):779 -> p
+    452:462:boolean parseOption():287 -> p
+    463:468:boolean parseOption():288:293 -> p
+    469:469:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
+    469:469:boolean parseOption():298 -> p
+    470:470:boolean parseOption():0:0 -> p
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":939,"2":940,"3":941,"4":942,"5":943}}
     939:939:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
     939:939:boolean parseOption():298 -> p
-    467:469:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
-    467:469:boolean parseOption():298 -> p
-    470:472:boolean parseOption():295:295 -> p
-    476:493:boolean parseOption():299:316 -> p
-    494:495:void parseClassFilter(java.util.function.Consumer):2040:2041 -> p
-    494:495:boolean parseOption():316 -> p
-    496:496:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2059:2059 -> p
-    496:496:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    496:496:boolean parseOption():316 -> p
-    497:497:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> p
-    497:497:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
-    497:497:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
-    497:497:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    497:497:boolean parseOption():316 -> p
-    498:501:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2052:2052 -> p
-    498:501:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
-    498:501:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    498:501:boolean parseOption():316 -> p
-    504:504:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2055:2055 -> p
-    504:504:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
-    504:504:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    504:504:boolean parseOption():316 -> p
-    505:506:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2062:2063 -> p
-    505:506:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    505:506:boolean parseOption():316 -> p
-    507:507:void parseClassFilter(java.util.function.Consumer):2042:2042 -> p
-    507:507:boolean parseOption():316 -> p
-    508:508:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> p
-    508:508:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
+    940:940:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
+    940:940:boolean parseOption():298 -> p
+    941:941:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
+    941:941:boolean parseOption():298 -> p
+    942:942:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
+    942:942:boolean parseOption():298 -> p
+    943:943:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
+    943:943:boolean parseOption():298 -> p
+    471:473:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2172:2172 -> p
+    471:473:boolean parseOption():298 -> p
+    474:476:boolean parseOption():295:295 -> p
+    480:497:boolean parseOption():299:316 -> p
+    498:499:void parseClassFilter(java.util.function.Consumer):2040:2041 -> p
+    498:499:boolean parseOption():316 -> p
+    500:500:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2059:2059 -> p
+    500:500:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    500:500:boolean parseOption():316 -> p
+    501:501:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> p
+    501:501:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
+    501:501:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
+    501:501:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    501:501:boolean parseOption():316 -> p
+    502:505:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2052:2052 -> p
+    502:505:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
+    502:505:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    502:505:boolean parseOption():316 -> p
+    508:508:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2055:2055 -> p
     508:508:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
     508:508:void parseClassFilter(java.util.function.Consumer):2042 -> p
     508:508:boolean parseOption():316 -> p
-    509:509:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> p
-    509:509:void parseClassFilter(java.util.function.Consumer):2045 -> p
-    509:509:boolean parseOption():316 -> p
-    510:510:void parseClassFilter(java.util.function.Consumer):2045:2045 -> p
-    510:510:boolean parseOption():316 -> p
-    511:511:void parseClassFilter(java.util.function.Consumer):2044:2044 -> p
+    509:510:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2062:2063 -> p
+    509:510:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    509:510:boolean parseOption():316 -> p
+    511:511:void parseClassFilter(java.util.function.Consumer):2042:2042 -> p
     511:511:boolean parseOption():316 -> p
-    512:513:boolean parseOption():317:318 -> p
-    514:515:void parseClassFilter(java.util.function.Consumer):2040:2041 -> p
-    514:515:boolean parseOption():318 -> p
-    516:516:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2059:2059 -> p
-    516:516:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    516:516:boolean parseOption():318 -> p
-    517:517:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> p
-    517:517:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
-    517:517:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
-    517:517:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    517:517:boolean parseOption():318 -> p
-    518:521:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2052:2052 -> p
-    518:521:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
-    518:521:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    518:521:boolean parseOption():318 -> p
-    524:524:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2055:2055 -> p
-    524:524:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
-    524:524:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    524:524:boolean parseOption():318 -> p
-    525:526:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2062:2063 -> p
-    525:526:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    525:526:boolean parseOption():318 -> p
-    527:527:void parseClassFilter(java.util.function.Consumer):2042:2042 -> p
-    527:527:boolean parseOption():318 -> p
-    528:528:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> p
-    528:528:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
+    512:512:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> p
+    512:512:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
+    512:512:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
+    512:512:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    512:512:boolean parseOption():316 -> p
+    513:513:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> p
+    513:513:void parseClassFilter(java.util.function.Consumer):2045 -> p
+    513:513:boolean parseOption():316 -> p
+    514:514:void parseClassFilter(java.util.function.Consumer):2045:2045 -> p
+    514:514:boolean parseOption():316 -> p
+    515:515:void parseClassFilter(java.util.function.Consumer):2044:2044 -> p
+    515:515:boolean parseOption():316 -> p
+    516:517:boolean parseOption():317:318 -> p
+    518:519:void parseClassFilter(java.util.function.Consumer):2040:2041 -> p
+    518:519:boolean parseOption():318 -> p
+    520:520:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2059:2059 -> p
+    520:520:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    520:520:boolean parseOption():318 -> p
+    521:521:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> p
+    521:521:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
+    521:521:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
+    521:521:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    521:521:boolean parseOption():318 -> p
+    522:525:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2052:2052 -> p
+    522:525:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
+    522:525:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    522:525:boolean parseOption():318 -> p
+    528:528:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2055:2055 -> p
     528:528:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
     528:528:void parseClassFilter(java.util.function.Consumer):2042 -> p
     528:528:boolean parseOption():318 -> p
-    529:529:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> p
-    529:529:void parseClassFilter(java.util.function.Consumer):2045 -> p
-    529:529:boolean parseOption():318 -> p
-    530:530:void parseClassFilter(java.util.function.Consumer):2045:2045 -> p
-    530:530:boolean parseOption():318 -> p
-    531:531:void parseClassFilter(java.util.function.Consumer):2044:2044 -> p
+    529:530:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2062:2063 -> p
+    529:530:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    529:530:boolean parseOption():318 -> p
+    531:531:void parseClassFilter(java.util.function.Consumer):2042:2042 -> p
     531:531:boolean parseOption():318 -> p
-    532:533:boolean parseOption():319:320 -> p
-    534:536:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2182:2182 -> p
-    534:536:boolean parseOption():321 -> p
-    537:540:boolean parseOption():323:326 -> p
-    541:542:java.lang.String parsePackageNameOrEmptyString():2067:2068 -> p
-    541:542:boolean parseOption():326 -> p
-    543:549:boolean parseOption():326:332 -> p
-    550:551:java.lang.String parsePackageNameOrEmptyString():2067:2068 -> p
-    550:551:boolean parseOption():332 -> p
-    552:556:boolean parseOption():332:336 -> p
-    557:559:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2182:2182 -> p
-    557:559:boolean parseOption():337 -> p
-    560:561:boolean parseOption():338:339 -> p
-    562:563:void skipSingleArgument():741:742 -> p
-    562:563:boolean parseOption():340 -> p
-    564:564:char readChar():1730:1730 -> p
-    564:564:void skipSingleArgument():743 -> p
-    564:564:boolean parseOption():340 -> p
-    565:568:boolean parseOption():343:346 -> p
-    569:570:java.lang.String parsePackageNameOrEmptyString():2067:2068 -> p
-    569:570:boolean parseOption():346 -> p
-    571:577:boolean parseOption():346:352 -> p
-    578:579:java.lang.String parsePackageNameOrEmptyString():2067:2068 -> p
-    578:579:boolean parseOption():352 -> p
-    580:602:boolean parseOption():352:374 -> p
-    603:603:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1604:1604 -> p
-    603:603:boolean parseOption():375 -> p
-    604:604:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule.builder():77:77 -> p
-    604:604:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1604 -> p
-    604:604:boolean parseOption():375 -> p
-    605:605:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1604:1604 -> p
-    605:605:boolean parseOption():375 -> p
-    606:607:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
-    606:607:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1605 -> p
-    606:607:boolean parseOption():375 -> p
-    608:608:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1605:1605 -> p
+    532:532:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> p
+    532:532:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
+    532:532:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
+    532:532:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    532:532:boolean parseOption():318 -> p
+    533:533:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> p
+    533:533:void parseClassFilter(java.util.function.Consumer):2045 -> p
+    533:533:boolean parseOption():318 -> p
+    534:534:void parseClassFilter(java.util.function.Consumer):2045:2045 -> p
+    534:534:boolean parseOption():318 -> p
+    535:535:void parseClassFilter(java.util.function.Consumer):2044:2044 -> p
+    535:535:boolean parseOption():318 -> p
+    536:537:boolean parseOption():319:320 -> p
+    538:540:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2182:2182 -> p
+    538:540:boolean parseOption():321 -> p
+    541:544:boolean parseOption():323:326 -> p
+    545:546:java.lang.String parsePackageNameOrEmptyString():2067:2068 -> p
+    545:546:boolean parseOption():326 -> p
+    547:553:boolean parseOption():326:332 -> p
+    554:555:java.lang.String parsePackageNameOrEmptyString():2067:2068 -> p
+    554:555:boolean parseOption():332 -> p
+    556:560:boolean parseOption():332:336 -> p
+    561:563:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2182:2182 -> p
+    561:563:boolean parseOption():337 -> p
+    564:565:boolean parseOption():338:339 -> p
+    566:567:void skipSingleArgument():741:742 -> p
+    566:567:boolean parseOption():340 -> p
+    568:568:char readChar():1730:1730 -> p
+    568:568:void skipSingleArgument():743 -> p
+    568:568:boolean parseOption():340 -> p
+    569:572:boolean parseOption():343:346 -> p
+    573:574:java.lang.String parsePackageNameOrEmptyString():2067:2068 -> p
+    573:574:boolean parseOption():346 -> p
+    575:581:boolean parseOption():346:352 -> p
+    582:583:java.lang.String parsePackageNameOrEmptyString():2067:2068 -> p
+    582:583:boolean parseOption():352 -> p
+    584:606:boolean parseOption():352:374 -> p
+    607:607:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1604:1604 -> p
+    607:607:boolean parseOption():375 -> p
+    608:608:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule.builder():77:77 -> p
+    608:608:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1604 -> p
     608:608:boolean parseOption():375 -> p
-    609:610:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
-    609:610:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1606 -> p
-    609:610:boolean parseOption():375 -> p
-    611:614:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1606:1609 -> p
-    611:614:boolean parseOption():375 -> p
-    615:615:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    615:615:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1610 -> p
-    615:615:boolean parseOption():375 -> p
-    616:626:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder.build():26:36 -> p
-    616:626:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1611 -> p
-    616:626:boolean parseOption():375 -> p
-    627:628:boolean parseOption():376:377 -> p
-    629:629:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1627:1627 -> p
-    629:629:boolean parseOption():378 -> p
-    630:630:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder com.android.tools.r8.shaking.ProguardAssumeValuesRule.builder():77:77 -> p
-    630:630:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1627 -> p
-    630:630:boolean parseOption():378 -> p
-    631:631:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1627:1627 -> p
-    631:631:boolean parseOption():378 -> p
-    632:633:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
-    632:633:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1628 -> p
-    632:633:boolean parseOption():378 -> p
-    634:634:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1628:1628 -> p
+    609:609:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1604:1604 -> p
+    609:609:boolean parseOption():375 -> p
+    610:611:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
+    610:611:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1605 -> p
+    610:611:boolean parseOption():375 -> p
+    612:612:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1605:1605 -> p
+    612:612:boolean parseOption():375 -> p
+    613:614:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
+    613:614:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1606 -> p
+    613:614:boolean parseOption():375 -> p
+    615:618:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1606:1609 -> p
+    615:618:boolean parseOption():375 -> p
+    619:619:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
+    619:619:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1610 -> p
+    619:619:boolean parseOption():375 -> p
+    620:630:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder.build():26:36 -> p
+    620:630:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1611 -> p
+    620:630:boolean parseOption():375 -> p
+    631:632:boolean parseOption():376:377 -> p
+    633:633:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1627:1627 -> p
+    633:633:boolean parseOption():378 -> p
+    634:634:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder com.android.tools.r8.shaking.ProguardAssumeValuesRule.builder():77:77 -> p
+    634:634:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1627 -> p
     634:634:boolean parseOption():378 -> p
-    635:636:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
-    635:636:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1629 -> p
-    635:636:boolean parseOption():378 -> p
-    637:640:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1629:1632 -> p
-    637:640:boolean parseOption():378 -> p
-    641:641:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    641:641:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1633 -> p
-    641:641:boolean parseOption():378 -> p
-    642:652:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:36 -> p
-    642:652:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1634 -> p
-    642:652:boolean parseOption():378 -> p
-    653:657:boolean parseOption():379:383 -> p
-    658:667:boolean parseOption():382:391 -> p
-    668:671:java.util.List parseClassPath():1556:1559 -> p
-    668:671:boolean parseOption():391 -> p
-    672:685:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1571:1584 -> p
-    672:685:java.util.List parseClassPath():1560 -> p
-    672:685:boolean parseOption():391 -> p
-    686:691:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1581:1586 -> p
-    686:691:java.util.List parseClassPath():1560 -> p
-    686:691:boolean parseOption():391 -> p
-    692:694:java.util.List parseClassPath():1561:1563 -> p
-    692:694:boolean parseOption():391 -> p
-    695:708:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1571:1584 -> p
-    695:708:java.util.List parseClassPath():1564 -> p
-    695:708:boolean parseOption():391 -> p
-    709:714:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1581:1586 -> p
-    709:714:java.util.List parseClassPath():1564 -> p
-    709:714:boolean parseOption():391 -> p
-    715:715:java.util.List parseClassPath():1565:1565 -> p
-    715:715:boolean parseOption():391 -> p
-    716:718:boolean parseOption():391:393 -> p
-    719:722:java.util.List parseClassPath():1556:1559 -> p
-    719:722:boolean parseOption():393 -> p
-    723:736:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1571:1584 -> p
-    723:736:java.util.List parseClassPath():1560 -> p
-    723:736:boolean parseOption():393 -> p
-    737:742:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1581:1586 -> p
-    737:742:java.util.List parseClassPath():1560 -> p
-    737:742:boolean parseOption():393 -> p
-    743:745:java.util.List parseClassPath():1561:1563 -> p
-    743:745:boolean parseOption():393 -> p
-    746:759:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1571:1584 -> p
-    746:759:java.util.List parseClassPath():1564 -> p
-    746:759:boolean parseOption():393 -> p
-    760:765:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1581:1586 -> p
-    760:765:java.util.List parseClassPath():1564 -> p
-    760:765:boolean parseOption():393 -> p
-    766:766:java.util.List parseClassPath():1565:1565 -> p
-    766:766:boolean parseOption():393 -> p
-    767:784:boolean parseOption():393:410 -> p
-    785:786:void parseClassFilter(java.util.function.Consumer):2040:2041 -> p
-    785:786:boolean parseOption():410 -> p
-    787:787:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2059:2059 -> p
-    787:787:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    787:787:boolean parseOption():410 -> p
-    788:788:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> p
-    788:788:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
-    788:788:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
-    788:788:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    788:788:boolean parseOption():410 -> p
-    789:792:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2052:2052 -> p
-    789:792:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
-    789:792:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    789:792:boolean parseOption():410 -> p
-    795:795:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2055:2055 -> p
-    795:795:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
-    795:795:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    795:795:boolean parseOption():410 -> p
-    796:797:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2062:2063 -> p
-    796:797:void parseClassFilter(java.util.function.Consumer):2042 -> p
-    796:797:boolean parseOption():410 -> p
-    798:798:void parseClassFilter(java.util.function.Consumer):2042:2042 -> p
-    798:798:boolean parseOption():410 -> p
-    799:799:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> p
-    799:799:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
+    635:635:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1627:1627 -> p
+    635:635:boolean parseOption():378 -> p
+    636:637:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
+    636:637:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1628 -> p
+    636:637:boolean parseOption():378 -> p
+    638:638:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1628:1628 -> p
+    638:638:boolean parseOption():378 -> p
+    639:640:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
+    639:640:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1629 -> p
+    639:640:boolean parseOption():378 -> p
+    641:644:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1629:1632 -> p
+    641:644:boolean parseOption():378 -> p
+    645:645:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
+    645:645:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1633 -> p
+    645:645:boolean parseOption():378 -> p
+    646:656:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:36 -> p
+    646:656:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1634 -> p
+    646:656:boolean parseOption():378 -> p
+    657:661:boolean parseOption():379:383 -> p
+    662:671:boolean parseOption():382:391 -> p
+    672:675:java.util.List parseClassPath():1556:1559 -> p
+    672:675:boolean parseOption():391 -> p
+    676:689:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1571:1584 -> p
+    676:689:java.util.List parseClassPath():1560 -> p
+    676:689:boolean parseOption():391 -> p
+    690:695:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1581:1586 -> p
+    690:695:java.util.List parseClassPath():1560 -> p
+    690:695:boolean parseOption():391 -> p
+    696:698:java.util.List parseClassPath():1561:1563 -> p
+    696:698:boolean parseOption():391 -> p
+    699:712:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1571:1584 -> p
+    699:712:java.util.List parseClassPath():1564 -> p
+    699:712:boolean parseOption():391 -> p
+    713:718:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1581:1586 -> p
+    713:718:java.util.List parseClassPath():1564 -> p
+    713:718:boolean parseOption():391 -> p
+    719:719:java.util.List parseClassPath():1565:1565 -> p
+    719:719:boolean parseOption():391 -> p
+    720:722:boolean parseOption():391:393 -> p
+    723:726:java.util.List parseClassPath():1556:1559 -> p
+    723:726:boolean parseOption():393 -> p
+    727:740:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1571:1584 -> p
+    727:740:java.util.List parseClassPath():1560 -> p
+    727:740:boolean parseOption():393 -> p
+    741:746:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1581:1586 -> p
+    741:746:java.util.List parseClassPath():1560 -> p
+    741:746:boolean parseOption():393 -> p
+    747:749:java.util.List parseClassPath():1561:1563 -> p
+    747:749:boolean parseOption():393 -> p
+    750:763:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1571:1584 -> p
+    750:763:java.util.List parseClassPath():1564 -> p
+    750:763:boolean parseOption():393 -> p
+    764:769:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1581:1586 -> p
+    764:769:java.util.List parseClassPath():1564 -> p
+    764:769:boolean parseOption():393 -> p
+    770:770:java.util.List parseClassPath():1565:1565 -> p
+    770:770:boolean parseOption():393 -> p
+    771:788:boolean parseOption():393:410 -> p
+    789:790:void parseClassFilter(java.util.function.Consumer):2040:2041 -> p
+    789:790:boolean parseOption():410 -> p
+    791:791:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2059:2059 -> p
+    791:791:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    791:791:boolean parseOption():410 -> p
+    792:792:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2080:2080 -> p
+    792:792:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
+    792:792:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
+    792:792:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    792:792:boolean parseOption():410 -> p
+    793:796:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2052:2052 -> p
+    793:796:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
+    793:796:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    793:796:boolean parseOption():410 -> p
+    799:799:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2055:2055 -> p
     799:799:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
     799:799:void parseClassFilter(java.util.function.Consumer):2042 -> p
     799:799:boolean parseOption():410 -> p
-    800:800:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> p
-    800:800:void parseClassFilter(java.util.function.Consumer):2045 -> p
-    800:800:boolean parseOption():410 -> p
-    801:801:void parseClassFilter(java.util.function.Consumer):2045:2045 -> p
-    801:801:boolean parseOption():410 -> p
-    802:802:void parseClassFilter(java.util.function.Consumer):2044:2044 -> p
+    800:801:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2062:2063 -> p
+    800:801:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    800:801:boolean parseOption():410 -> p
+    802:802:void parseClassFilter(java.util.function.Consumer):2042:2042 -> p
     802:802:boolean parseOption():410 -> p
-    803:804:boolean parseOption():411:412 -> p
-    805:809:void parsePathFilter(java.util.function.Consumer):2093:2097 -> p
-    805:809:boolean parseOption():412 -> p
-    810:811:boolean parseOption():413:414 -> p
-    812:816:void parsePathFilter(java.util.function.Consumer):2093:2097 -> p
-    812:816:boolean parseOption():414 -> p
-    817:818:boolean parseOption():415:416 -> p
-    819:819:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):887:887 -> p
-    819:819:boolean parseOption():416 -> p
-    820:820:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder com.android.tools.r8.shaking.ProguardIdentifierNameStringRule.builder():73:73 -> p
-    820:820:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):887 -> p
-    820:820:boolean parseOption():416 -> p
-    821:821:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):887:887 -> p
-    821:821:boolean parseOption():416 -> p
-    822:823:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
-    822:823:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):888 -> p
-    822:823:boolean parseOption():416 -> p
-    824:824:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):888:888 -> p
+    803:803:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2082:2082 -> p
+    803:803:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2051 -> p
+    803:803:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2061 -> p
+    803:803:void parseClassFilter(java.util.function.Consumer):2042 -> p
+    803:803:boolean parseOption():410 -> p
+    804:804:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> p
+    804:804:void parseClassFilter(java.util.function.Consumer):2045 -> p
+    804:804:boolean parseOption():410 -> p
+    805:805:void parseClassFilter(java.util.function.Consumer):2045:2045 -> p
+    805:805:boolean parseOption():410 -> p
+    806:806:void parseClassFilter(java.util.function.Consumer):2044:2044 -> p
+    806:806:boolean parseOption():410 -> p
+    807:808:boolean parseOption():411:412 -> p
+    809:813:void parsePathFilter(java.util.function.Consumer):2093:2097 -> p
+    809:813:boolean parseOption():412 -> p
+    814:815:boolean parseOption():413:414 -> p
+    816:820:void parsePathFilter(java.util.function.Consumer):2093:2097 -> p
+    816:820:boolean parseOption():414 -> p
+    821:822:boolean parseOption():415:416 -> p
+    823:823:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):887:887 -> p
+    823:823:boolean parseOption():416 -> p
+    824:824:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder com.android.tools.r8.shaking.ProguardIdentifierNameStringRule.builder():73:73 -> p
+    824:824:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):887 -> p
     824:824:boolean parseOption():416 -> p
-    825:826:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
-    825:826:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):889 -> p
-    825:826:boolean parseOption():416 -> p
-    827:830:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):889:892 -> p
-    827:830:boolean parseOption():416 -> p
-    831:831:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    831:831:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):893 -> p
-    831:831:boolean parseOption():416 -> p
-    832:842:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:35 -> p
-    832:842:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):894 -> p
-    832:842:boolean parseOption():416 -> p
-    843:845:boolean parseOption():416:418 -> p
-    846:846:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):899:899 -> p
-    846:846:boolean parseOption():418 -> p
-    847:847:com.android.tools.r8.shaking.ProguardIfRule$Builder com.android.tools.r8.shaking.ProguardIfRule.builder():136:136 -> p
-    847:847:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):899 -> p
-    847:847:boolean parseOption():418 -> p
-    848:848:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):899:899 -> p
-    848:848:boolean parseOption():418 -> p
-    849:850:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
-    849:850:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):900 -> p
-    849:850:boolean parseOption():418 -> p
-    851:851:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):900:900 -> p
+    825:825:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):887:887 -> p
+    825:825:boolean parseOption():416 -> p
+    826:827:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
+    826:827:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):888 -> p
+    826:827:boolean parseOption():416 -> p
+    828:828:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):888:888 -> p
+    828:828:boolean parseOption():416 -> p
+    829:830:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
+    829:830:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):889 -> p
+    829:830:boolean parseOption():416 -> p
+    831:834:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):889:892 -> p
+    831:834:boolean parseOption():416 -> p
+    835:835:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
+    835:835:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):893 -> p
+    835:835:boolean parseOption():416 -> p
+    836:846:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:35 -> p
+    836:846:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):894 -> p
+    836:846:boolean parseOption():416 -> p
+    847:849:boolean parseOption():416:418 -> p
+    850:850:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):899:899 -> p
+    850:850:boolean parseOption():418 -> p
+    851:851:com.android.tools.r8.shaking.ProguardIfRule$Builder com.android.tools.r8.shaking.ProguardIfRule.builder():136:136 -> p
+    851:851:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):899 -> p
     851:851:boolean parseOption():418 -> p
-    852:853:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
-    852:853:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):901 -> p
-    852:853:boolean parseOption():418 -> p
-    854:861:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):901:908 -> p
-    854:861:boolean parseOption():418 -> p
-    862:862:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):74:74 -> p
-    862:862:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):909 -> p
-    862:862:boolean parseOption():418 -> p
-    863:864:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):910:911 -> p
-    863:864:boolean parseOption():418 -> p
-    865:865:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    865:865:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):912 -> p
-    865:865:boolean parseOption():418 -> p
-    866:877:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():79:90 -> p
-    866:877:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):913 -> p
-    866:877:boolean parseOption():418 -> p
-    878:878:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914:914 -> p
-    878:878:boolean parseOption():418 -> p
-    879:891:void verifyAndLinkBackReferences(java.lang.Iterable):978:990 -> p
-    879:891:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
-    879:891:boolean parseOption():418 -> p
-    892:892:void verifyAndLinkBackReferences(java.lang.Iterable):985:985 -> p
-    892:892:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
-    892:892:boolean parseOption():418 -> p
-    893:893:boolean parseOption():0:0 -> p
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":935,"2":936,"3":937}}
-    935:935:void verifyAndLinkBackReferences(java.lang.Iterable):985:985 -> p
-    935:935:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
-    935:935:boolean parseOption():418 -> p
-    936:936:void verifyAndLinkBackReferences(java.lang.Iterable):985:985 -> p
-    936:936:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
-    936:936:boolean parseOption():418 -> p
-    937:937:void verifyAndLinkBackReferences(java.lang.Iterable):985:985 -> p
-    937:937:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
-    937:937:boolean parseOption():418 -> p
-    894:898:void verifyAndLinkBackReferences(java.lang.Iterable):985:985 -> p
-    894:898:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
-    894:898:boolean parseOption():418 -> p
-    905:907:void verifyAndLinkBackReferences(java.lang.Iterable):992:994 -> p
-    905:907:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
-    905:907:boolean parseOption():418 -> p
-    908:908:boolean parseOption():418:418 -> p
-    909:911:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):917:917 -> p
+    852:852:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):899:899 -> p
+    852:852:boolean parseOption():418 -> p
+    853:854:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
+    853:854:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):900 -> p
+    853:854:boolean parseOption():418 -> p
+    855:855:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):900:900 -> p
+    855:855:boolean parseOption():418 -> p
+    856:857:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
+    856:857:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):901 -> p
+    856:857:boolean parseOption():418 -> p
+    858:865:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):901:908 -> p
+    858:865:boolean parseOption():418 -> p
+    866:866:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):74:74 -> p
+    866:866:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):909 -> p
+    866:866:boolean parseOption():418 -> p
+    867:868:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):910:911 -> p
+    867:868:boolean parseOption():418 -> p
+    869:869:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
+    869:869:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):912 -> p
+    869:869:boolean parseOption():418 -> p
+    870:881:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():79:90 -> p
+    870:881:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):913 -> p
+    870:881:boolean parseOption():418 -> p
+    882:882:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914:914 -> p
+    882:882:boolean parseOption():418 -> p
+    883:895:void verifyAndLinkBackReferences(java.lang.Iterable):978:990 -> p
+    883:895:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
+    883:895:boolean parseOption():418 -> p
+    896:896:void verifyAndLinkBackReferences(java.lang.Iterable):985:985 -> p
+    896:896:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
+    896:896:boolean parseOption():418 -> p
+    897:897:boolean parseOption():0:0 -> p
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":939,"2":940,"3":941}}
+    939:939:void verifyAndLinkBackReferences(java.lang.Iterable):985:985 -> p
+    939:939:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
+    939:939:boolean parseOption():418 -> p
+    940:940:void verifyAndLinkBackReferences(java.lang.Iterable):985:985 -> p
+    940:940:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
+    940:940:boolean parseOption():418 -> p
+    941:941:void verifyAndLinkBackReferences(java.lang.Iterable):985:985 -> p
+    941:941:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
+    941:941:boolean parseOption():418 -> p
+    898:902:void verifyAndLinkBackReferences(java.lang.Iterable):985:985 -> p
+    898:902:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
+    898:902:boolean parseOption():418 -> p
+    909:911:void verifyAndLinkBackReferences(java.lang.Iterable):992:994 -> p
+    909:911:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):914 -> p
     909:911:boolean parseOption():418 -> p
-    912:930:boolean parseOption():419:437 -> p
-    931:934:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):564:564 -> p
-    931:934:boolean parseOption():439 -> p
+    912:912:boolean parseOption():418:418 -> p
+    913:915:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):917:917 -> p
+    913:915:boolean parseOption():418 -> p
+    916:934:boolean parseOption():419:437 -> p
+    935:938:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):564:564 -> p
+    935:938:boolean parseOption():439 -> p
     1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2102:2121 -> q
     21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2118:2123 -> q
     27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2108:2108 -> q
@@ -111592,7 +110440,7 @@
     1:6:void skipWhitespace():1638:1643 -> t
     7:14:void skipComment():1649:1656 -> t
     7:14:void skipWhitespace():1645 -> t
-com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.shaking.U1:
+com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.shaking.w1:
     boolean used -> o
     boolean canReferenceDeadTypes -> p
     boolean $assertionsDisabled -> q
@@ -111627,15 +110475,15 @@
     13:13:java.lang.Iterable getWildcards():173 -> x
     boolean isProguardKeepRule() -> y
     1:1:boolean isUsed():62:62 -> z
-com.android.tools.r8.shaking.ProguardConfigurationRule$1 -> com.android.tools.r8.shaking.T1:
+com.android.tools.r8.shaking.ProguardConfigurationRule$1 -> com.android.tools.r8.shaking.v1:
     com.android.tools.r8.graph.AppView val$appView -> a
     com.android.tools.r8.shaking.ProguardConfigurationRule this$0 -> b
     1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.AppView):129:129 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():140:140 -> a
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):132:135 -> c
-com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.VN:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.LM:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.WN:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.MM:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> b
     1:3:void <init>(byte[],com.android.tools.r8.origin.Origin):18:20 -> <init>
@@ -111643,14 +110491,14 @@
     1:1:java.lang.String get():29:29 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.internal.XN:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.internal.NM:
     java.nio.file.Path path -> a
     1:2:void <init>(java.nio.file.Path):18:19 -> <init>
     1:5:java.nio.file.Path getBaseDirectory():29:33 -> a
     1:1:java.lang.String get():24:24 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.internal.YN:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.internal.OM:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -111662,7 +110510,7 @@
     1:1:java.lang.String get():42:42 -> get
     1:1:java.lang.String getName():52:52 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():57:57 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.shaking.Y1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.shaking.A1:
     com.android.tools.r8.origin.Origin synthesizedRecompilationOrigin -> a
     1:10:void <clinit>():21:30 -> <clinit>
     1:14:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):92:105 -> a
@@ -111682,23 +110530,22 @@
     54:64:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder.build():26:36 -> a
     54:64:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):122 -> a
     65:110:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):131:176 -> a
-    111:114:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):187:190 -> a
-    115:115:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    115:115:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):191 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    116:121:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):191:196 -> a
-    122:122:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:137 -> a
-    122:122:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):193 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    123:124:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):197:198 -> a
-    125:125:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):189:189 -> a
-com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.shaking.V1:
+    111:115:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):187:191 -> a
+    116:116:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
+    116:116:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):191 -> a
+    117:122:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):191:196 -> a
+    123:123:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):193:193 -> a
+    124:124:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:137 -> a
+    124:124:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):193 -> a
+    125:126:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):197:198 -> a
+    127:127:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):189:189 -> a
+com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.shaking.x1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):22:22 -> <init>
     1:1:java.lang.String part():25:25 -> part
-com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.shaking.W1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.shaking.y1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):30:30 -> <init>
     1:1:java.lang.String part():33:33 -> part
-com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.shaking.X1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.shaking.z1:
     com.android.tools.r8.utils.AndroidApiLevel val$apiLevel -> f
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApiLevel):93:93 -> <init>
     1:1:java.lang.String part():0:0 -> part
@@ -111707,17 +110554,16 @@
     99:99:java.lang.String part():96:96 -> part
     100:100:java.lang.String part():96:96 -> part
     97:97:java.lang.String part():96:96 -> part
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.shaking.b2:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.shaking.C1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):56:56 -> <init>
     1:1:java.lang.String typeString():78:78 -> C
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.shaking.Z1:
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.shaking.a2:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.shaking.B1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):12:12 -> <init>
     2:2:void <init>():15:15 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.shaking.f2:
+com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.shaking.G1:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> u
     java.util.Set preconditions -> t
     int $r8$clinit -> y
@@ -111749,7 +110595,6 @@
     12:14:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):262:264 -> b
     15:15:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassAccessFlags(com.android.tools.r8.shaking.ProguardAccessFlags):155:155 -> b
     15:15:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):264 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):265:265 -> b
     17:17:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setNegatedClassAccessFlags(com.android.tools.r8.shaking.ProguardAccessFlags):164:164 -> b
     17:17:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):265 -> b
@@ -111761,16 +110606,16 @@
     21:21:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):267 -> b
     22:24:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):268:270 -> b
     25:30:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):269:274 -> b
-    31:31:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceClassName(com.android.tools.r8.shaking.ProguardTypeMatcher):109:109 -> b
-    31:31:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):271 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:32:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):275:275 -> b
-    33:33:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:96 -> b
-    33:33:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):275 -> b
-    34:35:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):276:277 -> b
-    36:46:com.android.tools.r8.shaking.NoHorizontalClassMergingRule com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder.build():29:39 -> b
-    36:46:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):277 -> b
-    47:47:boolean lambda$noHorizontalClassMergingRuleForCondition$3(com.android.tools.r8.shaking.ProguardMemberRule):255:255 -> b
+    31:31:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):271:271 -> b
+    32:32:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceClassName(com.android.tools.r8.shaking.ProguardTypeMatcher):109:109 -> b
+    32:32:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):271 -> b
+    33:33:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):275:275 -> b
+    34:34:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:96 -> b
+    34:34:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):275 -> b
+    35:36:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):276:277 -> b
+    37:47:com.android.tools.r8.shaking.NoHorizontalClassMergingRule com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder.build():29:39 -> b
+    37:47:com.android.tools.r8.shaking.NoHorizontalClassMergingRule noHorizontalClassMergingRuleForCondition(com.android.tools.r8.graph.DexItemFactory):277 -> b
+    48:48:boolean lambda$noHorizontalClassMergingRuleForCondition$3(com.android.tools.r8.shaking.ProguardMemberRule):255:255 -> b
     1:1:com.android.tools.r8.shaking.ProguardMemberRule lambda$noHorizontalClassMergingRuleForCondition$4(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardMemberRule):256:256 -> c
     1:8:boolean equals(java.lang.Object):282:289 -> equals
     1:1:int hashCode():294:294 -> hashCode
@@ -111778,20 +110623,20 @@
     1:1:java.lang.Iterable getWildcards():141:141 -> x
     2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> x
     2:2:java.lang.Iterable getWildcards():141 -> x
-com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.shaking.c2:
+com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.shaking.D1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):22:22 -> <init>
     1:1:java.lang.String part():25:25 -> part
-com.android.tools.r8.shaking.ProguardIfRule$2 -> com.android.tools.r8.shaking.d2:
+com.android.tools.r8.shaking.ProguardIfRule$2 -> com.android.tools.r8.shaking.E1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):30:30 -> <init>
     1:1:java.lang.String part():33:33 -> part
-com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.shaking.e2:
+com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.shaking.F1:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():60:60 -> <clinit>
     1:1:void <init>():65:65 -> <init>
     2:2:void <init>():62:62 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.ZN:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.PM:
     boolean runtimeInvisibleAnnotations -> m
     boolean runtimeVisibleParameterAnnotations -> n
     boolean runtimeInvisibleParameterAnnotations -> o
@@ -111824,43 +110669,43 @@
     1:5:boolean equals(java.lang.Object):173:177 -> equals
     1:16:int hashCode():197:212 -> hashCode
     1:1:java.lang.String toString():295:295 -> toString
-com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.shaking.h2:
+com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.shaking.I1:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):63:63 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():85:85 -> F
-    1:22:com.android.tools.r8.shaking.ProguardKeepRule materialize(com.android.tools.r8.graph.DexItemFactory):89:110 -> a
-    23:23:com.android.tools.r8.shaking.ProguardMemberRule lambda$materialize$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardMemberRule):107:107 -> a
-    24:31:void appendNonEmpty(java.lang.StringBuilder,java.lang.String,java.lang.Object,java.lang.String):126:133 -> a
-    32:34:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):140:142 -> a
-    35:35:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    35:35:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):141 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:36:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):148:148 -> a
-    37:37:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:137 -> a
-    37:37:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):148 -> a
-    38:38:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> a
-    38:38:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():184 -> a
-    38:38:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):149 -> a
-    39:39:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():184:184 -> a
-    39:39:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):149 -> a
-    40:42:com.android.tools.r8.shaking.ProguardMemberRule com.android.tools.r8.shaking.ProguardMemberRule.defaultKeepAllRule():444:446 -> a
-    40:42:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():185 -> a
-    40:42:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):149 -> a
-    43:43:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():185:185 -> a
-    43:43:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):149 -> a
-    44:44:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):150:150 -> a
-    45:45:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    45:45:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):151 -> a
-    46:49:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):151:154 -> a
+    1:134:void appendNonEmpty(java.lang.StringBuilder,java.lang.String,java.lang.Object,java.lang.String):0:133 -> a
+    135:156:com.android.tools.r8.shaking.ProguardKeepRule materialize(com.android.tools.r8.graph.DexItemFactory):89:110 -> a
+    157:157:com.android.tools.r8.shaking.ProguardMemberRule lambda$materialize$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardMemberRule):107:107 -> a
+    158:160:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):140:142 -> a
+    161:161:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):141:141 -> a
+    162:162:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
+    162:162:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):141 -> a
+    163:163:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):148:148 -> a
+    164:164:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:137 -> a
+    164:164:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):148 -> a
+    165:165:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> a
+    165:165:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():184 -> a
+    165:165:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):149 -> a
+    166:166:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():184:184 -> a
+    166:166:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):149 -> a
+    167:169:com.android.tools.r8.shaking.ProguardMemberRule com.android.tools.r8.shaking.ProguardMemberRule.defaultKeepAllRule():444:446 -> a
+    167:169:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():185 -> a
+    167:169:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):149 -> a
+    170:170:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():185:185 -> a
+    170:170:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):149 -> a
+    171:171:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):150:150 -> a
+    172:172:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
+    172:172:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):151 -> a
+    173:176:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):151:154 -> a
     1:5:boolean equals(java.lang.Object):115:119 -> equals
     com.android.tools.r8.shaking.ProguardKeepRule asProguardKeepRule() -> t
-com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.shaking.g2:
+com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.shaking.H1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):142:142 -> <init>
     1:1:java.lang.String part():145:145 -> part
-com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.shaking.h2$a:
+com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.shaking.I1$a:
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
     1:16:com.android.tools.r8.shaking.ProguardKeepRule build():28:43 -> f
-com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.shaking.i2:
+com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.shaking.J1:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers modifiers -> s
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> r
     1:16:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):58:73 -> <init>
@@ -111870,13 +110715,13 @@
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType getType():77:77 -> E
     1:12:boolean equals(java.lang.Object):86:97 -> equals
     1:3:int hashCode():103:105 -> hashCode
-com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.shaking.i2$a:
+com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.shaking.J1$a:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder modifiersBuilder -> q
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> p
     1:1:void <init>():21:21 -> <init>
     2:2:void <init>():18:18 -> <init>
     1:2:com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder setType(com.android.tools.r8.shaking.ProguardKeepRuleType):25:26 -> a
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.shaking.k2:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.shaking.K1:
     boolean allowsObfuscation -> e
     boolean includeDescriptorClasses -> f
     boolean allowsAccessModification -> a
@@ -111890,8 +110735,7 @@
     1:5:boolean equals(java.lang.Object):98:102 -> equals
     1:6:int hashCode():112:117 -> hashCode
     1:8:java.lang.String toString():122:129 -> toString
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.shaking.j2:
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.shaking.k2$a:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.shaking.K1$a:
     boolean allowsObfuscation -> e
     boolean includeDescriptorClasses -> f
     boolean allowsAccessModification -> a
@@ -111908,7 +110752,7 @@
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder setAllowsOptimization(boolean):34:34 -> c
     2:2:void setIncludeDescriptorClasses(boolean):44:44 -> c
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder setAllowsShrinking(boolean):29:29 -> d
-com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.bO:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.RM:
     com.android.tools.r8.shaking.ProguardKeepRuleType[] $VALUES -> f
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP -> b
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASS_MEMBERS -> c
@@ -111923,10 +110767,10 @@
     13:13:java.lang.String toString():22:22 -> toString
     14:14:java.lang.String toString():20:20 -> toString
     15:15:java.lang.String toString():18:18 -> toString
-com.android.tools.r8.shaking.ProguardKeepRuleType$1 -> com.android.tools.r8.internal.aO:
+com.android.tools.r8.shaking.ProguardKeepRuleType$1 -> com.android.tools.r8.internal.QM:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardKeepRuleType -> a
     1:1:void <clinit>():16:16 -> <clinit>
-com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.shaking.m2:
+com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.shaking.M1:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     java.util.List annotations -> a
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
@@ -111943,7 +110787,6 @@
     41:41:boolean matches(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):241:241 -> a
     42:42:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
     42:42:boolean matches(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):241 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     43:90:boolean matches(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):242:289 -> a
     91:91:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.isTripleDotPattern():0:0 -> a
     91:91:boolean matches(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):289 -> a
@@ -111970,10 +110813,10 @@
     40:49:java.lang.String toString():412:421 -> toString
     50:68:java.lang.String toString():409:427 -> toString
     69:103:java.lang.String toString():406:440 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.shaking.l2:
+com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.shaking.L1:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardMemberType -> a
     1:1:void <clinit>():190:190 -> <clinit>
-com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.shaking.m2$a:
+com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.shaking.M1$a:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     java.util.List annotations -> a
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
@@ -111999,7 +110842,7 @@
     1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():54:54 -> c
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getTypeMatcher():67:67 -> d
     1:1:boolean isValid():91:91 -> e
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.shaking.n2:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.shaking.N1:
     com.android.tools.r8.utils.LongInterval longInterval -> c
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type type -> a
     boolean $assertionsDisabled -> e
@@ -112025,7 +110868,7 @@
     134:134:java.lang.String toString():115:115 -> toString
     135:135:java.lang.String toString():116:116 -> toString
     118:132:java.lang.String toString():117:131 -> toString
-com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.iO:
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.XM:
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> h
     com.android.tools.r8.shaking.ProguardMemberType INIT -> g
     com.android.tools.r8.shaking.ProguardMemberType CLINIT -> f
@@ -112041,7 +110884,7 @@
     1:1:boolean includesFields():18:18 -> a
     1:1:boolean includesMethods():22:22 -> b
     1:1:com.android.tools.r8.shaking.ProguardMemberType[] values():6:6 -> c
-com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.shaking.s2:
+com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.shaking.R1:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.shaking.ProguardNameMatcher MATCH_ALL_NAMES -> a
     1:3:void <clinit>():14:16 -> <clinit>
@@ -112049,22 +110892,20 @@
     2:2:void <init>():18:18 -> <init>
     boolean matches(java.lang.String) -> a
     1:1:boolean access$100(java.lang.String,int,java.lang.String,int,java.util.List,int):14:14 -> a
-    2:44:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):39:81 -> a
-    45:58:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):56:69 -> a
-    59:59:java.lang.String com.android.tools.r8.shaking.ProguardWildcard$BackReference.getCaptured():105:105 -> a
-    59:59:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):70 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    60:66:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):72:78 -> a
-    67:111:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):43:87 -> a
-    112:112:java.lang.Iterable getWildcards():93:93 -> a
-    113:113:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardNameMatcher):97:97 -> a
-    114:114:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2249:2249 -> a
-    114:114:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):23 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    115:119:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):24:28 -> a
+    2:2:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):23:23 -> a
+    3:3:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2249:2249 -> a
+    3:3:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):23 -> a
+    4:8:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):24:28 -> a
+    9:51:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):39:81 -> a
+    52:66:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):56:70 -> a
+    67:67:java.lang.String com.android.tools.r8.shaking.ProguardWildcard$BackReference.getCaptured():105:105 -> a
+    67:67:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):70 -> a
+    68:74:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):72:78 -> a
+    75:119:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):43:87 -> a
+    120:120:java.lang.Iterable getWildcards():93:93 -> a
+    121:121:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardNameMatcher):97:97 -> a
     com.android.tools.r8.shaking.ProguardNameMatcher materialize() -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.shaking.o2:
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.shaking.p2:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.shaking.O1:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> c
     1:1:void <init>():108:108 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardWildcard):111:112 -> <init>
@@ -112073,7 +110914,7 @@
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames materialize():128:128 -> b
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher materialize():104 -> b
     1:1:java.lang.String toString():133:133 -> toString
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.shaking.q2:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.shaking.P1:
     java.util.List wildcards -> d
     java.lang.String pattern -> c
     1:3:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):142:144 -> <init>
@@ -112084,14 +110925,14 @@
     1:1:boolean equals(java.lang.Object):180:180 -> equals
     1:1:int hashCode():185:185 -> hashCode
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.shaking.r2:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.shaking.Q1:
     java.lang.String name -> c
     1:2:void <init>(java.lang.String):193:194 -> <init>
     1:1:boolean matches(java.lang.String):199:199 -> a
     1:1:boolean equals(java.lang.Object):209:209 -> equals
     1:1:int hashCode():214:214 -> hashCode
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.jO:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.YM:
     java.lang.String pattern -> a
     1:2:void <init>(java.lang.String):10:11 -> <init>
     1:1:boolean matches(java.lang.String):15:15 -> a
@@ -112103,7 +110944,7 @@
     57:86:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):42:71 -> a
     1:5:boolean equals(java.lang.Object):83:87 -> equals
     1:1:int hashCode():92:92 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.shaking.u2:
+com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.shaking.S1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap packageNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardPackageNameList$1):13:13 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):40:41 -> <init>
@@ -112116,15 +110957,14 @@
     8:11:boolean matches(com.android.tools.r8.graph.ProgramPackage):64 -> a
     1:15:boolean equals(java.lang.Object):83:97 -> equals
     1:6:int hashCode():107:112 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList$1 -> com.android.tools.r8.shaking.t2:
-com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.shaking.u2$a:
+com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.shaking.S1$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPackageNameList$1):19:19 -> <init>
     2:2:void <init>():25:25 -> <init>
     3:3:void <init>():22:22 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder addPackageName(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):29:29 -> a
     2:2:com.android.tools.r8.shaking.ProguardPackageNameList build():34:34 -> a
-com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.shaking.x2:
+com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.shaking.U1:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> b
     boolean $assertionsDisabled -> c
@@ -112134,8 +110974,7 @@
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder builder():14:14 -> a
     2:4:boolean matches(java.lang.String):59:61 -> a
     1:1:boolean isEnabled():55:55 -> b
-com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.shaking.v2:
-com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.shaking.w2:
+com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.shaking.T1:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> b
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathFilter$1):17:17 -> <init>
@@ -112145,13 +110984,12 @@
     2:2:com.android.tools.r8.shaking.ProguardPathFilter build():40:40 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder disable():30:30 -> b
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder enable():35:35 -> c
-com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.shaking.D2:
+com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.shaking.Z1:
     1:1:void <init>():10:10 -> <init>
     boolean matches(java.lang.String) -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList emptyList():17:17 -> b
-com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.shaking.y2:
-com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.shaking.z2:
+com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.shaking.V1:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):22:22 -> <init>
     2:2:void <init>():26:26 -> <init>
@@ -112159,29 +110997,29 @@
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String):30:30 -> a
     2:2:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String,boolean):34:34 -> a
     1:5:com.android.tools.r8.shaking.ProguardPathList build():39:43 -> b
-com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.shaking.A2:
+com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.shaking.W1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):122:122 -> <init>
     2:2:void <init>():124:124 -> <init>
     boolean matches(java.lang.String) -> a
-com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.shaking.B2:
+com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.shaking.X1:
     boolean negated -> a
     java.lang.String pattern -> b
     1:3:void <init>(boolean,java.lang.String):52:54 -> <init>
-    1:1:boolean match(java.lang.String):58:58 -> a
-    1:1:boolean access$300(com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher,java.lang.String):48 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:28:boolean matchImpl(java.lang.String,int,java.lang.String,int):62:88 -> a
-    29:29:boolean matchImpl(java.lang.String,int,java.lang.String,int):83:83 -> a
-    30:33:boolean matchImpl(java.lang.String,int,java.lang.String,int):66:69 -> a
-    34:34:boolean containsSeparatorsStartingAt(java.lang.String,int):98:98 -> a
-    34:34:boolean matchImpl(java.lang.String,int,java.lang.String,int):70 -> a
-    35:56:boolean matchImpl(java.lang.String,int,java.lang.String,int):73:94 -> a
-com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.shaking.C2:
+    1:1:boolean access$300(com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher,java.lang.String):48:48 -> a
+    2:2:boolean match(java.lang.String):58:58 -> a
+    2:2:boolean access$300(com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher,java.lang.String):48 -> a
+    3:29:boolean matchImpl(java.lang.String,int,java.lang.String,int):62:88 -> a
+    30:30:boolean matchImpl(java.lang.String,int,java.lang.String,int):83:83 -> a
+    31:34:boolean matchImpl(java.lang.String,int,java.lang.String,int):66:69 -> a
+    35:35:boolean containsSeparatorsStartingAt(java.lang.String,int):98:98 -> a
+    35:35:boolean matchImpl(java.lang.String,int,java.lang.String,int):70 -> a
+    36:57:boolean matchImpl(java.lang.String,int,java.lang.String,int):73:94 -> a
+com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.shaking.Y1:
     java.util.List matchers -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardPathList$1):103:103 -> <init>
     2:3:void <init>(java.util.List):106:107 -> <init>
     1:4:boolean matches(java.lang.String):112:115 -> a
-com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.kO:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.ZM:
     com.android.tools.r8.position.Position position -> e
     com.android.tools.r8.origin.Origin origin -> d
     java.lang.String snippet -> c
@@ -112191,7 +111029,7 @@
     1:1:java.lang.String getMessage():48:48 -> getMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
-com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.shaking.F2:
+com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.shaking.a2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher$1):23:23 -> <init>
     2:2:void <init>():31:31 -> <init>
     com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType asSpecificTypeMatcher() -> a
@@ -112208,13 +111046,12 @@
     com.android.tools.r8.graph.DexType getSpecificType() -> b
     boolean matches(com.android.tools.r8.graph.DexType) -> b
     1:1:java.lang.Iterable getWildcards():59:59 -> c
-com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.shaking.E2:
-com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.shaking.F2$a:
+com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.shaking.a2$a:
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType TYPE -> c
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType CLASS -> b
     1:2:void <clinit>():35:36 -> <clinit>
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.shaking.G2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.shaking.b2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ALL_TYPES -> b
     1:1:void <clinit>():152:152 -> <clinit>
@@ -112230,7 +111067,7 @@
     1:1:boolean equals(java.lang.Object):187:187 -> equals
     1:1:int hashCode():192:192 -> hashCode
     1:1:java.lang.String toString():182:182 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.shaking.H2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.shaking.c2:
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ANY_ARG_SEQUENCE -> a
     1:1:void <clinit>():198:198 -> <clinit>
     1:1:void <init>():196:196 -> <init>
@@ -112239,7 +111076,7 @@
     1:1:boolean equals(java.lang.Object):217:217 -> equals
     1:1:int hashCode():222:222 -> hashCode
     1:1:java.lang.String toString():207:207 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.shaking.I2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.shaking.d2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_BASIC_TYPES -> b
     1:1:void <clinit>():283:283 -> <clinit>
@@ -112255,7 +111092,7 @@
     1:1:boolean equals(java.lang.Object):321:321 -> equals
     1:1:int hashCode():326:326 -> hashCode
     1:1:java.lang.String toString():316:316 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.shaking.J2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.shaking.e2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> b
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_CLASS_TYPES -> c
     boolean $assertionsDisabled -> e
@@ -112273,7 +111110,7 @@
     1:1:boolean equals(java.lang.Object):272:272 -> equals
     1:1:int hashCode():277:277 -> hashCode
     1:1:java.lang.String toString():267:267 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.shaking.F2$b:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.shaking.a2$b:
     com.android.tools.r8.graph.DexType type -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardTypeMatcher$1):330:330 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):334:335 -> <init>
@@ -112283,7 +111120,7 @@
     1:2:boolean equals(java.lang.Object):355:356 -> equals
     1:1:int hashCode():363:363 -> hashCode
     1:1:java.lang.String toString():350:350 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.shaking.K2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.shaking.f2:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType kind -> c
@@ -112304,37 +111141,35 @@
     39:64:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):423 -> a
     65:78:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):424:437 -> a
     79:170:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):499:590 -> a
-    171:185:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):563:577 -> a
-    186:186:java.lang.String com.android.tools.r8.shaking.ProguardWildcard$BackReference.getCaptured():105:105 -> a
-    186:186:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):578 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    187:193:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):580:586 -> a
-    194:215:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):503:524 -> a
-    216:220:boolean isArrayType(java.lang.String):604:608 -> a
-    216:220:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):524 -> a
-    221:221:boolean containsSeparatorsStartingAt(java.lang.String,int):600:600 -> a
-    221:221:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):526 -> a
-    222:222:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):527:527 -> a
-    223:227:boolean isArrayType(java.lang.String):604:608 -> a
-    223:227:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):527 -> a
-    228:257:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):531:560 -> a
-    258:295:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):559:596 -> a
+    171:186:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):563:578 -> a
+    187:187:java.lang.String com.android.tools.r8.shaking.ProguardWildcard$BackReference.getCaptured():105:105 -> a
+    187:187:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):578 -> a
+    188:194:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):580:586 -> a
+    195:216:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):503:524 -> a
+    217:221:boolean isArrayType(java.lang.String):604:608 -> a
+    217:221:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):524 -> a
+    222:222:boolean containsSeparatorsStartingAt(java.lang.String,int):600:600 -> a
+    222:222:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):526 -> a
+    223:223:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):527:527 -> a
+    224:228:boolean isArrayType(java.lang.String):604:608 -> a
+    224:228:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):527 -> a
+    229:258:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):531:560 -> a
+    259:296:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):559:596 -> a
     1:4:boolean matches(com.android.tools.r8.graph.DexType):393:396 -> b
     1:1:java.lang.Iterable getWildcards():403:403 -> c
     1:3:boolean equals(java.lang.Object):618:620 -> equals
     1:1:int hashCode():627:627 -> hashCode
     1:1:java.lang.String toString():613:613 -> toString
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.shaking.N2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.shaking.h2:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:java.lang.String typeString():79:79 -> C
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.shaking.L2:
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.shaking.M2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.shaking.g2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.shaking.O2:
+com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.shaking.i2:
     1:1:void <init>():8:8 -> <init>
     com.android.tools.r8.shaking.ProguardWildcard$BackReference asBackReference() -> a
     void setCaptured(java.lang.String) -> a
@@ -112343,7 +111178,7 @@
     boolean isBackReference() -> d
     boolean isPattern() -> e
     com.android.tools.r8.shaking.ProguardWildcard materialize() -> f
-com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.shaking.O2$a:
+com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.shaking.i2$a:
     int referenceIndex -> b
     com.android.tools.r8.shaking.ProguardWildcard$Pattern reference -> a
     1:2:void <init>(int):85:86 -> <init>
@@ -112365,7 +111200,7 @@
     133:133:java.lang.String toString():130:130 -> toString
     134:134:java.lang.String toString():130:130 -> toString
     135:135:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.shaking.O2$b:
+com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.shaking.i2$b:
     java.lang.String pattern -> a
     java.lang.String captured -> b
     1:1:void <init>(java.lang.String):35:35 -> <init>
@@ -112380,7 +111215,7 @@
     6:6:void setCaptured(java.lang.String):41:41 -> h
     6:6:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():60 -> h
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.shaking.ReprocessClassInitializerRule -> com.android.tools.r8.shaking.R2:
+com.android.tools.r8.shaking.ReprocessClassInitializerRule -> com.android.tools.r8.shaking.k2:
     int $r8$clinit -> s
     com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type type -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.shaking.ReprocessClassInitializerRule$1):11:11 -> <init>
@@ -112389,15 +111224,14 @@
     8:8:java.lang.String typeString():113:113 -> C
     1:1:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type getType():96:96 -> D
     com.android.tools.r8.shaking.ReprocessClassInitializerRule asReprocessClassInitializerRule() -> u
-com.android.tools.r8.shaking.ReprocessClassInitializerRule$1 -> com.android.tools.r8.shaking.P2:
-com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder -> com.android.tools.r8.shaking.Q2:
+com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder -> com.android.tools.r8.shaking.j2:
     com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.ReprocessClassInitializerRule$1):18:18 -> <init>
     2:2:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder setType(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type):28:28 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
     1:11:com.android.tools.r8.shaking.ReprocessClassInitializerRule build():39:49 -> f
-com.android.tools.r8.shaking.ReprocessMethodRule -> com.android.tools.r8.shaking.U2:
+com.android.tools.r8.shaking.ReprocessMethodRule -> com.android.tools.r8.shaking.m2:
     com.android.tools.r8.shaking.ReprocessMethodRule$Type type -> r
     int $r8$clinit -> s
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.shaking.ReprocessMethodRule$1):11:11 -> <init>
@@ -112406,63 +111240,62 @@
     8:8:java.lang.String typeString():113:113 -> C
     1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Type getType():96:96 -> D
     com.android.tools.r8.shaking.ReprocessMethodRule asReprocessMethodRule() -> v
-com.android.tools.r8.shaking.ReprocessMethodRule$1 -> com.android.tools.r8.shaking.S2:
-com.android.tools.r8.shaking.ReprocessMethodRule$Builder -> com.android.tools.r8.shaking.T2:
+com.android.tools.r8.shaking.ReprocessMethodRule$Builder -> com.android.tools.r8.shaking.l2:
     com.android.tools.r8.shaking.ReprocessMethodRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.ReprocessMethodRule$1):18:18 -> <init>
     2:2:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Builder setType(com.android.tools.r8.shaking.ReprocessMethodRule$Type):28:28 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
     1:11:com.android.tools.r8.shaking.ReprocessMethodRule build():39:49 -> f
-com.android.tools.r8.shaking.RootSetUtils -> com.android.tools.r8.internal.JU:
-com.android.tools.r8.shaking.RootSetUtils$1 -> com.android.tools.r8.shaking.V2:
+com.android.tools.r8.shaking.RootSetUtils -> com.android.tools.r8.internal.cT:
+com.android.tools.r8.shaking.RootSetUtils$1 -> com.android.tools.r8.shaking.n2:
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$ReprocessClassInitializerRule$Type -> d
     int[] $SwitchMap$com$android$tools$r8$shaking$ReprocessMethodRule$Type -> e
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardKeepRuleType -> a
     1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Type[] com.android.tools.r8.shaking.ReprocessMethodRule$Type.values():13:13 -> <clinit>
-    1:1:void <clinit>():1332 -> <clinit>
-    2:2:void <clinit>():1332:1332 -> <clinit>
+    1:1:void <clinit>():1327 -> <clinit>
+    2:2:void <clinit>():1327:1327 -> <clinit>
     3:3:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type[] com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type.values():13:13 -> <clinit>
-    3:3:void <clinit>():1317 -> <clinit>
-    4:4:void <clinit>():1317:1317 -> <clinit>
+    3:3:void <clinit>():1312 -> <clinit>
+    4:4:void <clinit>():1312:1312 -> <clinit>
     5:5:com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] com.android.tools.r8.shaking.MemberValuePropagationRule$Type.values():13:13 -> <clinit>
-    5:5:void <clinit>():1280 -> <clinit>
-    6:6:void <clinit>():1280:1280 -> <clinit>
+    5:5:void <clinit>():1281 -> <clinit>
+    6:6:void <clinit>():1281:1281 -> <clinit>
     7:7:com.android.tools.r8.shaking.ClassInlineRule$Type[] com.android.tools.r8.shaking.ClassInlineRule$Type.values():13:13 -> <clinit>
-    7:7:void <clinit>():1231 -> <clinit>
-    8:8:void <clinit>():1231:1231 -> <clinit>
+    7:7:void <clinit>():1232 -> <clinit>
+    8:8:void <clinit>():1232:1232 -> <clinit>
     9:9:com.android.tools.r8.shaking.InlineRule$Type[] com.android.tools.r8.shaking.InlineRule$Type.values():13:13 -> <clinit>
-    9:9:void <clinit>():1190 -> <clinit>
-    10:10:void <clinit>():1190:1190 -> <clinit>
-    11:11:void <clinit>():211:211 -> <clinit>
-com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet -> com.android.tools.r8.shaking.W2:
-    1:1:void <init>(java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):2029:2029 -> <init>
-com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder -> com.android.tools.r8.shaking.X2:
+    9:9:void <clinit>():1191 -> <clinit>
+    10:10:void <clinit>():1191:1191 -> <clinit>
+    11:11:void <clinit>():212:212 -> <clinit>
+com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet -> com.android.tools.r8.shaking.o2:
+    1:1:void <init>(java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):2054:2054 -> <init>
+com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder -> com.android.tools.r8.shaking.p2:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> K
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.RootSetUtils$1):1995:1995 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer):2003:2004 -> <init>
-    1:2:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2009:2010 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.RootSetUtils$1):2020:2020 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer):2028:2029 -> <init>
+    1:2:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2034:2035 -> a
     3:3:boolean com.android.tools.r8.shaking.AnnotationMatchResult.isConcreteAnnotationMatchResult():0:0 -> a
-    3:3:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2010 -> a
-    4:6:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2011:2011 -> a
-com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet -> com.android.tools.r8.shaking.Y2:
+    3:3:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2035 -> a
+    4:6:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2036:2036 -> a
+com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet -> com.android.tools.r8.shaking.q2:
     boolean $assertionsDisabled -> z
-    1:1:void <clinit>():2072:2072 -> <clinit>
-    1:23:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2082:2104 -> <init>
-    24:24:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2079:2079 -> <init>
+    1:1:void <clinit>():2097:2097 -> <clinit>
+    1:23:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2107:2129 -> <init>
+    24:24:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2104:2104 -> <init>
     void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition) -> a
-    1:1:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2111:2111 -> a
-    2:17:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):2120:2135 -> a
-    18:18:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexReference):2127:2127 -> a
-    1:10:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):2141:2150 -> b
-com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder -> com.android.tools.r8.shaking.Z2:
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable,com.android.tools.r8.shaking.RootSetUtils$1):2046:2046 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2052:2052 -> <init>
-    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):2046:2046 -> a
-    1:3:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet build(java.util.concurrent.ExecutorService):2063:2065 -> b
-com.android.tools.r8.shaking.RootSetUtils$RootSet -> com.android.tools.r8.shaking.a3:
+    1:1:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2136:2136 -> a
+    2:17:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):2145:2160 -> a
+    18:18:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexReference):2152:2152 -> a
+    1:10:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):2166:2175 -> b
+com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder -> com.android.tools.r8.shaking.r2:
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable,com.android.tools.r8.shaking.RootSetUtils$1):2071:2071 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2077:2077 -> <init>
+    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):2071:2071 -> a
+    1:3:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet build(java.util.concurrent.ExecutorService):2088:2090 -> b
+com.android.tools.r8.shaking.RootSetUtils$RootSet -> com.android.tools.r8.shaking.s2:
     java.util.Set identifierNameStrings -> w
     java.util.Set ifRules -> x
     java.util.Map mayHaveSideEffects -> t
@@ -112482,234 +111315,232 @@
     java.util.Set keepUnusedArguments -> l
     java.util.Set reprocess -> m
     java.util.Set neverReprocess -> n
-    1:1:void <clinit>():1645:1645 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.shaking.RootSetUtils$1):1645:1645 -> <init>
-    2:26:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1692:1716 -> <init>
-    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> a
-    1:1:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1764 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1645:1645 -> a
-    2:2:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1768 -> a
-    3:8:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1768:1773 -> a
-    9:9:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1645:1645 -> a
-    9:9:void pruneItems(com.android.tools.r8.graph.PrunedItems):1796 -> a
+    1:1:void <clinit>():1670:1670 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.shaking.RootSetUtils$1):1670:1670 -> <init>
+    2:26:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1717:1741 -> <init>
+    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1670:1670 -> a
+    1:1:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1793 -> a
+    2:7:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1793:1798 -> a
+    8:8:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1670:1670 -> a
+    8:8:void pruneItems(com.android.tools.r8.graph.PrunedItems):1821 -> a
+    9:9:void pruneItems(com.android.tools.r8.graph.PrunedItems):1821:1821 -> a
     10:10:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    10:10:void pruneItems(com.android.tools.r8.graph.PrunedItems):1796 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:12:void pruneItems(com.android.tools.r8.graph.PrunedItems):1798:1799 -> a
-    13:13:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1645:1645 -> a
-    13:13:void pruneItems(com.android.tools.r8.graph.PrunedItems):1800 -> a
-    14:14:void pruneItems(com.android.tools.r8.graph.PrunedItems):1800:1800 -> a
-    15:15:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1645:1645 -> a
-    15:15:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):1806 -> a
-    16:17:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):1807:1808 -> a
-    18:18:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1645:1645 -> a
-    18:18:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1812 -> a
-    19:19:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1813:1813 -> a
+    10:10:void pruneItems(com.android.tools.r8.graph.PrunedItems):1821 -> a
+    11:12:void pruneItems(com.android.tools.r8.graph.PrunedItems):1823:1824 -> a
+    13:13:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1670:1670 -> a
+    13:13:void pruneItems(com.android.tools.r8.graph.PrunedItems):1825 -> a
+    14:14:void pruneItems(com.android.tools.r8.graph.PrunedItems):1825:1825 -> a
+    15:15:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1670:1670 -> a
+    15:15:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):1831 -> a
+    16:17:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):1832:1833 -> a
+    18:18:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1670:1670 -> a
+    18:18:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1837 -> a
+    19:19:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1838:1838 -> a
     20:20:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    20:20:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1813 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:22:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1813:1814 -> a
-    23:28:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1720:1725 -> a
+    20:20:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1838 -> a
+    21:22:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1838:1839 -> a
+    23:28:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1745:1750 -> a
     29:29:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
-    29:29:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1725 -> a
-    30:43:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1726:1739 -> a
-    44:51:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):1745:1752 -> a
-    52:52:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1750:1750 -> a
-    53:54:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1750:1751 -> a
-    55:55:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1757:1757 -> a
-    56:56:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1645:1645 -> a
-    56:56:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1760 -> a
-    57:59:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1761:1763 -> a
-    60:60:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1762:1762 -> a
-    61:61:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1780:1780 -> a
-    62:70:boolean lambda$pruneDeadReferences$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1782:1790 -> a
-    71:71:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1786:1786 -> a
-    72:72:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):535:535 -> a
-    72:72:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
-    72:72:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1786 -> a
-    73:73:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):539:539 -> a
-    73:73:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):535 -> a
-    73:73:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
-    73:73:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1786 -> a
-    74:74:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1789:1789 -> a
-    75:75:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1788:1788 -> a
-    76:76:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1816:1816 -> a
-    77:77:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> a
-    77:77:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1816 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    78:80:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1818:1820 -> a
-    81:81:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
-    81:81:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1820 -> a
-    82:82:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1820:1820 -> a
-    83:83:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexField.lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):89:89 -> a
-    83:83:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1821 -> a
-    84:86:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1823:1825 -> a
-    87:87:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3745,"2":3746,"3":3747}}
-    3745:3745:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1825:1825 -> a
-    3746:3746:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1825:1825 -> a
-    3747:3747:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1825:1825 -> a
-    1913:1914:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1826:1827 -> a
-    1915:1915:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3749,"2":3750,"3":3751}}
-    3749:3749:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1827:1827 -> a
-    3750:3750:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1827:1827 -> a
-    3751:3751:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1827:1827 -> a
-    3744:3744:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1829:1829 -> a
-    3752:3760:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1874:1882 -> a
-    3761:3761:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1897:1897 -> a
-    3762:3762:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    3762:3762:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1897 -> a
-    3763:3763:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1898:1898 -> a
-    3764:3764:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9492,"2":9493,"3":9494}}
-    9492:9492:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1899:1899 -> a
-    9493:9493:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    9493:9493:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1899 -> a
-    9494:9494:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    9494:9494:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1899 -> a
-    5664:5664:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1900:1900 -> a
-    5665:5665:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9495,"2":9496,"3":9497}}
-    9495:9495:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1900:1900 -> a
-    9496:9496:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1900:1900 -> a
-    9497:9497:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1900:1900 -> a
-    5666:5666:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9498,"2":9499,"3":9500,"4":9501}}
-    9498:9498:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1901:1901 -> a
-    9499:9499:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1901:1901 -> a
-    9500:9500:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1901:1901 -> a
-    9501:9501:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1901:1901 -> a
-    7567:7572:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1901:1906 -> a
-    7573:7575:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):334:336 -> a
-    7573:7575:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1906 -> a
-    7576:7576:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    7576:7576:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):336 -> a
-    7576:7576:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1906 -> a
-    7577:7577:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1907:1907 -> a
-    7578:7578:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9507,"2":9508,"3":9509}}
-    9507:9507:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1907:1907 -> a
-    9508:9508:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1907:1907 -> a
-    9509:9509:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1907:1907 -> a
-    9487:9491:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1909:1913 -> a
-    9510:9510:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):1991:1991 -> a
-    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
-    1:1:boolean lambda$verifyKeptItemsAreKept$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1895 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:3:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1843:1844 -> b
-    4:4:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3710,"2":3711,"3":3712}}
-    3710:3710:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1844:1844 -> b
-    3711:3711:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1844:1844 -> b
-    3712:3712:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1844:1844 -> b
-    1849:1851:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1845:1847 -> b
-    1852:1852:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> b
-    1852:1852:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1847 -> b
-    1853:1856:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1847:1850 -> b
-    1857:1857:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3718,"2":3719,"3":3720}}
-    3718:3718:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1850:1850 -> b
-    3719:3719:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1850:1850 -> b
-    3720:3720:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1850:1850 -> b
-    3709:3709:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1852:1852 -> b
-    3721:3724:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1888:1891 -> b
-    3725:3725:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1645:1645 -> b
-    3725:3725:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1892 -> b
-    3726:3726:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1893:1893 -> b
-    3727:3727:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
-    3727:3727:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1893 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3728:3770:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1893:1935 -> b
-    3771:3771:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9650,"2":9651,"3":9652}}
-    9650:9650:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1935:1935 -> b
-    9651:9651:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1935:1935 -> b
-    9652:9652:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1935:1935 -> b
-    5708:5719:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1937:1948 -> b
-    5720:5720:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9665,"2":9666,"3":9667}}
-    9665:9665:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1948:1948 -> b
-    9666:9666:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1948:1948 -> b
-    9667:9667:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1948:1948 -> b
-    7670:7683:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1950:1963 -> b
-    7684:7684:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9682,"2":9683,"3":9684}}
-    9682:9682:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1963:1963 -> b
-    9683:9683:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1963:1963 -> b
-    9684:9684:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1963:1963 -> b
-    7685:7685:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9685,"2":9686,"3":9687,"4":9688}}
-    9685:9685:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1964:1964 -> b
-    9686:9686:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1964:1964 -> b
-    9687:9687:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1964:1964 -> b
-    9688:9688:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1964:1964 -> b
-    9649:9649:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1964:1964 -> b
-    9689:9689:java.util.Set lambda$verifyKeptItemsAreKept$13(com.android.tools.r8.graph.DexType):1903:1903 -> b
-    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1645:1645 -> c
-    1:1:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1837 -> c
-    2:2:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1838:1838 -> c
+    29:29:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1750 -> a
+    30:43:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1751:1764 -> a
+    44:51:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):1770:1777 -> a
+    52:52:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1775:1775 -> a
+    53:54:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1775:1776 -> a
+    55:55:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1782:1782 -> a
+    56:56:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1670:1670 -> a
+    56:56:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1785 -> a
+    57:59:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1786:1788 -> a
+    60:60:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1787:1787 -> a
+    61:61:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1789:1789 -> a
+    62:62:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> a
+    62:62:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1789 -> a
+    63:63:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1805:1805 -> a
+    64:72:boolean lambda$pruneDeadReferences$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1807:1815 -> a
+    73:73:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1811:1811 -> a
+    74:74:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):535:535 -> a
+    74:74:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
+    74:74:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1811 -> a
+    75:75:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):539:539 -> a
+    75:75:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):535 -> a
+    75:75:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
+    75:75:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1811 -> a
+    76:76:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1814:1814 -> a
+    77:77:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1813:1813 -> a
+    78:78:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1841:1841 -> a
+    79:79:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> a
+    79:79:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1841 -> a
+    80:82:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1843:1845 -> a
+    83:83:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
+    83:83:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1845 -> a
+    84:84:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1845:1845 -> a
+    85:85:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexField.lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):89:89 -> a
+    85:85:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1846 -> a
+    86:88:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1848:1850 -> a
+    89:89:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3797,"2":3798,"3":3799}}
+    3797:3797:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1850:1850 -> a
+    3798:3798:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1850:1850 -> a
+    3799:3799:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1850:1850 -> a
+    1940:1941:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1851:1852 -> a
+    1942:1942:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3801,"2":3802,"3":3803}}
+    3801:3801:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1852:1852 -> a
+    3802:3802:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1852:1852 -> a
+    3803:3803:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1852:1852 -> a
+    3796:3796:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1854:1854 -> a
+    3804:3812:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1899:1907 -> a
+    3813:3813:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1922:1922 -> a
+    3814:3814:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    3814:3814:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1922 -> a
+    3815:3815:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1923:1923 -> a
+    3816:3816:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9620,"2":9621,"3":9622}}
+    9620:9620:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1924:1924 -> a
+    9621:9621:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    9621:9621:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1924 -> a
+    9622:9622:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    9622:9622:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1924 -> a
+    5741:5741:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1925:1925 -> a
+    5742:5742:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9623,"2":9624,"3":9625}}
+    9623:9623:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1925:1925 -> a
+    9624:9624:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1925:1925 -> a
+    9625:9625:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1925:1925 -> a
+    5743:5743:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9626,"2":9627,"3":9628,"4":9629}}
+    9626:9626:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1926:1926 -> a
+    9627:9627:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1926:1926 -> a
+    9628:9628:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1926:1926 -> a
+    9629:9629:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1926:1926 -> a
+    7669:7674:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1926:1931 -> a
+    7675:7676:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):338:339 -> a
+    7675:7676:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1931 -> a
+    7677:7677:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):332:332 -> a
+    7677:7677:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):339 -> a
+    7677:7677:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1931 -> a
+    7678:7678:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):340:340 -> a
+    7678:7678:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1931 -> a
+    7679:7679:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
+    7679:7679:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):340 -> a
+    7679:7679:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1931 -> a
+    7680:7680:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1932:1932 -> a
+    7681:7681:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9635,"2":9636,"3":9637}}
+    9635:9635:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1932:1932 -> a
+    9636:9636:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1932:1932 -> a
+    9637:9637:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1932:1932 -> a
+    9615:9619:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1934:1938 -> a
+    9638:9638:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2016:2016 -> a
+    1:2:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1868:1869 -> b
+    3:3:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3759,"2":3760,"3":3761}}
+    3759:3759:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1869:1869 -> b
+    3760:3760:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1869:1869 -> b
+    3761:3761:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1869:1869 -> b
+    1873:1875:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1870:1872 -> b
+    1876:1876:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> b
+    1876:1876:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1872 -> b
+    1877:1880:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1872:1875 -> b
+    1881:1881:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3767,"2":3768,"3":3769}}
+    3767:3767:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1875:1875 -> b
+    3768:3768:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1875:1875 -> b
+    3769:3769:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1875:1875 -> b
+    3758:3758:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1877:1877 -> b
+    3770:3773:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1913:1916 -> b
+    3774:3774:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1670:1670 -> b
+    3774:3774:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1917 -> b
+    3775:3775:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1918:1918 -> b
+    3776:3776:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
+    3776:3776:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1918 -> b
+    3777:3819:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1918:1960 -> b
+    3820:3820:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9774,"2":9775,"3":9776}}
+    9774:9774:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1960:1960 -> b
+    9775:9775:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1960:1960 -> b
+    9776:9776:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1960:1960 -> b
+    5782:5793:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1962:1973 -> b
+    5794:5794:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9789,"2":9790,"3":9791}}
+    9789:9789:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1973:1973 -> b
+    9790:9790:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1973:1973 -> b
+    9791:9791:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1973:1973 -> b
+    7769:7782:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1975:1988 -> b
+    7783:7783:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9806,"2":9807,"3":9808}}
+    9806:9806:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1988:1988 -> b
+    9807:9807:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1988:1988 -> b
+    9808:9808:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1988:1988 -> b
+    7784:7784:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9809,"2":9810,"3":9811,"4":9812}}
+    9809:9809:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1989:1989 -> b
+    9810:9810:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1989:1989 -> b
+    9811:9811:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1989:1989 -> b
+    9812:9812:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1989:1989 -> b
+    9773:9773:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1989:1989 -> b
+    9813:9813:boolean lambda$verifyKeptItemsAreKept$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1920:1920 -> b
+    9814:9814:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
+    9814:9814:boolean lambda$verifyKeptItemsAreKept$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1920 -> b
+    9815:9815:java.util.Set lambda$verifyKeptItemsAreKept$13(com.android.tools.r8.graph.DexType):1928:1928 -> b
+    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1670:1670 -> c
+    1:1:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1862 -> c
+    2:2:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1863:1863 -> c
     3:3:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> c
-    3:3:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1838 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:5:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1838:1839 -> c
-    6:6:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1841:1841 -> c
+    3:3:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1863 -> c
+    4:5:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1863:1864 -> c
+    6:6:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1866:1866 -> c
     7:7:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> c
-    7:7:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1841 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:9:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1866:1867 -> c
+    7:7:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1866 -> c
+    8:9:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1891:1892 -> c
     10:11:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramType(com.android.tools.r8.graph.DexType):722:723 -> c
-    10:11:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1867 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:12:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1867:1867 -> c
+    10:11:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1892 -> c
+    12:12:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1892:1892 -> c
     13:13:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1883,"2":1884,"3":1885}}
-    1883:1883:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1867:1867 -> c
-    1884:1884:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1867:1867 -> c
-    1885:1885:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1867:1867 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1908,"2":1909,"3":1910}}
+    1908:1908:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1892:1892 -> c
+    1909:1909:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1892:1892 -> c
+    1910:1910:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1892:1892 -> c
     14:14:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1886,"2":1887,"3":1888,"4":1889}}
-    1886:1886:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1868:1868 -> c
-    1887:1887:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1868:1868 -> c
-    1888:1888:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1868:1868 -> c
-    1889:1889:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1868:1868 -> c
-    1882:1882:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1868:1868 -> c
-    1890:1890:java.util.Set lambda$verifyKeptItemsAreKept$14(com.android.tools.r8.graph.DexType):1912:1912 -> c
-    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1645:1645 -> d
-    1:1:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1860 -> d
-    2:2:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1861:1861 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1911,"2":1912,"3":1913,"4":1914}}
+    1911:1911:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1893:1893 -> c
+    1912:1912:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1893:1893 -> c
+    1913:1913:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1893:1893 -> c
+    1914:1914:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1893:1893 -> c
+    1907:1907:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1893:1893 -> c
+    1915:1915:java.util.Set lambda$verifyKeptItemsAreKept$14(com.android.tools.r8.graph.DexType):1937:1937 -> c
+    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1670:1670 -> d
+    1:1:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1885 -> d
+    2:2:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1886:1886 -> d
     3:3:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> d
-    3:3:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1861 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1861:1862 -> d
-    6:6:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1864:1864 -> d
+    3:3:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1886 -> d
+    4:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1886:1887 -> d
+    6:6:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1889:1889 -> d
     7:7:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> d
-    7:7:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1864 -> d
-    8:8:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> d
-    8:8:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1864 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    7:7:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1889 -> d
+    8:8:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1889:1889 -> d
+    9:9:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> d
+    9:9:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1889 -> d
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1982,"2":1983,"3":1984}}
-    1982:1982:java.lang.String toString():1972:1972 -> toString
-    1983:1983:java.lang.String toString():1972:1972 -> toString
-    1984:1984:java.lang.String toString():1973:1973 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2007,"2":2008,"3":2009}}
+    2007:2007:java.lang.String toString():1997:1997 -> toString
+    2008:2008:java.lang.String toString():1997:1997 -> toString
+    2009:2009:java.lang.String toString():1998:1998 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1982,"2":1983,"3":1984}}
-    1982:1982:java.lang.String toString():1974:1974 -> toString
-    1983:1983:java.lang.String toString():1974:1974 -> toString
-    1984:1984:java.lang.String toString():1974:1974 -> toString
-    1976:1981:java.lang.String toString():1974:1979 -> toString
-com.android.tools.r8.shaking.RootSetUtils$RootSetBase -> com.android.tools.r8.shaking.b3:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2007,"2":2008,"3":2009}}
+    2007:2007:java.lang.String toString():1999:1999 -> toString
+    2008:2008:java.lang.String toString():1999:1999 -> toString
+    2009:2009:java.lang.String toString():1999:1999 -> toString
+    2001:2006:java.lang.String toString():1999:2004 -> toString
+com.android.tools.r8.shaking.RootSetUtils$RootSetBase -> com.android.tools.r8.shaking.t2:
     java.util.Map dependentKeepClassCompatRule -> d
     java.util.List delayedRootSetActionItems -> e
     com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection dependentMinimumKeepInfo -> c
     java.util.Set neverInlineDueToSingleCaller -> a
     java.util.Set neverClassInline -> b
     com.android.tools.r8.utils.collections.ProgramMethodMap pendingMethodMoveInverse -> f
-    1:7:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1627:1633 -> <init>
-    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1641:1641 -> a
-com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder -> com.android.tools.r8.shaking.e3:
+    1:7:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1652:1658 -> <init>
+    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1666:1666 -> a
+com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder -> com.android.tools.r8.shaking.w2:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set noVerticalClassMerging -> s
     boolean $assertionsDisabled -> J
@@ -112746,389 +111577,390 @@
     java.util.Map assumeNoSideEffectsWarnings -> E
     java.util.Set keepParametersWithConstantValue -> l
     java.util.Set reprocess -> n
-    1:1:void <clinit>():103:103 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RootSetUtils$1):103:103 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable,com.android.tools.r8.shaking.RootSetUtils$1):103:103 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):154:154 -> <init>
-    4:58:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):109:163 -> <init>
-    59:59:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):168:168 -> <init>
+    1:1:void <clinit>():104:104 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RootSetUtils$1):104:104 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable,com.android.tools.r8.shaking.RootSetUtils$1):104:104 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):155:155 -> <init>
+    4:58:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):110:164 -> <init>
+    59:59:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):169:169 -> <init>
     void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult) -> a
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference) -> a
     boolean lambda$process$0(com.android.tools.r8.graph.DexDefinition) -> a
-    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):103:103 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass access$500(com.android.tools.r8.graph.DexDefinition,java.util.Map):103:103 -> a
-    3:3:void access$600(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):103:103 -> a
-    4:19:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):300:315 -> a
-    20:20:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):314:314 -> a
-    21:26:void lambda$runPerRule$2(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):318:323 -> a
-    27:89:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):330:392 -> a
-    90:90:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):346:346 -> a
-    91:91:void lambda$build$3(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):355:355 -> a
-    92:103:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):397:408 -> a
-    104:138:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):418:452 -> a
-    139:145:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet buildConsequentRootSet():457:463 -> a
-    146:148:boolean lambda$markMatchingVisibleMethods$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):508:510 -> a
-    149:150:void lambda$markMatchingVisibleMethods$5(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):514:515 -> a
-    151:152:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):655:656 -> a
-    151:152:boolean access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    153:154:boolean com.android.tools.r8.utils.ArrayUtils.contains(java.lang.Object[],java.lang.Object):129:130 -> a
-    153:154:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):656 -> a
-    153:154:boolean access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    155:156:void lambda$markMatchingMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):705:706 -> a
-    157:160:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):718:721 -> a
-    161:161:void com.android.tools.r8.graph.DexClass.forEachClassField(java.util.function.Consumer):144:144 -> a
-    161:161:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):721 -> a
-    162:162:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):727:727 -> a
-    163:163:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):737:737 -> a
-    164:164:void com.android.tools.r8.graph.DexClass.forEachClassField(java.util.function.Consumer):144:144 -> a
-    164:164:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):737 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    165:166:void lambda$markMatchingFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndField):740:741 -> a
-    167:229:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):748:810 -> a
-    230:231:void lambda$writeSeeds$10(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexType):753:754 -> a
-    232:233:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):762:763 -> a
-    234:234:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1769,"2":1770,"3":1771}}
-    1769:1769:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):764:764 -> a
-    1770:1770:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):764:764 -> a
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):104:104 -> a
+    2:2:boolean access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):104:104 -> a
+    3:4:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):656:657 -> a
+    3:4:boolean access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
+    5:6:boolean com.android.tools.r8.utils.ArrayUtils.contains(java.lang.Object[],java.lang.Object):129:130 -> a
+    5:6:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):657 -> a
+    5:6:boolean access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
+    7:7:com.android.tools.r8.graph.DexProgramClass access$500(com.android.tools.r8.graph.DexDefinition,java.util.Map):104:104 -> a
+    8:8:void access$600(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):104:104 -> a
+    9:24:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):301:316 -> a
+    25:25:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):315:315 -> a
+    26:31:void lambda$runPerRule$2(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):319:324 -> a
+    32:94:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):331:393 -> a
+    95:95:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):347:347 -> a
+    96:96:void lambda$build$3(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):356:356 -> a
+    97:108:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):398:409 -> a
+    109:143:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):419:453 -> a
+    144:150:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet buildConsequentRootSet():458:464 -> a
+    151:153:boolean lambda$markMatchingVisibleMethods$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):509:511 -> a
+    154:155:void lambda$markMatchingVisibleMethods$5(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):515:516 -> a
+    156:157:void lambda$markMatchingMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):706:707 -> a
+    158:161:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):719:722 -> a
+    162:162:void com.android.tools.r8.graph.DexClass.forEachClassField(java.util.function.Consumer):144:144 -> a
+    162:162:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):722 -> a
+    163:163:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):728:728 -> a
+    164:164:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):738:738 -> a
+    165:165:void com.android.tools.r8.graph.DexClass.forEachClassField(java.util.function.Consumer):144:144 -> a
+    165:165:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):738 -> a
+    166:167:void lambda$markMatchingFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndField):741:742 -> a
+    168:230:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):749:811 -> a
+    231:232:void lambda$writeSeeds$10(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexType):754:755 -> a
+    233:234:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):763:764 -> a
+    235:235:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1772,"2":1773,"3":1774}}
+    1772:1772:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):765:765 -> a
+    1773:1773:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):765:765 -> a
+    1774:1774:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):765:765 -> a
+    1000:1000:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):765:765 -> a
+    1001:1001:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1776,"2":1777,"3":1778}}
+    1776:1776:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):767:767 -> a
+    1777:1777:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):767:767 -> a
+    1778:1778:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):767:767 -> a
+    1768:1770:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):767:769 -> a
     1771:1771:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):764:764 -> a
-    998:998:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):764:764 -> a
-    999:999:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1773,"2":1774,"3":1775}}
-    1773:1773:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):766:766 -> a
-    1774:1774:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):766:766 -> a
-    1775:1775:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):766:766 -> a
-    1765:1767:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):766:768 -> a
-    1768:1768:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):763:763 -> a
-    1776:1779:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):776:779 -> a
-    1780:1780:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
-    1780:1780:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):779 -> a
-    1781:1795:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):779:793 -> a
-    1796:1796:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2608,"2":2609,"3":2610}}
-    2608:2608:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):794:794 -> a
-    2609:2609:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):794:794 -> a
-    2610:2610:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):794:794 -> a
-    2590:2592:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):794:796 -> a
-    2593:2607:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):793:807 -> a
-    2611:2611:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):814:814 -> a
-    2611:2611:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):181 -> a
-    2612:2613:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):818:819 -> a
-    2612:2613:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):184 -> a
-    2614:2614:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):823:823 -> a
-    2614:2614:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):187 -> a
-    2615:2615:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):973:973 -> a
-    2615:2615:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):823 -> a
-    2615:2615:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):187 -> a
-    2616:2616:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):972:972 -> a
-    2616:2616:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):823 -> a
-    2616:2616:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):187 -> a
-    2617:2671:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):191:245 -> a
-    2672:2672:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):927:927 -> a
-    2672:2672:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):221 -> a
-    2673:2674:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):940:941 -> a
-    2673:2674:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):928 -> a
-    2673:2674:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):221 -> a
-    2675:2676:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1086:1087 -> a
-    2675:2676:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226 -> a
-    2677:2677:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2677:2677:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1087 -> a
-    2677:2677:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226 -> a
-    2678:2678:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1089:1089 -> a
-    2678:2678:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226 -> a
-    2679:2685:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):227:233 -> a
-    2686:2695:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):232:241 -> a
-    2696:2733:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):214:251 -> a
-    2734:2734:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
-    2734:2734:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):253 -> a
-    2735:2735:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254:254 -> a
-    2736:2737:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1355:1356 -> a
-    2736:2737:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
-    2738:2743:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1365:1370 -> a
-    2738:2743:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1356 -> a
-    2738:2743:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
-    2744:2746:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1358:1360 -> a
-    2744:2746:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
-    2747:2747:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
-    2747:2747:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1360 -> a
-    2747:2747:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
-    2748:2748:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1360:1360 -> a
-    2748:2748:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
-    2749:2749:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):255:255 -> a
-    2750:2751:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1086:1087 -> a
-    2750:2751:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):256 -> a
-    2752:2752:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2752:2752:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1087 -> a
-    2752:2752:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):256 -> a
-    2753:2753:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1089:1089 -> a
-    2753:2753:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):256 -> a
-    2754:2788:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):257:291 -> a
-    2789:2789:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):927:927 -> a
-    2789:2789:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):282 -> a
-    2790:2791:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):940:941 -> a
-    2790:2791:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):928 -> a
-    2790:2791:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):282 -> a
-    2792:2793:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1086:1087 -> a
-    2792:2793:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):283 -> a
-    2794:2794:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2794:2794:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1087 -> a
-    2794:2794:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):283 -> a
-    2795:2795:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1089:1089 -> a
-    2795:2795:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):283 -> a
-    2796:2796:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):276:276 -> a
-    2797:2799:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):262:264 -> a
-    2800:2802:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):263:265 -> a
-    2803:2803:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):252:252 -> a
-    2804:2804:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):823:823 -> a
-    2805:2805:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):973:973 -> a
-    2805:2805:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):823 -> a
-    2806:2806:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):972:972 -> a
-    2806:2806:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):823 -> a
-    2807:2818:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):881:892 -> a
-    2819:2819:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):973:973 -> a
-    2819:2819:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):892 -> a
-    2820:2820:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):972:972 -> a
-    2820:2820:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):892 -> a
-    2821:2837:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):894:910 -> a
-    2838:2843:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):917:922 -> a
-    2844:2844:boolean lambda$anySourceMatchesInheritanceRuleDirectly$13(boolean,com.android.tools.r8.graph.DexType):921:921 -> a
-    2845:2847:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):956:958 -> a
-    2848:2848:boolean sideEffectFreeIsRuleSatisfiedByField(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClassAndField):967:967 -> a
-    2849:2850:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):985:986 -> a
-    2851:2861:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):982:992 -> a
-    2862:2862:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():79:79 -> a
-    2862:2862:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):993 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2863:2863:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):993:993 -> a
-    2864:2864:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():79:79 -> a
-    2864:2864:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):75 -> a
-    2864:2864:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):998 -> a
-    2865:2865:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):75:75 -> a
-    2865:2865:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):998 -> a
-    2866:2866:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):998:998 -> a
-    2867:2873:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):995:1001 -> a
-    2874:2878:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1014:1018 -> a
-    2879:2880:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):1035:1036 -> a
-    2879:2880:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1020 -> a
-    2881:2884:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1024:1027 -> a
-    2885:2890:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1025:1030 -> a
-    2891:2899:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1051:1059 -> a
-    2900:2900:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2900:2900:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1058 -> a
-    2901:2903:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1062:1064 -> a
-    2904:2907:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1075:1078 -> a
-    2908:2908:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2908:2908:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1078 -> a
-    2909:2909:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1080:1080 -> a
-    2910:2927:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1094:1111 -> a
-    2928:2928:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():680:680 -> a
-    2928:2928:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1112 -> a
-    2929:2930:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
-    2929:2930:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1112 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2931:2936:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1113:1118 -> a
-    2937:2937:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
-    2937:2937:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1118 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2938:2939:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1118:1119 -> a
-    2940:2940:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():680:680 -> a
-    2940:2940:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1120 -> a
-    2941:2942:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
-    2941:2942:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1120 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2943:2943:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1121:1121 -> a
-    2944:2944:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1147:1147 -> a
-    2945:2945:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
-    2945:2945:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1147 -> a
-    2946:2951:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1148:1153 -> a
-    2952:2963:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1152:1163 -> a
-    2964:2983:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1162:1181 -> a
-    2984:2984:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
-    2984:2984:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1183 -> a
-    2985:2987:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1184:1186 -> a
-    2988:2989:void evaluateCheckDiscardMemberRule(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1383:1384 -> a
-    2988:2989:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1185 -> a
-    2990:3013:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1187:1210 -> a
-    3014:3014:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1207:1207 -> a
-    3015:3018:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1201:1204 -> a
-    3019:3022:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1195:1198 -> a
-    3023:3050:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1192:1219 -> a
-    3051:3051:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1216:1216 -> a
-    3052:3052:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isClassInlineRule():0:0 -> a
-    3052:3052:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1220 -> a
-    3053:3071:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1221:1239 -> a
-    3072:3080:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1233:1241 -> a
-    3081:3081:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1224:1224 -> a
-    3082:3082:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4448,"2":4449,"3":4450}}
-    4448:4448:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1224:1224 -> a
-    4449:4449:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1224:1224 -> a
-    4450:4450:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1224:1224 -> a
-    4308:4368:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1226:1286 -> a
-    4369:4369:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    4369:4369:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1286 -> a
-    4370:4375:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1287:1292 -> a
-    4376:4376:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    4376:4376:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1292 -> a
-    4377:4409:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1293:1325 -> a
-    4410:4418:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1319:1327 -> a
-    4419:4419:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isReprocessMethodRule():0:0 -> a
-    4419:4419:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1329 -> a
-    4420:4430:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1330:1340 -> a
-    4431:4447:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1334:1350 -> a
-    4451:4453:void evaluateCheckDiscardClassAndAllMembersRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1376:1378 -> a
-    4454:4454:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1388:1388 -> a
-    4455:4455:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    4455:4455:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1389 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4456:4457:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1390:1391 -> a
-    4458:4458:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1404:1404 -> a
-    4459:4459:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
-    4459:4459:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1404 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4460:4460:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1404:1404 -> a
-    4461:4461:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1403:1403 -> a
-    4462:4462:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.continueIf(boolean):17:17 -> a
-    4462:4462:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1402 -> a
-    4463:4464:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1417:1418 -> a
-    4465:4465:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
-    4465:4465:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1419 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4466:4483:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1419:1436 -> a
-    4484:4484:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):291:291 -> a
-    4484:4484:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1436 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4485:4485:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1446:1446 -> a
-    4486:4486:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():88:88 -> a
-    4486:4486:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1447 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4487:4505:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1453:1471 -> a
-    4506:4509:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1470:1473 -> a
-    4510:4514:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1563:1567 -> a
-    4510:4514:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1476 -> a
-    4515:4533:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1477:1495 -> a
-    4534:4534:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():617:617 -> a
-    4534:4534:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1495 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4535:4537:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1495:1497 -> a
-    4538:4539:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
-    4538:4539:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1497 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4540:4545:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1498:1503 -> a
-    4546:4547:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
-    4546:4547:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1503 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4548:4552:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1504:1508 -> a
-    4553:4553:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
-    4553:4553:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1508 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4554:4554:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1514:1514 -> a
-    4555:4556:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():689:690 -> a
-    4555:4556:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1514 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4557:4559:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1514:1516 -> a
-    4560:4561:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
-    4560:4561:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1516 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4562:4566:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1517:1521 -> a
-    4567:4567:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> a
-    4567:4567:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():602 -> a
-    4567:4567:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1521 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4568:4570:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1521:1523 -> a
-    4571:4572:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
-    4571:4572:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1523 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4573:4577:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1524:1528 -> a
-    4578:4578:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
-    4578:4578:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1528 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4579:4581:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1528:1530 -> a
-    4582:4583:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
-    4582:4583:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1530 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4584:4588:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1531:1535 -> a
-    4589:4589:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():617:617 -> a
-    4589:4589:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1535 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4590:4592:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1535:1537 -> a
-    4593:4594:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
-    4593:4594:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1537 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4595:4599:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1538:1542 -> a
-    4600:4600:boolean isMainDexRootSetBuilder():0:0 -> a
-    4600:4600:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1542 -> a
-    4601:4605:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1542:1546 -> a
-    4606:4607:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
-    4606:4607:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1546 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4608:4617:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1547:1556 -> a
-    4618:4628:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1127:1137 -> a
-    4618:4628:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1557 -> a
-    4629:4629:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1558:1558 -> a
-    4630:4630:java.util.Set lambda$evaluateKeepRule$17(com.android.tools.r8.graph.DexType):1459:1459 -> a
-    4631:4635:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1572:1576 -> a
-    4636:4636:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$18(com.android.tools.r8.utils.OriginWithPosition):1575:1575 -> a
-    4637:4637:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1580:1580 -> a
-    4638:4650:void lambda$generateAssumeNoSideEffectsWarnings$19(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1595:1607 -> a
-    4651:4651:void lambda$generateAssumeNoSideEffectsWarnings$19(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1602:1602 -> a
+    1779:1782:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):777:780 -> a
+    1783:1783:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):94:94 -> a
+    1783:1783:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):780 -> a
+    1784:1798:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):780:794 -> a
+    1799:1799:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2612,"2":2613,"3":2614}}
+    2612:2612:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):795:795 -> a
+    2613:2613:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):795:795 -> a
+    2614:2614:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):795:795 -> a
+    2594:2596:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):795:797 -> a
+    2597:2611:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):794:808 -> a
+    2615:2615:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):815:815 -> a
+    2615:2615:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):182 -> a
+    2616:2617:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):819:820 -> a
+    2616:2617:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):185 -> a
+    2618:2618:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):824:824 -> a
+    2618:2618:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):188 -> a
+    2619:2619:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):974:974 -> a
+    2619:2619:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):824 -> a
+    2619:2619:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):188 -> a
+    2620:2620:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):973:973 -> a
+    2620:2620:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):824 -> a
+    2620:2620:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):188 -> a
+    2621:2675:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):192:246 -> a
+    2676:2676:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):928:928 -> a
+    2676:2676:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):222 -> a
+    2677:2678:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):941:942 -> a
+    2677:2678:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):929 -> a
+    2677:2678:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):222 -> a
+    2679:2680:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1087:1088 -> a
+    2679:2680:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):227 -> a
+    2681:2681:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2681:2681:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1088 -> a
+    2681:2681:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):227 -> a
+    2682:2682:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1090:1090 -> a
+    2682:2682:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):227 -> a
+    2683:2689:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):228:234 -> a
+    2690:2699:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):233:242 -> a
+    2700:2737:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):215:252 -> a
+    2738:2738:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
+    2738:2738:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
+    2739:2739:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):255:255 -> a
+    2740:2741:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1350:1351 -> a
+    2740:2741:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):255 -> a
+    2742:2747:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1360:1365 -> a
+    2742:2747:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1351 -> a
+    2742:2747:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):255 -> a
+    2748:2750:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1353:1355 -> a
+    2748:2750:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):255 -> a
+    2751:2751:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
+    2751:2751:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1355 -> a
+    2751:2751:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):255 -> a
+    2752:2752:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1355:1355 -> a
+    2752:2752:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):255 -> a
+    2753:2753:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):256:256 -> a
+    2754:2755:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1087:1088 -> a
+    2754:2755:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):257 -> a
+    2756:2756:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2756:2756:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1088 -> a
+    2756:2756:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):257 -> a
+    2757:2757:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1090:1090 -> a
+    2757:2757:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):257 -> a
+    2758:2792:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):258:292 -> a
+    2793:2793:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):928:928 -> a
+    2793:2793:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):283 -> a
+    2794:2795:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):941:942 -> a
+    2794:2795:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):929 -> a
+    2794:2795:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):283 -> a
+    2796:2797:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1087:1088 -> a
+    2796:2797:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):284 -> a
+    2798:2798:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2798:2798:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1088 -> a
+    2798:2798:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):284 -> a
+    2799:2799:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1090:1090 -> a
+    2799:2799:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):284 -> a
+    2800:2800:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):277:277 -> a
+    2801:2803:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):263:265 -> a
+    2804:2806:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):264:266 -> a
+    2807:2807:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):253:253 -> a
+    2808:2808:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):824:824 -> a
+    2809:2809:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):974:974 -> a
+    2809:2809:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):824 -> a
+    2810:2810:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):973:973 -> a
+    2810:2810:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):824 -> a
+    2811:2822:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):882:893 -> a
+    2823:2823:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):974:974 -> a
+    2823:2823:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):893 -> a
+    2824:2824:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):973:973 -> a
+    2824:2824:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):893 -> a
+    2825:2841:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):895:911 -> a
+    2842:2847:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):918:923 -> a
+    2848:2848:boolean lambda$anySourceMatchesInheritanceRuleDirectly$13(boolean,com.android.tools.r8.graph.DexType):922:922 -> a
+    2849:2851:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):957:959 -> a
+    2852:2852:boolean sideEffectFreeIsRuleSatisfiedByField(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClassAndField):968:968 -> a
+    2853:2854:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):986:987 -> a
+    2855:2866:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):983:994 -> a
+    2867:2867:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():79:79 -> a
+    2867:2867:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):994 -> a
+    2868:2868:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):994:994 -> a
+    2869:2869:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():79:79 -> a
+    2869:2869:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):75 -> a
+    2869:2869:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):999 -> a
+    2870:2870:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):75:75 -> a
+    2870:2870:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):999 -> a
+    2871:2871:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):999:999 -> a
+    2872:2878:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):996:1002 -> a
+    2879:2883:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1015:1019 -> a
+    2884:2885:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):1036:1037 -> a
+    2884:2885:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1021 -> a
+    2886:2889:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1025:1028 -> a
+    2890:2895:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1026:1031 -> a
+    2896:2904:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1052:1060 -> a
+    2905:2905:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2905:2905:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1059 -> a
+    2906:2908:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1063:1065 -> a
+    2909:2912:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1076:1079 -> a
+    2913:2913:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2913:2913:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1079 -> a
+    2914:2914:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1081:1081 -> a
+    2915:2932:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1095:1112 -> a
+    2933:2933:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():680:680 -> a
+    2933:2933:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1113 -> a
+    2934:2934:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1113:1113 -> a
+    2935:2936:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
+    2935:2936:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1113 -> a
+    2937:2942:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1114:1119 -> a
+    2943:2943:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():613:613 -> a
+    2943:2943:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1119 -> a
+    2944:2945:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1119:1120 -> a
+    2946:2946:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():680:680 -> a
+    2946:2946:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1121 -> a
+    2947:2947:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1121:1121 -> a
+    2948:2949:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
+    2948:2949:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1121 -> a
+    2950:2950:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1122:1122 -> a
+    2951:2951:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1148:1148 -> a
+    2952:2952:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
+    2952:2952:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1148 -> a
+    2953:2958:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1149:1154 -> a
+    2959:2970:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1153:1164 -> a
+    2971:2990:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1163:1182 -> a
+    2991:2991:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
+    2991:2991:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1184 -> a
+    2992:2994:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1185:1187 -> a
+    2995:2996:void evaluateCheckDiscardMemberRule(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1378:1379 -> a
+    2995:2996:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1186 -> a
+    2997:3020:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1188:1211 -> a
+    3021:3021:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1208:1208 -> a
+    3022:3025:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1202:1205 -> a
+    3026:3029:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1196:1199 -> a
+    3030:3057:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1193:1220 -> a
+    3058:3058:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1217:1217 -> a
+    3059:3059:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isClassInlineRule():0:0 -> a
+    3059:3059:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1221 -> a
+    3060:3078:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1222:1240 -> a
+    3079:3087:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1234:1242 -> a
+    3088:3088:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1225:1225 -> a
+    3089:3089:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4483,"2":4484,"3":4485}}
+    4483:4483:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1225:1225 -> a
+    4484:4484:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1225:1225 -> a
+    4485:4485:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1225:1225 -> a
+    4316:4376:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1227:1287 -> a
+    4377:4377:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    4377:4377:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1287 -> a
+    4378:4383:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1288:1293 -> a
+    4384:4384:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    4384:4384:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1293 -> a
+    4385:4393:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1294:1302 -> a
+    4394:4394:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1560:1560 -> a
+    4394:4394:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4395:4395:boolean isMainDexRootSetBuilder():0:0 -> a
+    4395:4395:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1560 -> a
+    4395:4395:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4396:4408:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1560:1572 -> a
+    4396:4408:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4409:4409:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
+    4409:4409:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1572 -> a
+    4409:4409:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4410:4410:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1573:1573 -> a
+    4410:4410:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4411:4411:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4486,"2":4487,"3":4488}}
+    4486:4486:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1573:1573 -> a
+    4486:4486:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4487:4487:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1573:1573 -> a
+    4487:4487:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4488:4488:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1573:1573 -> a
+    4488:4488:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4412:4415:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1576:1579 -> a
+    4412:4415:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4416:4427:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1573:1584 -> a
+    4416:4427:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4428:4444:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1304:1320 -> a
+    4445:4453:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1314:1322 -> a
+    4454:4454:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isReprocessMethodRule():0:0 -> a
+    4454:4454:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1324 -> a
+    4455:4465:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1325:1335 -> a
+    4466:4482:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1329:1345 -> a
+    4489:4491:void evaluateCheckDiscardClassAndAllMembersRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1371:1373 -> a
+    4492:4493:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1383:1384 -> a
+    4494:4494:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    4494:4494:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1384 -> a
+    4495:4496:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1385:1386 -> a
+    4497:4497:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1399:1399 -> a
+    4498:4498:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
+    4498:4498:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1399 -> a
+    4499:4499:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1399:1399 -> a
+    4500:4500:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1398:1398 -> a
+    4501:4501:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.continueIf(boolean):17:17 -> a
+    4501:4501:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1397 -> a
+    4502:4504:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1412:1414 -> a
+    4505:4505:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
+    4505:4505:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1414 -> a
+    4506:4523:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1414:1431 -> a
+    4524:4524:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):291:291 -> a
+    4524:4524:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1431 -> a
+    4525:4526:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1441:1442 -> a
+    4527:4527:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():88:88 -> a
+    4527:4527:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1442 -> a
+    4528:4546:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1448:1466 -> a
+    4547:4550:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1465:1468 -> a
+    4551:4555:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1588:1592 -> a
+    4551:4555:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1471 -> a
+    4556:4574:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1472:1490 -> a
+    4575:4575:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():618:618 -> a
+    4575:4575:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1490 -> a
+    4576:4578:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1490:1492 -> a
+    4579:4580:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
+    4579:4580:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1492 -> a
+    4581:4586:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1493:1498 -> a
+    4587:4588:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
+    4587:4588:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1498 -> a
+    4589:4593:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1499:1503 -> a
+    4594:4594:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
+    4594:4594:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1503 -> a
+    4595:4595:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1509:1509 -> a
+    4596:4597:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():690:691 -> a
+    4596:4597:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1509 -> a
+    4598:4600:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1509:1511 -> a
+    4601:4602:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
+    4601:4602:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1511 -> a
+    4603:4607:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1512:1516 -> a
+    4608:4608:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():628:628 -> a
+    4608:4608:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():603 -> a
+    4608:4608:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1516 -> a
+    4609:4611:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1516:1518 -> a
+    4612:4613:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
+    4612:4613:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1518 -> a
+    4614:4618:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1519:1523 -> a
+    4619:4619:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():613:613 -> a
+    4619:4619:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1523 -> a
+    4620:4622:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1523:1525 -> a
+    4623:4624:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
+    4623:4624:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1525 -> a
+    4625:4629:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1526:1530 -> a
+    4630:4630:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():618:618 -> a
+    4630:4630:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1530 -> a
+    4631:4633:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1530:1532 -> a
+    4634:4635:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
+    4634:4635:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1532 -> a
+    4636:4640:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1533:1537 -> a
+    4641:4641:boolean isMainDexRootSetBuilder():0:0 -> a
+    4641:4641:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1537 -> a
+    4642:4646:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1537:1541 -> a
+    4647:4648:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:70 -> a
+    4647:4648:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1541 -> a
+    4649:4658:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1542:1551 -> a
+    4659:4669:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1128:1138 -> a
+    4659:4669:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1552 -> a
+    4670:4670:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1553:1553 -> a
+    4671:4671:java.util.Set lambda$evaluateKeepRule$17(com.android.tools.r8.graph.DexType):1454:1454 -> a
+    4672:4676:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1597:1601 -> a
+    4677:4677:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$18(com.android.tools.r8.utils.OriginWithPosition):1600:1600 -> a
+    4678:4678:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1605:1605 -> a
+    4679:4691:void lambda$generateAssumeNoSideEffectsWarnings$19(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1620:1632 -> a
+    4692:4692:void lambda$generateAssumeNoSideEffectsWarnings$19(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1627:1627 -> a
     void lambda$sideEffectFreeIsRuleSatisfiedByField$14(com.android.tools.r8.shaking.AnnotationMatchResult) -> b
-    1:1:java.util.Queue access$400(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):103:103 -> b
-    2:2:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):233:233 -> b
-    3:12:com.android.tools.r8.graph.DexProgramClass testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):476:485 -> b
-    13:43:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):497:527 -> b
+    1:1:java.util.Queue access$400(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):104:104 -> b
+    2:2:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):234:234 -> b
+    3:12:com.android.tools.r8.graph.DexProgramClass testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):477:486 -> b
+    13:43:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):498:528 -> b
     44:44:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> b
-    44:44:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):527 -> b
-    45:45:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):528:528 -> b
+    44:44:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):528 -> b
+    45:45:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):529:529 -> b
     46:46:boolean isMainDexRootSetBuilder():0:0 -> b
-    46:46:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):529 -> b
-    47:49:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):530:532 -> b
-    50:51:void lambda$markMatchingOverriddenMethods$6(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):689:690 -> b
-    52:52:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):702:702 -> b
+    46:46:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):530 -> b
+    47:49:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):531:533 -> b
+    50:51:void lambda$markMatchingOverriddenMethods$6(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):690:691 -> b
+    52:52:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):703:703 -> b
     53:53:void com.android.tools.r8.graph.DexClass.forEachClassMethod(java.util.function.Consumer):154:154 -> b
-    53:53:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):702 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    54:55:void lambda$markMatchingVisibleFields$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndField):724:725 -> b
-    56:56:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):835:835 -> b
-    56:56:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):827 -> b
-    57:67:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):845:855 -> b
-    57:67:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):835 -> b
-    57:67:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):827 -> b
-    68:68:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):973:973 -> b
-    68:68:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):855 -> b
-    68:68:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):835 -> b
-    68:68:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):827 -> b
-    69:69:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):972:972 -> b
-    69:69:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):855 -> b
-    69:69:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):835 -> b
-    69:69:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):827 -> b
-    70:74:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):857:861 -> b
-    70:74:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):835 -> b
-    70:74:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):827 -> b
-    75:75:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):840:840 -> b
-    75:75:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):827 -> b
-    76:81:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):867:872 -> b
-    76:81:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):831 -> b
-    82:84:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):945:947 -> b
-    85:87:void finalizeCheckDiscardedInformation():1395:1397 -> b
-    88:88:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection) -> b
-    88:88:void finalizeCheckDiscardedInformation():1396 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    89:90:void finalizeCheckDiscardedInformation():1398:1399 -> b
-    91:95:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):332:336 -> b
-    91:95:void finalizeCheckDiscardedInformation():1400 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    96:97:void finalizeCheckDiscardedInformation():1405:1406 -> b
-    1:1:com.android.tools.r8.shaking.DexStringCache access$700(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):103:103 -> c
-    2:27:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):667:692 -> c
-    28:34:void generateAssumeNoSideEffectsWarnings():1586:1592 -> c
-com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$1 -> com.android.tools.r8.shaking.c3:
-    1:1:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):1481:1481 -> <init>
+    53:53:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):703 -> b
+    54:55:void lambda$markMatchingVisibleFields$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndField):725:726 -> b
+    56:56:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):836:836 -> b
+    56:56:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):828 -> b
+    57:67:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):846:856 -> b
+    57:67:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):836 -> b
+    57:67:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):828 -> b
+    68:68:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):974:974 -> b
+    68:68:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):856 -> b
+    68:68:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):836 -> b
+    68:68:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):828 -> b
+    69:69:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):973:973 -> b
+    69:69:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):856 -> b
+    69:69:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):836 -> b
+    69:69:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):828 -> b
+    70:74:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):858:862 -> b
+    70:74:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):836 -> b
+    70:74:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):828 -> b
+    75:75:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):841:841 -> b
+    75:75:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):828 -> b
+    76:81:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):868:873 -> b
+    76:81:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):832 -> b
+    82:84:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):946:948 -> b
+    85:87:void finalizeCheckDiscardedInformation():1390:1392 -> b
+    88:88:void finalizeCheckDiscardedInformation():1391:1391 -> b
+    89:89:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
+    89:89:void finalizeCheckDiscardedInformation():1391 -> b
+    90:92:void finalizeCheckDiscardedInformation():1393:1395 -> b
+    93:97:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):332:336 -> b
+    93:97:void finalizeCheckDiscardedInformation():1395 -> b
+    98:99:void finalizeCheckDiscardedInformation():1400:1401 -> b
+    1:1:com.android.tools.r8.shaking.DexStringCache access$700(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):104:104 -> c
+    2:27:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):668:693 -> c
+    28:34:void generateAssumeNoSideEffectsWarnings():1611:1617 -> c
+com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$1 -> com.android.tools.r8.shaking.u2:
+    1:1:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):1476:1476 -> <init>
     void acceptCompanionClassClinit(com.android.tools.r8.graph.ProgramMethod) -> a
     void acceptCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.d3:
+com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.v2:
     com.android.tools.r8.shaking.ProguardConfigurationRule context -> c
     java.util.Set seenTypes -> g
     java.util.Map preconditionSupplier -> d
@@ -113138,20 +111970,20 @@
     java.util.Set seenMethods -> f
     com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder this$0 -> h
     com.android.tools.r8.shaking.ProguardIfRule ifRule -> e
-    1:1:void <clinit>():541:541 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.RootSetUtils$1):541:541 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):556:556 -> <init>
-    3:18:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):548:563 -> <init>
+    1:1:void <clinit>():542:542 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.RootSetUtils$1):542:542 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):557:557 -> <init>
+    3:18:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):549:564 -> <init>
     void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult) -> a
-    1:1:void run():571:571 -> a
-    2:16:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):575:589 -> a
-    17:23:void lambda$visitAllSuperInterfaces$0(com.android.tools.r8.graph.DexClassAndMethod):594:600 -> a
-    24:51:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardMemberRule):607:634 -> a
-    52:52:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):639:639 -> a
+    1:1:void run():572:572 -> a
+    2:16:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):576:590 -> a
+    17:23:void lambda$visitAllSuperInterfaces$0(com.android.tools.r8.graph.DexClassAndMethod):595:601 -> a
+    24:51:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardMemberRule):608:635 -> a
+    52:52:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):640:640 -> a
     53:53:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    53:53:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):640 -> a
-    54:55:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):648:649 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.QU:
+    53:53:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):641 -> a
+    54:55:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):649:650 -> a
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.iT:
     java.util.Set exceptionGuardTypes -> c
     java.util.Set instanceOfTypes -> a
     java.util.Set checkCastTypes -> b
@@ -113163,7 +111995,7 @@
     3:3:boolean com.android.tools.r8.shaking.RuntimeTypeCheckInfo.isExceptionGuardType(com.android.tools.r8.graph.DexProgramClass):102:102 -> a
     3:3:boolean isRuntimeCheckType(com.android.tools.r8.graph.DexProgramClass):106 -> a
     4:7:com.android.tools.r8.shaking.RuntimeTypeCheckInfo rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):110:113 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.PU:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.hT:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.Set instanceOfTypes -> c
     java.util.Set checkCastTypes -> d
@@ -113182,7 +112014,7 @@
     1:1:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):70:70 -> c
     2:4:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.add(com.android.tools.r8.graph.DexType,java.util.Set):79:81 -> c
     2:4:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):70 -> c
-com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.f3:
+com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.x2:
     java.util.Map items -> b
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet parent -> a
@@ -113192,14 +112024,14 @@
     3:10:void <init>(com.android.tools.r8.shaking.ScopedDexMethodSet):25:32 -> <init>
     1:2:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):40:41 -> a
     3:12:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):58:67 -> a
-    13:19:boolean com.android.tools.r8.graph.AccessFlags.isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):101:107 -> a
-    13:19:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):64 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:20:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
-    21:21:com.android.tools.r8.shaking.ScopedDexMethodSet getParent():75:75 -> a
-    22:22:void setParent(com.android.tools.r8.shaking.ScopedDexMethodSet):79:79 -> a
+    13:13:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):64:64 -> a
+    14:20:boolean com.android.tools.r8.graph.AccessFlags.isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):101:107 -> a
+    14:20:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):64 -> a
+    21:21:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
+    22:22:com.android.tools.r8.shaking.ScopedDexMethodSet getParent():75:75 -> a
+    23:23:void setParent(com.android.tools.r8.shaking.ScopedDexMethodSet):79:79 -> a
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet newNestedScope():36:36 -> b
-com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.VV:
+com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.uU:
     java.util.Map cache -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -113212,7 +112044,7 @@
     17:17:void lambda$removeInstantiatedType$3(com.android.tools.r8.ir.desugar.LambdaDescriptor):47:47 -> a
     18:23:com.android.tools.r8.graph.DexEncodedMethod getCachedItem(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):52:57 -> a
     1:5:boolean hasCachedItem(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):61:65 -> b
-com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.b00:
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.rY:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set prunedTypes -> d
     java.util.Set methodsToKeepForConfigurationDebugging -> e
@@ -113308,24 +112140,23 @@
     1:1:java.util.Set access$100(com.android.tools.r8.shaking.TreePruner):44:44 -> b
     2:9:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):168:175 -> b
     10:10:java.util.Set getRemovedClasses():384:384 -> b
-com.android.tools.r8.shaking.TreePruner$1 -> com.android.tools.r8.internal.a00:
+com.android.tools.r8.shaking.TreePruner$1 -> com.android.tools.r8.internal.qY:
     com.android.tools.r8.shaking.TreePruner this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.TreePruner):401:401 -> <init>
     1:1:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):404:404 -> a
     2:2:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):410:410 -> a
-com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.c00:
+com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.sY:
     boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.shaking.i3:
+com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.shaking.z2:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.UnusedArgumentRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:java.lang.String typeString():79:79 -> C
-com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.shaking.g3:
-com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.shaking.h3:
+com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.shaking.y2:
     1:1:void <init>(com.android.tools.r8.shaking.UnusedArgumentRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.b20:
+com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.r00:
     com.android.tools.r8.shaking.UnusedItemsPrinter DONT_PRINT -> e
     com.android.tools.r8.shaking.UnusedItemsPrinter$Members currentMembers -> c
     java.util.List classes -> d
@@ -113398,12 +112229,10 @@
     3:3:void visited():60:60 -> b
     4:4:boolean com.android.tools.r8.shaking.UnusedItemsPrinter$Members.hasMembers():23:23 -> b
     4:4:void visited():60 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:8:void visited():61:64 -> b
     9:9:void registerUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> b
     10:10:void registerUnusedField(com.android.tools.r8.graph.DexEncodedField):72:72 -> b
-com.android.tools.r8.shaking.UnusedItemsPrinter$1 -> com.android.tools.r8.internal.Y10:
-com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.Z10:
+com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.p00:
     java.util.List methods -> b
     java.util.List fields -> a
     1:3:void <init>():18:20 -> <init>
@@ -113411,7 +112240,7 @@
     1:1:int lambda$sort$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):27:27 -> a
     2:3:void sort():27:28 -> a
     4:4:int lambda$sort$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
-com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.internal.a20:
+com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.internal.q00:
     1:1:void <init>():139:139 -> <init>
     void finished() -> a
     void registerUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
@@ -113419,7 +112248,7 @@
     void registerUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void visited() -> b
     void visiting(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.internal.R20:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.internal.f10:
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> r
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
     java.util.List synthesizedBridges -> q
@@ -113444,161 +112273,151 @@
     2:44:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):229:271 -> <init>
     1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> a
     2:20:void initializeMergeCandidates(java.lang.Iterable):275:293 -> a
-    21:30:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):357:366 -> a
-    31:42:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):374:385 -> a
-    43:43:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    43:43:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):385 -> a
-    44:47:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):385:385 -> a
-    51:53:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):389:391 -> a
-    54:54:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
-    54:54:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInSameBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):204 -> a
-    54:54:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):391 -> a
-    55:58:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):394:397 -> a
-    59:59:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    59:59:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):401 -> a
-    60:60:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):404:404 -> a
-    61:61:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828:828 -> a
-    61:61:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):405 -> a
-    62:62:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):446:446 -> a
-    62:62:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828 -> a
-    62:62:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):405 -> a
-    63:63:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):405:405 -> a
-    64:64:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):446:446 -> a
-    64:64:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    65:111:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):418:464 -> a
-    112:113:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):439:440 -> a
-    114:114:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):459:459 -> a
-    115:116:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):123:124 -> a
-    115:116:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):460 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    117:117:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):460:460 -> a
-    118:118:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.continueIf(boolean):17:17 -> a
-    118:118:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):13 -> a
-    118:118:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):462 -> a
-    119:144:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):475:500 -> a
-    145:146:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1204:1205 -> a
-    145:146:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):501 -> a
-    147:147:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
-    147:147:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1205 -> a
-    147:147:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):501 -> a
-    148:149:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):502:503 -> a
-    150:151:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1204:1205 -> a
-    150:151:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):504 -> a
-    152:152:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
-    152:152:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1205 -> a
-    152:152:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):504 -> a
-    153:168:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):506:521 -> a
-    169:187:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):932:950 -> a
-    169:187:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):527 -> a
-    188:188:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):949:949 -> a
-    188:188:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):527 -> a
-    189:197:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):528:536 -> a
-    198:198:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):38:38 -> a
-    198:198:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):537 -> a
-    199:199:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):37:37 -> a
-    199:199:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):537 -> a
-    200:204:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):46:50 -> a
-    200:204:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):35 -> a
-    200:204:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):537 -> a
-    205:205:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):538:538 -> a
-    206:206:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):38:38 -> a
-    206:206:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):539 -> a
-    207:207:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):37:37 -> a
-    207:207:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):539 -> a
-    208:212:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):46:50 -> a
-    208:212:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):35 -> a
-    208:212:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):539 -> a
-    213:215:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):540:542 -> a
-    216:217:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):514:515 -> a
-    218:219:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):494:495 -> a
-    220:220:boolean lambda$isStillMergeCandidate$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):490:490 -> a
-    221:250:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():702:731 -> a
-    251:251:void lambda$run$4(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):727:727 -> a
-    252:252:void lambda$run$4(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):726:726 -> a
-    253:257:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):762:766 -> a
-    258:258:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    258:258:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):767 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    259:259:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    259:259:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):768 -> a
-    260:267:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):771:778 -> a
-    268:268:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    268:268:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):780 -> a
-    269:278:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):781:790 -> a
-    279:285:void lambda$methodResolutionMayChange$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):846:852 -> a
-    286:286:void lambda$methodResolutionMayChange$6(com.android.tools.r8.graph.LookupLambdaTarget):857:857 -> a
-    287:338:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):869:920 -> a
-    339:349:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):916:926 -> a
-    350:350:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):922:922 -> a
-    351:351:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):907:907 -> a
-    352:361:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1914:1923 -> a
-    352:361:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):422 -> a
-    362:373:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1919:1930 -> a
-    362:373:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):422 -> a
-    374:374:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1929:1929 -> a
-    374:374:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):422 -> a
-    375:375:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    375:375:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1934 -> a
-    375:375:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):422 -> a
-    376:381:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):425:430 -> a
+    21:22:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):332:333 -> a
+    23:23:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    23:23:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):333 -> a
+    24:39:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):334:349 -> a
+    40:49:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):356:365 -> a
+    50:61:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):373:384 -> a
+    62:62:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
+    62:62:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):384 -> a
+    63:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):384:384 -> a
+    70:72:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):388:390 -> a
+    73:73:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    73:73:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInSameBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):204 -> a
+    73:73:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):390 -> a
+    74:77:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):393:396 -> a
+    78:78:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    78:78:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):400 -> a
+    79:79:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):403:403 -> a
+    80:80:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828:828 -> a
+    80:80:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):404 -> a
+    81:81:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):446:446 -> a
+    81:81:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):828 -> a
+    81:81:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):404 -> a
+    82:83:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):404:405 -> a
+    84:84:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):446:446 -> a
+    84:84:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):405 -> a
+    85:131:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):417:463 -> a
+    132:133:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):438:439 -> a
+    134:135:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):458:459 -> a
+    136:137:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):123:124 -> a
+    136:137:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):459 -> a
+    138:138:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):459:459 -> a
+    139:139:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.continueIf(boolean):17:17 -> a
+    139:139:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):13 -> a
+    139:139:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):461 -> a
+    140:165:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):474:499 -> a
+    166:167:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1213:1214 -> a
+    166:167:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):500 -> a
+    168:168:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
+    168:168:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1214 -> a
+    168:168:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):500 -> a
+    169:170:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):501:502 -> a
+    171:172:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1213:1214 -> a
+    171:172:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):503 -> a
+    173:173:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
+    173:173:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1214 -> a
+    173:173:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):503 -> a
+    174:189:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505:520 -> a
+    190:208:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):931:949 -> a
+    190:208:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):526 -> a
+    209:209:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):948:948 -> a
+    209:209:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):526 -> a
+    210:218:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):527:535 -> a
+    219:219:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):38:38 -> a
+    219:219:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):536 -> a
+    220:220:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):37:37 -> a
+    220:220:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):536 -> a
+    221:225:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):46:50 -> a
+    221:225:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):35 -> a
+    221:225:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):536 -> a
+    226:226:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):537:537 -> a
+    227:227:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):38:38 -> a
+    227:227:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):538 -> a
+    228:228:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):37:37 -> a
+    228:228:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):538 -> a
+    229:233:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):46:50 -> a
+    229:233:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):35 -> a
+    229:233:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):538 -> a
+    234:236:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):539:541 -> a
+    237:238:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):513:514 -> a
+    239:240:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):493:494 -> a
+    241:241:boolean lambda$isStillMergeCandidate$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):489:489 -> a
+    242:271:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():701:730 -> a
+    272:272:void lambda$run$4(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):726:726 -> a
+    273:273:void lambda$run$4(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):725:725 -> a
+    274:279:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):761:766 -> a
+    280:280:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    280:280:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):766 -> a
+    281:281:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
+    281:281:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):767 -> a
+    282:289:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):770:777 -> a
+    290:290:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    290:290:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):779 -> a
+    291:300:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):780:789 -> a
+    301:307:void lambda$methodResolutionMayChange$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):845:851 -> a
+    308:308:void lambda$methodResolutionMayChange$6(com.android.tools.r8.graph.LookupLambdaTarget):856:856 -> a
+    309:360:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):868:919 -> a
+    361:371:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):915:925 -> a
+    372:372:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):921:921 -> a
+    373:373:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):906:906 -> a
+    374:383:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1916:1925 -> a
+    374:383:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):421 -> a
+    384:395:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1921:1932 -> a
+    384:395:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):421 -> a
+    396:396:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1931:1931 -> a
+    396:396:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):421 -> a
+    397:397:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
+    397:397:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1936 -> a
+    397:397:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):421 -> a
+    398:403:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):424:429 -> a
     1:1:com.android.tools.r8.graph.SubtypingInfo access$100(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> b
-    2:5:void initializePinnedTypes(java.lang.Iterable):303:306 -> b
-    6:7:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):333:334 -> b
-    6:7:void initializePinnedTypes(java.lang.Iterable):307 -> b
-    8:8:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> b
-    8:8:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):334 -> b
-    8:8:void initializePinnedTypes(java.lang.Iterable):307 -> b
-    9:24:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):335:350 -> b
-    9:24:void initializePinnedTypes(java.lang.Iterable):307 -> b
-    25:44:void initializePinnedTypes(java.lang.Iterable):309:328 -> b
-    45:45:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):551:551 -> b
-    46:46:boolean com.android.tools.r8.graph.DexClass.isPrivate():721:721 -> b
-    46:46:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):555 -> b
-    47:47:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> b
-    47:47:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):555 -> b
-    48:48:boolean com.android.tools.r8.graph.DexClass.isPrivate():721:721 -> b
-    48:48:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):556 -> b
-    49:49:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> b
-    49:49:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):556 -> b
-    50:50:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> b
-    50:50:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):565 -> b
-    51:51:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):568:568 -> b
-    52:52:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():225:225 -> b
-    52:52:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):569 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    53:57:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):569:573 -> b
-    58:58:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> b
-    58:58:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):574 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    59:59:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):574:574 -> b
-    60:60:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> b
-    60:60:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):578 -> b
-    61:61:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):579:579 -> b
-    62:62:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> b
-    62:62:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):580 -> b
-    63:74:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):588:599 -> b
-    75:75:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):591:591 -> b
-    76:77:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):123:124 -> b
-    76:77:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):592 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    78:83:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):592:597 -> b
+    2:27:void initializePinnedTypes(java.lang.Iterable):303:328 -> b
+    28:28:void initializePinnedTypes(java.lang.Iterable):327:327 -> b
+    29:29:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):550:550 -> b
+    30:30:boolean com.android.tools.r8.graph.DexClass.isPrivate():721:721 -> b
+    30:30:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):554 -> b
+    31:31:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> b
+    31:31:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):554 -> b
+    32:32:boolean com.android.tools.r8.graph.DexClass.isPrivate():721:721 -> b
+    32:32:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):555 -> b
+    33:33:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> b
+    33:33:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):555 -> b
+    34:34:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> b
+    34:34:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):564 -> b
+    35:36:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):567:568 -> b
+    37:37:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():225:225 -> b
+    37:37:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):568 -> b
+    38:43:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):568:573 -> b
+    44:44:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> b
+    44:44:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):573 -> b
+    45:45:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):573:573 -> b
+    46:46:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> b
+    46:46:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):577 -> b
+    47:47:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):578:578 -> b
+    48:48:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> b
+    48:48:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):579 -> b
+    49:60:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):587:598 -> b
+    61:62:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):590:591 -> b
+    63:64:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):123:124 -> b
+    63:64:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):591 -> b
+    65:70:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):591:596 -> b
     1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1000(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> c
-    2:64:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):797:859 -> c
+    2:64:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):796:858 -> c
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> d
     1:1:com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap access$1400(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> e
     1:1:com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap access$1500(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> f
     1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder access$1600(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> g
     1:1:com.android.tools.r8.graph.DexApplication access$1700(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> h
-    1:4:java.util.Collection com.android.tools.r8.shaking.VerticalClassMerger.getInvokes():603:606 -> i
-    1:4:java.util.Collection access$1800(com.android.tools.r8.shaking.VerticalClassMerger):118 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:java.util.Collection access$1800(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> i
+    2:5:java.util.Collection com.android.tools.r8.shaking.VerticalClassMerger.getInvokes():602:605 -> i
+    2:5:java.util.Collection access$1800(com.android.tools.r8.shaking.VerticalClassMerger):118 -> i
     1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> j
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> k
     1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> l
     1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):118:118 -> m
-com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.internal.H20:
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.I20:
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.W00:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.$assertionsDisabled -> a
@@ -113649,7 +112468,7 @@
     82:82:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):142 -> a
     83:83:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):147:147 -> a
     83:83:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):142 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.J20:
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.X00:
     com.android.tools.r8.graph.DexProgramClass target -> b
     java.util.List synthesizedBridges -> d
     com.android.tools.r8.graph.DexProgramClass source -> a
@@ -113657,210 +112476,206 @@
     boolean $assertionsDisabled -> g
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> f
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder deferredRenamings -> c
-    1:1:void <clinit>():961:961 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):961:961 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):971:971 -> <init>
-    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):965:973 -> <init>
+    1:1:void <clinit>():960:960 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):960:960 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):970:970 -> <init>
+    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):964:972 -> <init>
     boolean lambda$getGenericSignatureArgumentApplier$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     boolean lambda$getGenericSignatureArgumentApplier$8(com.android.tools.r8.graph.DexType) -> a
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):988:991 -> a
-    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1078:1080 -> a
-    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1079:1079 -> a
-    9:9:boolean lambda$merge$2(com.android.tools.r8.graph.DexEncodedMethod):1138:1138 -> a
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):987:990 -> a
+    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1077:1079 -> a
+    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1078:1078 -> a
+    9:9:boolean lambda$merge$2(com.android.tools.r8.graph.DexEncodedMethod):1137:1137 -> a
     10:10:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    10:10:boolean lambda$merge$2(com.android.tools.r8.graph.DexEncodedMethod):1138 -> a
-    11:11:void lambda$merge$3(com.android.tools.r8.graph.ProgramMethod):1139:1139 -> a
+    10:10:boolean lambda$merge$2(com.android.tools.r8.graph.DexEncodedMethod):1137 -> a
+    11:11:void lambda$merge$3(com.android.tools.r8.graph.ProgramMethod):1138:1138 -> a
     12:12:void com.android.tools.r8.graph.DefaultInstanceInitializerCode.uncanonicalizeCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):75:75 -> a
-    12:12:void lambda$merge$3(com.android.tools.r8.graph.ProgramMethod):1139 -> a
-    13:13:boolean lambda$merge$4(java.util.Set,com.android.tools.r8.graph.DexField):1156:1156 -> a
-    14:33:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1241:1260 -> a
+    12:12:void lambda$merge$3(com.android.tools.r8.graph.ProgramMethod):1138 -> a
+    13:13:boolean lambda$merge$4(java.util.Set,com.android.tools.r8.graph.DexField):1155:1155 -> a
+    14:33:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1240:1259 -> a
     34:37:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):70:73 -> a
-    34:37:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1260 -> a
-    38:77:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1262:1301 -> a
+    34:37:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1259 -> a
+    38:77:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1261:1300 -> a
     78:79:void com.android.tools.r8.utils.CollectionUtils.forEach(java.util.function.Consumer,java.util.Collection[]):30:31 -> a
-    78:79:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1301 -> a
-    80:80:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1315:1315 -> a
-    81:88:void lambda$rewriteGenericSignatures$5(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1303:1310 -> a
-    89:89:void lambda$rewriteGenericSignatures$5(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1307:1307 -> a
-    90:94:void lambda$rewriteGenericSignatures$6(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1317:1321 -> a
-    95:95:void lambda$rewriteGenericSignatures$6(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1320:1320 -> a
-    96:118:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1327:1349 -> a
-    119:119:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1347:1347 -> a
-    120:132:boolean restoreDebuggingState(java.util.stream.Stream):1355:1367 -> a
-    133:133:boolean restoreDebuggingState(java.util.stream.Stream):1366:1366 -> a
-    134:134:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder getRenamings():1372:1372 -> a
-    135:163:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1381:1409 -> a
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    164:164:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):309 -> a
-    164:164:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1409 -> a
-    165:165:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):309:309 -> a
-    165:165:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1409 -> a
-    166:204:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1412:1450 -> a
-    205:205:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1395:1395 -> a
-    206:206:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$13(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.RewrittenPrototypeDescription):1418:1418 -> a
-    207:210:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1578:1581 -> a
-    211:222:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1680:1691 -> a
-    211:222:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1582 -> a
-    223:229:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1690:1696 -> a
-    223:229:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1582 -> a
-    230:230:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> a
-    230:230:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1696 -> a
-    230:230:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1582 -> a
-    231:232:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1583:1584 -> a
-    233:233:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):318:318 -> a
-    233:233:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1584 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    234:239:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1585:1590 -> a
-    240:240:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1599:1599 -> a
-    241:241:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1845,"2":1846,"3":1847,"4":1848,"5":1849}}
-    1845:1845:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1601:1601 -> a
-    1846:1846:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1601:1601 -> a
-    1847:1847:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1601:1601 -> a
-    1848:1848:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1601:1601 -> a
-    1849:1849:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1601:1601 -> a
-    1844:1844:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1603:1603 -> a
-    1850:1878:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1644:1672 -> a
-    1879:1903:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1651:1675 -> a
-    1904:1904:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1649:1649 -> a
-    1:2:void lambda$restoreDebuggingState$10(com.android.tools.r8.graph.DexEncodedMethod):1362:1363 -> b
-    3:3:java.util.List getSynthesizedBridges():1376:1376 -> b
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.RewrittenPrototypeDescription):1443:1443 -> b
-    1:2:boolean merge():980:981 -> c
-    3:4:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1561:1562 -> c
-    3:4:boolean merge():981 -> c
-    5:17:boolean merge():983:995 -> c
-    18:27:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1608:1617 -> c
-    18:27:boolean merge():997 -> c
-    28:35:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1616:1623 -> c
-    28:35:boolean merge():997 -> c
-    36:36:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):322:322 -> c
-    36:36:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1623 -> c
-    36:36:boolean merge():997 -> c
-    37:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1624:1627 -> c
-    37:40:boolean merge():997 -> c
-    41:44:void com.android.tools.r8.shaking.VerticalClassMerger.makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1710:1713 -> c
+    78:79:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1300 -> a
+    80:80:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1314:1314 -> a
+    81:88:void lambda$rewriteGenericSignatures$5(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1302:1309 -> a
+    89:89:void lambda$rewriteGenericSignatures$5(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1306:1306 -> a
+    90:94:void lambda$rewriteGenericSignatures$6(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1316:1320 -> a
+    95:95:void lambda$rewriteGenericSignatures$6(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1319:1319 -> a
+    96:120:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1326:1350 -> a
+    121:121:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1348:1348 -> a
+    122:134:boolean restoreDebuggingState(java.util.stream.Stream):1356:1368 -> a
+    135:135:boolean restoreDebuggingState(java.util.stream.Stream):1367:1367 -> a
+    136:136:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder getRenamings():1373:1373 -> a
+    137:165:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1382:1410 -> a
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
+    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):309 -> a
+    166:166:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1410 -> a
+    167:167:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):309:309 -> a
+    167:167:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1410 -> a
+    168:206:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1413:1451 -> a
+    207:207:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1396:1396 -> a
+    208:208:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$13(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.RewrittenPrototypeDescription):1419:1419 -> a
+    209:212:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1580:1583 -> a
+    213:224:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1682:1693 -> a
+    213:224:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1584 -> a
+    225:231:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1692:1698 -> a
+    225:231:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1584 -> a
+    232:232:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> a
+    232:232:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1698 -> a
+    232:232:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1584 -> a
+    233:234:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1585:1586 -> a
+    235:235:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):323:323 -> a
+    235:235:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1586 -> a
+    236:241:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1587:1592 -> a
+    242:242:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1601:1601 -> a
+    243:243:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1849,"2":1850,"3":1851,"4":1852,"5":1853}}
+    1849:1849:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1603:1603 -> a
+    1850:1850:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1603:1603 -> a
+    1851:1851:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1603:1603 -> a
+    1852:1852:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1603:1603 -> a
+    1853:1853:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1603:1603 -> a
+    1848:1848:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1605:1605 -> a
+    1854:1882:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1646:1674 -> a
+    1883:1907:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1653:1677 -> a
+    1908:1908:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1651:1651 -> a
+    1:2:void lambda$restoreDebuggingState$10(com.android.tools.r8.graph.DexEncodedMethod):1363:1364 -> b
+    3:3:java.util.List getSynthesizedBridges():1377:1377 -> b
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.RewrittenPrototypeDescription):1444:1444 -> b
+    1:2:boolean merge():979:980 -> c
+    3:4:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1563:1564 -> c
+    3:4:boolean merge():980 -> c
+    5:17:boolean merge():982:994 -> c
+    18:27:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1610:1619 -> c
+    18:27:boolean merge():996 -> c
+    28:35:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1618:1625 -> c
+    28:35:boolean merge():996 -> c
+    36:36:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):327:327 -> c
+    36:36:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1625 -> c
+    36:36:boolean merge():996 -> c
+    37:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1626:1629 -> c
+    37:40:boolean merge():996 -> c
+    41:44:void com.android.tools.r8.shaking.VerticalClassMerger.makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1712:1715 -> c
     41:44:void com.android.tools.r8.shaking.VerticalClassMerger.access$1200(com.android.tools.r8.graph.DexEncodedMethod):118 -> c
-    41:44:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1628 -> c
-    41:44:boolean merge():997 -> c
-    45:45:boolean merge():998:998 -> c
-    46:46:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1556:1556 -> c
-    46:46:boolean merge():998 -> c
-    47:47:boolean merge():999:999 -> c
-    48:48:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1473:1473 -> c
-    48:48:boolean merge():999 -> c
-    49:49:boolean merge():1005:1005 -> c
-    50:50:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1634:1634 -> c
-    50:50:boolean merge():1002 -> c
-    51:51:boolean merge():1006:1006 -> c
-    52:52:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1556:1556 -> c
-    52:52:boolean merge():1006 -> c
-    53:53:boolean merge():1007:1007 -> c
-    54:54:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):322:322 -> c
-    54:54:boolean merge():1007 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    55:57:boolean merge():1008:1008 -> c
-    59:59:boolean merge():1010:1010 -> c
-    60:60:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1473:1473 -> c
-    60:60:boolean merge():1010 -> c
-    61:61:boolean merge():1014:1014 -> c
-    62:77:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1526:1541 -> c
-    62:77:boolean merge():1015 -> c
+    41:44:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1630 -> c
+    41:44:boolean merge():996 -> c
+    45:45:boolean merge():997:997 -> c
+    46:46:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1558:1558 -> c
+    46:46:boolean merge():997 -> c
+    47:47:boolean merge():998:998 -> c
+    48:48:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1474:1474 -> c
+    48:48:boolean merge():998 -> c
+    49:49:boolean merge():1004:1004 -> c
+    50:50:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1636:1636 -> c
+    50:50:boolean merge():1001 -> c
+    51:51:boolean merge():1005:1005 -> c
+    52:52:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1558:1558 -> c
+    52:52:boolean merge():1005 -> c
+    53:53:boolean merge():1006:1006 -> c
+    54:54:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):327:327 -> c
+    54:54:boolean merge():1006 -> c
+    55:57:boolean merge():1007:1007 -> c
+    59:59:boolean merge():1009:1009 -> c
+    60:60:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1474:1474 -> c
+    60:60:boolean merge():1009 -> c
+    61:61:boolean merge():1013:1013 -> c
+    62:77:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1528:1543 -> c
+    62:77:boolean merge():1014 -> c
     78:78:boolean merge():0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":347,"2":348,"3":349}}
-    347:347:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1542:1542 -> c
-    347:347:boolean merge():1015 -> c
-    348:348:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1542:1542 -> c
-    348:348:boolean merge():1015 -> c
-    349:349:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1542:1542 -> c
-    349:349:boolean merge():1015 -> c
-    79:79:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1542:1542 -> c
-    79:79:boolean merge():1015 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":349,"2":350,"3":351}}
+    349:349:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1544:1544 -> c
+    349:349:boolean merge():1014 -> c
+    350:350:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1544:1544 -> c
+    350:350:boolean merge():1014 -> c
+    351:351:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1544:1544 -> c
+    351:351:boolean merge():1014 -> c
+    79:79:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1544:1544 -> c
+    79:79:boolean merge():1014 -> c
     80:80:boolean merge():0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":352,"2":353,"3":354}}
-    352:352:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1545:1545 -> c
-    352:352:boolean merge():1015 -> c
-    353:353:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1545:1545 -> c
-    353:353:boolean merge():1015 -> c
-    354:354:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1545:1545 -> c
-    354:354:boolean merge():1015 -> c
-    81:81:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1547:1547 -> c
-    81:81:boolean merge():1015 -> c
-    82:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1542:1542 -> c
-    82:82:boolean merge():1015 -> c
-    83:88:boolean merge():1017:1022 -> c
-    89:89:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):322:322 -> c
-    89:89:boolean merge():1022 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    90:90:boolean merge():1023:1023 -> c
-    91:91:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):322:322 -> c
-    91:91:boolean merge():1023 -> c
-    92:105:boolean merge():1024:1037 -> c
-    106:118:boolean merge():1036:1048 -> c
-    119:119:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1634:1634 -> c
-    119:119:boolean merge():1053 -> c
-    120:120:boolean merge():1055:1055 -> c
-    121:124:boolean merge():1054:1057 -> c
-    125:125:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):322:322 -> c
-    125:125:boolean merge():1056 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    126:128:boolean merge():1058:1058 -> c
-    130:130:boolean merge():1060:1060 -> c
-    131:131:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1556:1556 -> c
-    131:131:boolean merge():1060 -> c
-    132:148:boolean merge():1066:1082 -> c
-    149:149:boolean merge():1075:1075 -> c
-    150:154:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1700:1704 -> c
-    150:154:boolean merge():1083 -> c
-    155:155:boolean merge():1086:1086 -> c
-    156:156:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1634:1634 -> c
-    156:156:boolean merge():1092 -> c
-    157:157:boolean merge():1093:1093 -> c
-    158:162:void com.android.tools.r8.shaking.VerticalClassMerger.makePublic(com.android.tools.r8.graph.DexEncodedMethod):1717:1721 -> c
-    158:162:void com.android.tools.r8.shaking.VerticalClassMerger.access$1100(com.android.tools.r8.graph.DexEncodedMethod):118 -> c
-    158:162:boolean merge():1094 -> c
-    163:166:void com.android.tools.r8.shaking.VerticalClassMerger.makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1710:1713 -> c
-    163:166:void com.android.tools.r8.shaking.VerticalClassMerger.access$1200(com.android.tools.r8.graph.DexEncodedMethod):118 -> c
-    163:166:boolean merge():1096 -> c
-    167:169:boolean merge():1101:1103 -> c
-    170:170:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1556:1556 -> c
-    170:170:boolean merge():1100 -> c
-    171:172:boolean merge():1107:1108 -> c
-    173:173:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1473:1473 -> c
-    173:173:boolean merge():1108 -> c
-    174:185:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1478:1489 -> c
-    174:185:boolean merge():1116 -> c
-    186:192:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1487:1493 -> c
-    186:192:boolean merge():1116 -> c
-    193:193:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> c
-    193:193:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1493 -> c
-    193:193:boolean merge():1116 -> c
-    194:219:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1494:1519 -> c
-    194:219:boolean merge():1116 -> c
-    220:222:boolean merge():1117:1117 -> c
-    224:224:boolean merge():1119:1119 -> c
-    225:225:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1556:1556 -> c
-    225:225:boolean merge():1119 -> c
-    226:226:boolean merge():1122:1122 -> c
-    227:227:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):322:322 -> c
-    227:227:boolean merge():1122 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    228:233:boolean merge():1123:1128 -> c
-    234:268:boolean merge():1127:1161 -> c
-    269:278:boolean merge():1159:1168 -> c
-    279:286:boolean merge():1166:1173 -> c
-    287:289:java.util.Set com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.mergeArrays(java.lang.Object[],java.lang.Object[]):1567:1569 -> c
-    287:289:boolean merge():1173 -> c
-    290:326:boolean merge():1176:1212 -> c
-    327:340:com.android.tools.r8.graph.GenericSignatureContextBuilder com.android.tools.r8.graph.GenericSignatureContextBuilder.createForSingleClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):185:198 -> c
-    327:340:boolean merge():1212 -> c
-    341:344:boolean merge():1211:1214 -> c
-    345:345:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.isValid():58:58 -> c
-    345:345:boolean merge():1214 -> c
-    346:346:boolean merge():1211:1211 -> c
-    355:355:boolean lambda$restoreDebuggingState$11(com.android.tools.r8.graph.DexEncodedMethod):1367:1367 -> c
-    1:2:void lambda$restoreDebuggingState$9(com.android.tools.r8.graph.DexEncodedMethod):1357:1358 -> d
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.K20:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":354,"2":355,"3":356}}
+    354:354:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1547:1547 -> c
+    354:354:boolean merge():1014 -> c
+    355:355:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1547:1547 -> c
+    355:355:boolean merge():1014 -> c
+    356:356:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1547:1547 -> c
+    356:356:boolean merge():1014 -> c
+    81:81:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1549:1549 -> c
+    81:81:boolean merge():1014 -> c
+    82:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1544:1544 -> c
+    82:82:boolean merge():1014 -> c
+    83:88:boolean merge():1016:1021 -> c
+    89:89:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):327:327 -> c
+    89:89:boolean merge():1021 -> c
+    90:90:boolean merge():1022:1022 -> c
+    91:91:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):327:327 -> c
+    91:91:boolean merge():1022 -> c
+    92:105:boolean merge():1023:1036 -> c
+    106:118:boolean merge():1035:1047 -> c
+    119:119:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1636:1636 -> c
+    119:119:boolean merge():1052 -> c
+    120:120:boolean merge():1054:1054 -> c
+    121:124:boolean merge():1053:1056 -> c
+    125:125:boolean merge():1055:1055 -> c
+    126:126:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):327:327 -> c
+    126:126:boolean merge():1055 -> c
+    127:129:boolean merge():1057:1057 -> c
+    131:131:boolean merge():1059:1059 -> c
+    132:132:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1558:1558 -> c
+    132:132:boolean merge():1059 -> c
+    133:149:boolean merge():1065:1081 -> c
+    150:150:boolean merge():1074:1074 -> c
+    151:155:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1702:1706 -> c
+    151:155:boolean merge():1082 -> c
+    156:156:boolean merge():1085:1085 -> c
+    157:157:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1636:1636 -> c
+    157:157:boolean merge():1091 -> c
+    158:158:boolean merge():1092:1092 -> c
+    159:163:void com.android.tools.r8.shaking.VerticalClassMerger.makePublic(com.android.tools.r8.graph.DexEncodedMethod):1719:1723 -> c
+    159:163:void com.android.tools.r8.shaking.VerticalClassMerger.access$1100(com.android.tools.r8.graph.DexEncodedMethod):118 -> c
+    159:163:boolean merge():1093 -> c
+    164:167:void com.android.tools.r8.shaking.VerticalClassMerger.makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1712:1715 -> c
+    164:167:void com.android.tools.r8.shaking.VerticalClassMerger.access$1200(com.android.tools.r8.graph.DexEncodedMethod):118 -> c
+    164:167:boolean merge():1095 -> c
+    168:170:boolean merge():1100:1102 -> c
+    171:171:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1558:1558 -> c
+    171:171:boolean merge():1099 -> c
+    172:173:boolean merge():1106:1107 -> c
+    174:174:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1474:1474 -> c
+    174:174:boolean merge():1107 -> c
+    175:186:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1479:1490 -> c
+    175:186:boolean merge():1115 -> c
+    187:193:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1488:1494 -> c
+    187:193:boolean merge():1115 -> c
+    194:194:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> c
+    194:194:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1494 -> c
+    194:194:boolean merge():1115 -> c
+    195:221:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1495:1521 -> c
+    195:221:boolean merge():1115 -> c
+    222:224:boolean merge():1116:1116 -> c
+    226:226:boolean merge():1118:1118 -> c
+    227:227:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1558:1558 -> c
+    227:227:boolean merge():1118 -> c
+    228:228:boolean merge():1121:1121 -> c
+    229:229:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):327:327 -> c
+    229:229:boolean merge():1121 -> c
+    230:235:boolean merge():1122:1127 -> c
+    236:270:boolean merge():1126:1160 -> c
+    271:280:boolean merge():1158:1167 -> c
+    281:288:boolean merge():1165:1172 -> c
+    289:291:java.util.Set com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.mergeArrays(java.lang.Object[],java.lang.Object[]):1569:1571 -> c
+    289:291:boolean merge():1172 -> c
+    292:328:boolean merge():1175:1211 -> c
+    329:342:com.android.tools.r8.graph.GenericSignatureContextBuilder com.android.tools.r8.graph.GenericSignatureContextBuilder.createForSingleClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):185:198 -> c
+    329:342:boolean merge():1211 -> c
+    343:346:boolean merge():1210:1213 -> c
+    347:347:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.isValid():58:58 -> c
+    347:347:boolean merge():1213 -> c
+    348:348:boolean merge():1210:1210 -> c
+    357:357:boolean lambda$restoreDebuggingState$11(com.android.tools.r8.graph.DexEncodedMethod):1368:1368 -> c
+    1:2:void lambda$restoreDebuggingState$9(com.android.tools.r8.graph.DexEncodedMethod):1358:1359 -> d
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.Y00:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
     java.util.Collection invokes -> f
@@ -113869,191 +112684,182 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> g
     com.android.tools.r8.graph.DexType target -> e
-    1:1:void <clinit>():1803:1803 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$1):1803:1803 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1814:1814 -> <init>
-    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1808:1820 -> <init>
-    1:18:void fillSeenPositions():1850:1867 -> a
-    19:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1857:1857 -> a
-    20:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
-    20:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1857 -> a
-    21:21:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1858:1858 -> a
-    22:53:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1877:1908 -> a
-    1:22:boolean mayCollide():1824:1845 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.L20:
+    1:1:void <clinit>():1805:1805 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$1):1805:1805 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1816:1816 -> <init>
+    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1810:1822 -> <init>
+    1:18:void fillSeenPositions():1852:1869 -> a
+    19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1859:1860 -> a
+    21:52:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1879:1910 -> a
+    1:22:boolean mayCollide():1826:1847 -> b
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.Z00:
     com.android.tools.r8.graph.AppView appView -> f
-    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2054:2055 -> <init>
-    1:2:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2076:2077 -> a
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    3:3:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2077 -> a
-    4:7:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2078:2081 -> a
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2056:2057 -> <init>
+    1:2:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2078:2079 -> a
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    3:3:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2079 -> a
+    4:7:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2080:2083 -> a
     8:8:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    8:8:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2081 -> a
-    9:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2086:2090 -> a
+    8:8:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2083 -> a
+    9:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2088:2092 -> a
     14:14:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():440:440 -> a
-    14:14:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2090 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:15:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2091:2091 -> a
-    16:17:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2124:2125 -> a
-    18:18:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    18:18:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2125 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2126:2126 -> a
-    20:20:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2157:2157 -> a
-    21:21:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> a
-    21:21:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2157 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    22:22:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2157:2157 -> a
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):2112:2112 -> b
-    2:3:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2138:2139 -> b
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> b
-    4:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2139 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2140:2140 -> b
-    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2152:2152 -> c
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> c
-    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2152 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2152:2152 -> c
-    4:4:void registerInstanceOf(com.android.tools.r8.graph.DexType):2182:2182 -> c
-    1:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2131:2132 -> d
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> d
-    3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2132 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2133:2133 -> d
-    5:5:void registerNewInstance(com.android.tools.r8.graph.DexType):2162:2162 -> d
-    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2167:2167 -> e
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> e
-    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2167 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2167:2167 -> e
-    1:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2145:2146 -> f
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> f
-    3:3:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2146 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2147:2147 -> f
-    5:5:void registerTypeReference(com.android.tools.r8.graph.DexType):2177:2177 -> f
-    1:1:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2099:2099 -> g
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> g
-    2:2:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2099 -> g
-    3:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2100:2103 -> g
-    7:8:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2117:2118 -> g
-    9:9:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> g
-    9:9:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2118 -> g
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:10:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2119:2119 -> g
-    11:11:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2172:2172 -> g
-    12:12:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):458:458 -> g
-    12:12:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2172 -> g
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2172:2172 -> g
-    1:2:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2059:2060 -> i
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> i
-    3:3:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2060 -> i
-    4:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2061:2068 -> i
-com.android.tools.r8.shaking.VerticalClassMerger$InvokeSpecialToDefaultLibraryMethodUseRegistry -> com.android.tools.r8.internal.M20:
+    14:14:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2092 -> a
+    15:15:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2093:2093 -> a
+    16:17:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2126:2127 -> a
+    18:18:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    18:18:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2127 -> a
+    19:19:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2128:2128 -> a
+    20:20:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2159:2159 -> a
+    21:21:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> a
+    21:21:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2159 -> a
+    22:22:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2159:2159 -> a
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):2114:2114 -> b
+    2:3:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2140:2141 -> b
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> b
+    4:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2141 -> b
+    5:5:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2142:2142 -> b
+    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2154:2154 -> c
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> c
+    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2154 -> c
+    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2154:2154 -> c
+    4:4:void registerInstanceOf(com.android.tools.r8.graph.DexType):2184:2184 -> c
+    1:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2133:2134 -> d
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> d
+    3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2134 -> d
+    4:4:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2135:2135 -> d
+    5:5:void registerNewInstance(com.android.tools.r8.graph.DexType):2164:2164 -> d
+    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2169:2169 -> e
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> e
+    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2169 -> e
+    3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2169:2169 -> e
+    1:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2147:2148 -> f
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> f
+    3:3:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2148 -> f
+    4:4:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2149:2149 -> f
+    5:5:void registerTypeReference(com.android.tools.r8.graph.DexType):2179:2179 -> f
+    1:1:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2101:2101 -> g
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> g
+    2:2:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2101 -> g
+    3:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2102:2105 -> g
+    7:8:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2119:2120 -> g
+    9:9:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> g
+    9:9:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2120 -> g
+    10:10:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2121:2121 -> g
+    11:11:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2174:2174 -> g
+    12:12:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):467:467 -> g
+    12:12:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2174 -> g
+    13:13:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2174:2174 -> g
+    1:2:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2061:2062 -> i
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> i
+    3:3:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2062 -> i
+    4:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2063:2070 -> i
+com.android.tools.r8.shaking.VerticalClassMerger$InvokeSpecialToDefaultLibraryMethodUseRegistry -> com.android.tools.r8.internal.a10:
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():2186:2186 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2191:2192 -> <init>
+    1:1:void <clinit>():2188:2188 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2193:2194 -> <init>
     void registerInstanceFieldRead(com.android.tools.r8.graph.DexField) -> a
     void registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
     void registerInitClass(com.android.tools.r8.graph.DexType) -> b
     void registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
     void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField) -> c
-    1:8:void registerInvokeSpecial(com.android.tools.r8.graph.DexMethod):2197:2204 -> c
+    1:8:void registerInvokeSpecial(com.android.tools.r8.graph.DexMethod):2199:2206 -> c
     void registerInvokeStatic(com.android.tools.r8.graph.DexMethod) -> d
     void registerStaticFieldRead(com.android.tools.r8.graph.DexField) -> e
     void registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> f
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.N20:
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.b10:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set mergeeCandidates -> c
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap cache -> a
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):617:617 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):612:620 -> <init>
-    1:35:java.util.Collection get():625:659 -> a
-    36:36:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):643:643 -> a
-    37:41:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):667:671 -> a
-    42:49:boolean com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever.typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):687:694 -> a
-    42:49:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):671 -> a
-    50:50:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):674:674 -> a
-    51:58:boolean com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever.typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):687:694 -> a
-    51:58:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):675 -> a
-    59:59:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):681:681 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.O20:
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):616:616 -> <init>
+    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):611:619 -> <init>
+    1:35:java.util.Collection get():624:658 -> a
+    36:36:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):642:642 -> a
+    37:41:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):666:670 -> a
+    42:49:boolean com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever.typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):686:693 -> a
+    42:49:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):670 -> a
+    50:50:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):673:673 -> a
+    51:58:boolean com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever.typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):686:693 -> a
+    51:58:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):674 -> a
+    59:59:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):680:680 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.c10:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> h
     com.android.tools.r8.graph.DexProgramClass target -> g
     com.android.tools.r8.graph.DexType source -> f
-    1:1:void <clinit>():1942:1942 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1947:1950 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1955:1955 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1965:1965 -> a
-    3:23:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):1993:2013 -> a
-    24:24:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):2020:2020 -> a
-    25:25:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):2031:2031 -> a
-    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1960:1960 -> b
-    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1970:1970 -> b
-    3:3:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1975:1975 -> b
-    4:4:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):2037:2037 -> b
-    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1980:1980 -> d
-    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):2026:2026 -> d
-    boolean isContextFreeForMethods() -> f
-    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1985:1985 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.P20:
+    1:1:void <clinit>():1944:1944 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1949:1952 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1957:1957 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1967:1967 -> a
+    3:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):1972:1972 -> a
+    4:24:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):1995:2015 -> a
+    25:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):2022:2022 -> a
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1962:1962 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1977:1977 -> b
+    3:3:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):2033:2033 -> b
+    4:4:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):2039:2039 -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):2028:2028 -> c
+    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1982:1982 -> d
+    1:1:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1987:1987 -> e
+    boolean isContextFreeForMethods() -> g
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.d10:
     com.android.tools.r8.ir.code.Invoke$Type type -> g
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethod invocationTarget -> f
     com.android.tools.r8.graph.DexMethod originalMethod -> e
     com.android.tools.r8.graph.DexMethod method -> d
     boolean isInterface -> h
-    1:1:void <clinit>():2242:2242 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):2255:2260 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):2242:2242 -> a
-    2:3:void updateMethodSignatures(java.util.function.Function):2275:2276 -> a
-    4:4:java.util.function.Consumer getRegistryCallback(com.android.tools.r8.graph.DexClassAndMethod):2295:2295 -> a
-    5:17:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2296:2308 -> a
+    1:1:void <clinit>():2244:2244 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):2257:2262 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):2244:2244 -> a
+    2:3:void updateMethodSignatures(java.util.function.Function):2277:2278 -> a
+    4:4:java.util.function.Consumer getRegistryCallback(com.android.tools.r8.graph.DexClassAndMethod):2297:2297 -> a
+    5:17:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2298:2310 -> a
     18:18:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2337,"2":2338,"3":2339}}
-    2337:2337:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2308:2308 -> a
-    2338:2338:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2308:2308 -> a
-    2339:2339:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2308:2308 -> a
-    2326:2326:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2308:2308 -> a
-    2327:2327:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2302:2302 -> a
-    2328:2328:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2299:2299 -> a
-    1:2:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2281:2282 -> t0
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2339,"2":2340,"3":2341}}
+    2339:2339:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2310:2310 -> a
+    2340:2340:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2310:2310 -> a
+    2341:2341:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2310:2310 -> a
+    2328:2328:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2310:2310 -> a
+    2329:2329:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2304:2304 -> a
+    2330:2330:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2301:2301 -> a
+    1:2:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2283:2284 -> t0
     3:3:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):25:25 -> t0
-    3:3:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2282 -> t0
-    4:7:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2283:2286 -> t0
+    3:3:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2284 -> t0
+    4:7:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2285:2288 -> t0
     8:8:boolean com.android.tools.r8.ir.code.Invoke$Type.isStatic():189:189 -> t0
-    8:8:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2286 -> t0
-    9:13:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2286:2290 -> t0
-com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.Q20:
+    8:8:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2288 -> t0
+    9:13:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2288:2292 -> t0
+com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.e10:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder lensBuilder -> g
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.graph.classmerging.VerticallyMergedClasses mergedClasses -> h
     java.util.List synthesizedBridges -> i
-    1:1:void <clinit>():1724:1724 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,java.util.List):1736:1741 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens access$400(com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer):1724:1724 -> a
-    2:2:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1772:1772 -> a
-    3:3:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1777:1777 -> a
-    4:4:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):305:305 -> a
-    4:4:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1777 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1778:1778 -> a
-    6:6:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):318:318 -> a
-    6:6:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1778 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:8:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1784:1785 -> a
-    9:14:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1792:1797 -> a
-    1:11:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1746:1756 -> b
-    12:13:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1763:1764 -> b
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.V20:
+    1:1:void <clinit>():1726:1726 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,java.util.List):1738:1743 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens access$400(com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer):1726:1726 -> a
+    2:2:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1774:1774 -> a
+    3:3:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1779:1779 -> a
+    4:4:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):310:310 -> a
+    4:4:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1779 -> a
+    5:5:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1780:1780 -> a
+    6:6:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):323:323 -> a
+    6:6:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1780 -> a
+    7:8:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1786:1787 -> a
+    9:14:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1794:1799 -> a
+    1:3:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1748:1750 -> b
+    4:4:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.graph.TreeFixerBase.fixupFields(java.util.List):170:170 -> b
+    4:4:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1750 -> b
+    5:6:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1750:1751 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.graph.TreeFixerBase.fixupFields(java.util.List):170:170 -> b
+    7:7:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1751 -> b
+    8:15:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1751:1758 -> b
+    16:17:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1765:1766 -> b
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.i10:
     com.android.tools.r8.graph.AppView appView -> n
     java.util.Map originalMethodSignaturesForBridges -> r
     java.util.Map contextualVirtualToDirectMethodMaps -> p
@@ -114063,22 +112869,21 @@
     1:1:void <clinit>():55:55 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1):55:55 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map):80:85 -> <init>
-    1:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):101:127 -> a
-    28:30:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):126:128 -> a
-    31:31:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.shaking.VerticalClassMergerGraphLens.mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):140:140 -> a
-    31:31:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):128 -> a
-    32:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):128:129 -> a
-    34:34:boolean lambda$verifyIsContextFreeForMethod$0(com.android.tools.r8.graph.DexMethod,java.util.Map):153:153 -> a
-    1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):140:140 -> b
-    1:4:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):150:153 -> e
-    5:5:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):152:152 -> e
-    1:2:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):90:91 -> f
+    1:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):106:132 -> a
+    28:30:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):131:133 -> a
+    31:31:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.shaking.VerticalClassMergerGraphLens.mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):145:145 -> a
+    31:31:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):133 -> a
+    32:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):133:134 -> a
+    34:34:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):145:145 -> a
+    35:35:boolean lambda$verifyIsContextFreeForMethod$0(com.android.tools.r8.graph.DexMethod,java.util.Map):158:158 -> a
+    1:4:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):155:158 -> d
+    5:5:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):157:157 -> d
+    1:3:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):139:139 -> e
+    1:2:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):95:96 -> f
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> f
-    3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):95 -> f
-    4:6:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):134:134 -> f
-    7:7:boolean isContextFreeForMethods():145:145 -> f
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1 -> com.android.tools.r8.internal.S20:
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.T20:
+    3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):100 -> f
+    1:1:boolean isContextFreeForMethods():150:150 -> g
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.g10:
     java.util.Map methodMap -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newMethodSignatures -> f
     boolean $assertionsDisabled -> i
@@ -114088,57 +112893,57 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder mergedMethodsBuilder -> d
     java.util.Map cache -> h
-    1:1:void <clinit>():157:157 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):175:175 -> <init>
-    2:17:void <init>(com.android.tools.r8.graph.DexItemFactory):161:176 -> <init>
-    1:9:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):180:188 -> a
-    10:10:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):322:322 -> a
-    10:10:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):186 -> a
-    11:13:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):190:192 -> a
-    14:14:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.markMethodAsMerged(com.android.tools.r8.graph.DexMethod):314:314 -> a
-    14:14:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):191 -> a
-    15:17:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):195:197 -> a
-    18:26:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):284:292 -> a
-    18:26:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):197 -> a
-    27:57:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):197:227 -> a
-    58:58:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):337:337 -> a
-    58:58:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):225 -> a
-    59:59:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):184:184 -> a
-    60:65:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):251:256 -> a
-    60:65:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):184 -> a
-    66:74:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):284:292 -> a
-    66:74:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):257 -> a
-    66:74:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):184 -> a
-    75:75:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):262:262 -> a
-    75:75:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):184 -> a
-    76:76:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):318:318 -> a
-    76:76:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):183 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    77:77:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$createBuilderForFixup$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.RewrittenPrototypeDescription):208:208 -> a
-    78:82:void lambda$createBuilderForFixup$2(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):215:219 -> a
-    83:92:com.android.tools.r8.shaking.VerticalClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):234:243 -> a
-    93:106:com.android.tools.r8.graph.DexMethod getMethodSignatureAfterClassMerging(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):267:280 -> a
-    107:115:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):284:292 -> a
-    107:115:com.android.tools.r8.graph.DexType lambda$getMethodSignatureAfterClassMerging$3(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexType):275 -> a
-    116:119:boolean hasMappingForSignatureInContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):296:299 -> a
-    120:121:boolean hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexMethod):309:310 -> a
-    122:124:void mapVirtualMethodToDirectInType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider,com.android.tools.r8.graph.DexType):342:344 -> a
-    125:125:java.util.Map lambda$mapVirtualMethodToDirectInType$4(com.android.tools.r8.graph.DexType):343:343 -> a
-    126:170:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder):348:392 -> a
-    171:171:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):353:353 -> a
-    172:172:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    172:172:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):354 -> a
-    173:189:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):359:375 -> a
-    190:195:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):374:379 -> a
-    196:196:boolean lambda$merge$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):354:354 -> a
-    1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):314:314 -> b
-    2:2:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):322:322 -> b
-    1:1:void recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):337:337 -> c
-    1:3:void recordMerge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):327:329 -> d
-    1:1:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):333:333 -> e
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.U20:
+    1:1:void <clinit>():162:162 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):180:180 -> <init>
+    2:17:void <init>(com.android.tools.r8.graph.DexItemFactory):166:181 -> <init>
+    1:9:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):185:193 -> a
+    10:10:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):327:327 -> a
+    10:10:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):191 -> a
+    11:13:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):195:197 -> a
+    14:14:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.markMethodAsMerged(com.android.tools.r8.graph.DexMethod):319:319 -> a
+    14:14:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):196 -> a
+    15:17:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):200:202 -> a
+    18:26:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):289:297 -> a
+    18:26:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):202 -> a
+    27:57:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):202:232 -> a
+    58:58:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):342:342 -> a
+    58:58:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):230 -> a
+    59:59:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):189:189 -> a
+    60:65:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):256:261 -> a
+    60:65:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):189 -> a
+    66:74:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):289:297 -> a
+    66:74:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):262 -> a
+    66:74:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):189 -> a
+    75:75:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):267:267 -> a
+    75:75:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):189 -> a
+    76:76:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):188:188 -> a
+    77:77:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):323:323 -> a
+    77:77:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):188 -> a
+    78:78:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$createBuilderForFixup$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.RewrittenPrototypeDescription):213:213 -> a
+    79:83:void lambda$createBuilderForFixup$2(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):220:224 -> a
+    84:93:com.android.tools.r8.shaking.VerticalClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):239:248 -> a
+    94:107:com.android.tools.r8.graph.DexMethod getMethodSignatureAfterClassMerging(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):272:285 -> a
+    108:116:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):289:297 -> a
+    108:116:com.android.tools.r8.graph.DexType lambda$getMethodSignatureAfterClassMerging$3(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexType):280 -> a
+    117:120:boolean hasMappingForSignatureInContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):301:304 -> a
+    121:122:boolean hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexMethod):314:315 -> a
+    123:125:void mapVirtualMethodToDirectInType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider,com.android.tools.r8.graph.DexType):347:349 -> a
+    126:126:java.util.Map lambda$mapVirtualMethodToDirectInType$4(com.android.tools.r8.graph.DexType):348:348 -> a
+    127:171:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder):353:397 -> a
+    172:172:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):358:358 -> a
+    173:173:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
+    173:173:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):359 -> a
+    174:190:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):364:380 -> a
+    191:196:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):379:384 -> a
+    197:197:boolean lambda$merge$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):359:359 -> a
+    1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):319:319 -> b
+    2:2:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):327:327 -> b
+    1:1:void recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):342:342 -> c
+    1:3:void recordMerge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):332:334 -> d
+    1:1:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):338:338 -> e
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.h10:
     com.android.tools.r8.graph.GraphLens$MethodLookupResult get(com.android.tools.r8.graph.RewrittenPrototypeDescription) -> a
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.w30:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.I10:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -114192,7 +112997,7 @@
     35:39:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230 -> d
     40:46:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230:236 -> d
     47:47:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):235:235 -> d
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.u30:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.G10:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -114208,19 +113013,18 @@
     2:3:void com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter.indent():268:269 -> c
     2:3:void startItem(java.lang.String):263 -> c
     4:4:void startItem(java.lang.String):264:264 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.v30:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.H10:
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> a
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():46:46 -> <clinit>
     1:4:void <init>(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath):50:53 -> <init>
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.shaking.l3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.shaking.B2:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:java.lang.String typeString():79:79 -> C
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.shaking.j3:
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.shaking.k3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.shaking.A2:
     1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
@@ -114271,41 +113075,37 @@
     193:193:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):237:237 -> a
     194:194:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder builder():166:166 -> a
     194:194:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):237 -> a
-    195:195:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):239:239 -> a
-    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
-    196:196:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):240 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    197:204:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):240:247 -> a
-    205:205:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
-    205:205:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):248 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    206:219:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):248:261 -> a
-    220:224:com.android.tools.r8.synthesis.CommittedSyntheticsCollection rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):265:269 -> a
-    225:226:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):276:277 -> a
-    227:227:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.flatten(java.lang.Iterable):157:157 -> a
-    227:227:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):277 -> a
-    228:239:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):277:288 -> a
-    240:242:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication):292:294 -> a
-    243:244:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):299:300 -> a
-    245:245:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":546,"2":547,"3":548,"4":549,"5":550}}
-    546:546:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
-    547:547:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
+    195:196:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):239:240 -> a
+    197:197:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
+    197:197:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):240 -> a
+    198:206:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):240:248 -> a
+    207:207:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
+    207:207:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):248 -> a
+    208:221:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):248:261 -> a
+    222:226:com.android.tools.r8.synthesis.CommittedSyntheticsCollection rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):265:269 -> a
+    227:228:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):276:277 -> a
+    229:229:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.flatten(java.lang.Iterable):157:157 -> a
+    229:229:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):277 -> a
+    230:241:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):277:288 -> a
+    242:244:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication):292:294 -> a
+    245:246:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):299:300 -> a
+    247:247:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":548,"2":549,"3":550,"4":551,"5":552}}
     548:548:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
     549:549:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
     550:550:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
-    545:545:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
+    551:551:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
+    552:552:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
+    547:547:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$200(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):31:31 -> b
     2:5:com.android.tools.r8.com.google.common.collect.ImmutableMap merge(java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableMap):119:122 -> b
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableMap getNonLegacyClasses():214:214 -> b
     7:8:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):218:219 -> b
     9:9:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):713:713 -> b
     9:9:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):219 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:11:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):219:220 -> b
     12:12:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):713:713 -> b
     12:12:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):220 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):220:220 -> b
     14:14:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> b
     14:14:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):218 -> b
@@ -114323,27 +113123,25 @@
     1:1:void <init>(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):39:39 -> <init>
     2:7:void <init>(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):35:40 -> <init>
     1:2:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addItem(com.android.tools.r8.synthesis.SyntheticDefinition):44:45 -> a
-    3:3:com.android.tools.r8.synthesis.SyntheticProgramClassReference com.android.tools.r8.synthesis.SyntheticProgramClassDefinition.toReference():46:46 -> a
-    3:3:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):51 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):51:51 -> a
-    5:8:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):55:58 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
-    9:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):59 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:11:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):59:60 -> a
-    12:12:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):65:65 -> a
-    13:16:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):69:72 -> a
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
-    17:17:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):73 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:19:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):73:74 -> a
-    20:23:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addSyntheticInput(com.android.tools.r8.graph.DexType):79:82 -> a
-    24:33:com.android.tools.r8.synthesis.CommittedSyntheticsCollection build():100:109 -> a
+    3:3:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):51:51 -> a
+    4:4:com.android.tools.r8.synthesis.SyntheticProgramClassReference com.android.tools.r8.synthesis.SyntheticProgramClassDefinition.toReference():46:46 -> a
+    4:4:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):51 -> a
+    5:5:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):51:51 -> a
+    6:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):55:58 -> a
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
+    10:10:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):59 -> a
+    11:12:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):59:60 -> a
+    13:13:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):65:65 -> a
+    14:17:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):69:72 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
+    18:18:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):73 -> a
+    19:20:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):73:74 -> a
+    21:24:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addSyntheticInput(com.android.tools.r8.graph.DexType):79:82 -> a
+    25:34:com.android.tools.r8.synthesis.CommittedSyntheticsCollection build():100:109 -> a
     1:1:java.util.List lambda$addNonLegacyClass$0(com.android.tools.r8.graph.DexType):59:59 -> b
     2:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder collectSyntheticInputs():87:94 -> b
     1:1:java.util.List lambda$addNonLegacyMethod$1(com.android.tools.r8.graph.DexType):73:73 -> c
-com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.internal.AU:
+com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.internal.TS:
     com.android.tools.r8.graph.DexType getHolder() -> a
     com.android.tools.r8.synthesis.Rewritable rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens) -> a
 com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.synthesis.d:
@@ -114359,38 +113157,35 @@
     5:5:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ClasspathOrLibraryClass):49 -> a
     6:6:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ClasspathOrLibraryClass):49:49 -> a
     7:7:com.android.tools.r8.synthesis.SynthesizingContext fromType(com.android.tools.r8.graph.DexType):57:57 -> a
-    8:8:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):64:64 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    9:9:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):65 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    10:10:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):65 -> a
-    11:11:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    11:11:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):65 -> a
-    12:12:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):65:65 -> a
-    13:15:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):74:76 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    16:16:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):76 -> a
+    8:9:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):64:65 -> a
+    10:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
+    10:11:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):65 -> a
+    12:12:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    12:12:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):65 -> a
+    13:13:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):65:65 -> a
+    14:16:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):74:76 -> a
     17:17:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
     17:17:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):76 -> a
-    18:18:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):77:77 -> a
-    19:25:int compareTo(com.android.tools.r8.synthesis.SynthesizingContext):93:99 -> a
-    26:26:com.android.tools.r8.FeatureSplit getFeatureSplit():111:111 -> a
-    27:27:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):115:115 -> a
-    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    28:28:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):115 -> a
-    29:29:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):116:116 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    30:30:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):116 -> a
-    31:33:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):118:120 -> a
-    34:34:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128:128 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
-    35:35:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:56:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):131:151 -> a
-    57:57:boolean isDerivedFromMainDexList(com.android.tools.r8.shaking.MainDexInfo):164:164 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
+    18:18:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
+    18:18:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):76 -> a
+    19:19:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    19:19:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):76 -> a
+    20:20:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):77:77 -> a
+    21:27:int compareTo(com.android.tools.r8.synthesis.SynthesizingContext):93:99 -> a
+    28:28:com.android.tools.r8.FeatureSplit getFeatureSplit():111:111 -> a
+    29:29:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):115:115 -> a
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    30:30:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):115 -> a
+    31:31:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):116:116 -> a
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    32:32:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):116 -> a
+    33:35:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):118:120 -> a
+    36:36:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128:128 -> a
+    37:37:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():442:442 -> a
+    37:37:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> a
+    38:58:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):131:151 -> a
+    59:59:boolean isDerivedFromMainDexList(com.android.tools.r8.shaking.MainDexInfo):164:164 -> a
     1:1:com.android.tools.r8.graph.DexType lambda$compareTo$0(com.android.tools.r8.synthesis.SynthesizingContext):98:98 -> b
     2:2:com.android.tools.r8.origin.Origin getInputContextOrigin():107:107 -> b
     1:1:com.android.tools.r8.graph.DexType getSynthesizingContextType():103:103 -> c
@@ -114489,11 +113284,9 @@
     1:1:boolean isValid():43:43 -> j
     2:2:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> j
     2:2:boolean isValid():43 -> j
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean isValid():43:43 -> j
     4:4:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> j
     4:4:boolean isValid():43 -> j
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:boolean isValid():43:43 -> j
     1:1:com.android.tools.r8.synthesis.SyntheticClasspathClassReference toReference():38:38 -> k
     1:1:com.android.tools.r8.synthesis.SyntheticReference toReference():16 -> k
@@ -114522,7 +113315,7 @@
     7:8:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):18 -> a
     9:9:com.android.tools.r8.synthesis.SyntheticClasspathClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):39:39 -> a
     9:9:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):18 -> a
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     10:10:com.android.tools.r8.synthesis.SyntheticClasspathClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):39 -> a
     10:10:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):18 -> a
     11:11:com.android.tools.r8.synthesis.SyntheticClasspathClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):39:39 -> a
@@ -114547,7 +113340,7 @@
     24:24:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):18 -> a
     17:17:com.android.tools.r8.synthesis.SyntheticClasspathClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):42:42 -> a
     17:17:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):18 -> a
-com.android.tools.r8.synthesis.SyntheticClasspathDefinition -> com.android.tools.r8.internal.SY:
+com.android.tools.r8.synthesis.SyntheticClasspathDefinition -> com.android.tools.r8.internal.jX:
 com.android.tools.r8.synthesis.SyntheticDefinition -> com.android.tools.r8.synthesis.k:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> a
     boolean $assertionsDisabled -> c
@@ -114570,24 +113363,26 @@
     14:14:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):105:105 -> a
     15:15:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getKind():54:54 -> a
     15:15:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):105 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:22:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):105:111 -> a
     23:23:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getKind():54:54 -> a
     23:23:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):112 -> a
-    24:26:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):112:114 -> a
-    27:28:com.android.tools.r8.synthesis.SynthesizingContext getContext():58:58 -> a
-    27:28:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):117 -> a
-    29:29:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):117:117 -> a
-    30:30:com.android.tools.r8.synthesis.SynthesizingContext getContext():58:58 -> a
-    30:30:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):122 -> a
-    31:31:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):122:122 -> a
-    32:32:com.android.tools.r8.synthesis.SynthesizingContext getContext():58:58 -> a
-    32:32:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):122 -> a
-    33:36:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):122:125 -> a
-    37:37:com.android.tools.r8.synthesis.SynthesizingContext getContext():58:58 -> a
-    37:37:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):125 -> a
-    38:38:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):125:125 -> a
-    39:62:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):124:147 -> a
+    24:24:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):112:112 -> a
+    25:29:boolean com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.isShareable():105:109 -> a
+    25:29:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):112 -> a
+    30:30:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):113:113 -> a
+    31:32:com.android.tools.r8.synthesis.SynthesizingContext getContext():58:58 -> a
+    31:32:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):116 -> a
+    33:33:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):116:116 -> a
+    34:34:com.android.tools.r8.synthesis.SynthesizingContext getContext():58:58 -> a
+    34:34:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):121 -> a
+    35:35:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):121:121 -> a
+    36:36:com.android.tools.r8.synthesis.SynthesizingContext getContext():58:58 -> a
+    36:36:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):121 -> a
+    37:40:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):121:124 -> a
+    41:41:com.android.tools.r8.synthesis.SynthesizingContext getContext():58:58 -> a
+    41:41:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):124 -> a
+    42:42:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):124:124 -> a
+    43:66:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):123:146 -> a
     com.android.tools.r8.synthesis.SyntheticClasspathDefinition asClasspathDefinition() -> b
     com.android.tools.r8.synthesis.SyntheticProgramDefinition asProgramDefinition() -> c
     1:1:com.android.tools.r8.synthesis.SynthesizingContext getContext():58:58 -> d
@@ -114596,17 +113391,17 @@
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getKind():54:54 -> g
     1:1:java.lang.String getPrefixForExternalSyntheticType():62 -> g
     2:2:java.lang.String getPrefixForExternalSyntheticType():62:62 -> g
-    3:6:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):150:153 -> g
+    3:6:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):163:166 -> g
     3:6:java.lang.String getPrefixForExternalSyntheticType():62 -> g
-    7:12:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):152:157 -> g
+    7:12:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):165:170 -> g
     7:12:java.lang.String getPrefixForExternalSyntheticType():62 -> g
-    13:13:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):155:155 -> g
+    13:13:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):168:168 -> g
     13:13:java.lang.String getPrefixForExternalSyntheticType():62 -> g
     boolean isClasspathDefinition() -> h
     boolean isProgramDefinition() -> i
     boolean isValid() -> j
     com.android.tools.r8.synthesis.SyntheticReference toReference() -> k
-com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.TY:
+com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.kX:
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function) -> a
 com.android.tools.r8.synthesis.SyntheticFinalization -> com.android.tools.r8.synthesis.p:
     com.android.tools.r8.utils.InternalOptions options -> a
@@ -114615,153 +113410,156 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():63:63 -> <clinit>
     1:4:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):151:154 -> <init>
-    1:1:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    1:1:void lambda$buildLensAndProgram$10(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):418 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:void lambda$buildLensAndProgram$10(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):418:418 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    3:3:void lambda$buildLensAndProgram$10(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):419 -> a
-    4:4:void lambda$buildLensAndProgram$10(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):419:419 -> a
-    5:17:void finalize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):159:171 -> a
-    18:18:void finalize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):167:167 -> a
-    19:29:void finalize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):164:174 -> a
-    30:45:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):213:228 -> a
-    46:57:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):285:296 -> a
-    46:57:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):227 -> a
-    58:65:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):292:299 -> a
-    58:65:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):227 -> a
-    66:69:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):227:230 -> a
-    70:81:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):285:296 -> a
-    70:81:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):229 -> a
-    82:89:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):292:299 -> a
-    82:89:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):229 -> a
-    90:90:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):229:229 -> a
-    91:142:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):225:276 -> a
-    143:143:void lambda$computeFinalSynthetics$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassReference):233:233 -> a
-    144:144:void lambda$computeFinalSynthetics$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodReference):235:235 -> a
-    145:147:void lambda$computeFinalSynthetics$2(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,com.android.tools.r8.synthesis.SyntheticReference):246:248 -> a
-    148:148:void lambda$computeFinalSynthetics$4(com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,java.util.function.Consumer):258:258 -> a
-    149:149:void com.android.tools.r8.synthesis.CommittedSyntheticsCollection.forEachSyntheticInput(java.util.function.Consumer):224:224 -> a
-    149:149:void lambda$computeFinalSynthetics$4(com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,java.util.function.Consumer):258 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    150:150:void lambda$computeFinalSynthetics$3(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.DexType):261:261 -> a
-    151:151:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    151:151:void lambda$computeFinalSynthetics$3(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.DexType):261 -> a
-    152:152:void lambda$computeFinalSynthetics$3(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.DexType):260:260 -> a
-    153:153:boolean verifyNoNestedSynthetics(com.android.tools.r8.graph.DexItemFactory):314:314 -> a
-    154:154:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):316:316 -> a
-    155:155:boolean com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.allowSyntheticContext():100:100 -> a
-    155:155:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):316 -> a
-    156:156:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):320:320 -> a
-    157:160:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):150:153 -> a
-    157:160:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):320 -> a
-    161:166:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):152:157 -> a
-    161:166:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):320 -> a
-    167:169:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):321:323 -> a
-    170:170:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):309:309 -> a
-    170:170:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):324 -> a
-    171:171:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):324:324 -> a
-    172:172:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):155:155 -> a
-    172:172:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):320 -> a
-    173:183:boolean verifyOneSyntheticPerSyntheticClass():330:340 -> a
-    184:185:void lambda$verifyOneSyntheticPerSyntheticClass$6(java.util.Set,com.android.tools.r8.graph.DexType,java.util.List):335:336 -> a
-    186:311:com.android.tools.r8.graph.DexApplication buildLensAndProgram(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.Set):363:488 -> a
-    312:312:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    312:312:com.android.tools.r8.graph.DexApplication buildLensAndProgram(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.Set):487 -> a
-    313:338:com.android.tools.r8.graph.DexApplication buildLensAndProgram(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.Set):487:512 -> a
-    339:340:void lambda$buildLensAndProgram$8(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticMethodDefinition):402:403 -> a
-    341:344:void lambda$buildLensAndProgram$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):409:412 -> a
-    345:345:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    345:345:void lambda$buildLensAndProgram$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):412 -> a
-    346:350:void lambda$buildLensAndProgram$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):412:416 -> a
-    351:352:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):458:459 -> a
-    353:353:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":823,"2":824,"3":825}}
-    823:823:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):459:459 -> a
+    1:13:void finalize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):159:171 -> a
+    14:14:void finalize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):167:167 -> a
+    15:25:void finalize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):164:174 -> a
+    26:41:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):213:228 -> a
+    42:53:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):285:296 -> a
+    42:53:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):227 -> a
+    54:61:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):292:299 -> a
+    54:61:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):227 -> a
+    62:65:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):227:230 -> a
+    66:77:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):285:296 -> a
+    66:77:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):229 -> a
+    78:85:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):292:299 -> a
+    78:85:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):229 -> a
+    86:86:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):229:229 -> a
+    87:138:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):225:276 -> a
+    139:139:void lambda$computeFinalSynthetics$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassReference):233:233 -> a
+    140:140:void lambda$computeFinalSynthetics$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodReference):235:235 -> a
+    141:143:void lambda$computeFinalSynthetics$2(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,com.android.tools.r8.synthesis.SyntheticReference):246:248 -> a
+    144:144:void lambda$computeFinalSynthetics$4(com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,java.util.function.Consumer):258:258 -> a
+    145:145:void com.android.tools.r8.synthesis.CommittedSyntheticsCollection.forEachSyntheticInput(java.util.function.Consumer):224:224 -> a
+    145:145:void lambda$computeFinalSynthetics$4(com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,java.util.function.Consumer):258 -> a
+    146:146:void lambda$computeFinalSynthetics$3(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.DexType):261:261 -> a
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    147:147:void lambda$computeFinalSynthetics$3(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.DexType):261 -> a
+    148:148:void lambda$computeFinalSynthetics$3(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.DexType):260:260 -> a
+    149:149:boolean verifyNoNestedSynthetics(com.android.tools.r8.graph.DexItemFactory):314:314 -> a
+    150:150:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):316:316 -> a
+    151:151:boolean com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.allowSyntheticContext():101:101 -> a
+    151:151:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):316 -> a
+    152:152:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):320:320 -> a
+    153:156:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):163:166 -> a
+    153:156:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):320 -> a
+    157:162:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):165:170 -> a
+    157:162:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):320 -> a
+    163:165:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):321:323 -> a
+    166:166:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):309:309 -> a
+    166:166:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):324 -> a
+    167:167:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):324:324 -> a
+    168:168:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType) -> a
+    168:168:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):320 -> a
+    169:179:boolean verifyOneSyntheticPerSyntheticClass():330:340 -> a
+    180:181:void lambda$verifyOneSyntheticPerSyntheticClass$6(java.util.Set,com.android.tools.r8.graph.DexType,java.util.List):335:336 -> a
+    182:307:com.android.tools.r8.graph.DexApplication buildLensAndProgram(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.Set):363:488 -> a
+    308:308:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
+    308:308:com.android.tools.r8.graph.DexApplication buildLensAndProgram(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.Set):487 -> a
+    309:334:com.android.tools.r8.graph.DexApplication buildLensAndProgram(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.Set):487:512 -> a
+    335:336:void lambda$buildLensAndProgram$8(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticMethodDefinition):402:403 -> a
+    337:340:void lambda$buildLensAndProgram$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):409:412 -> a
+    341:341:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
+    341:341:void lambda$buildLensAndProgram$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):412 -> a
+    342:346:void lambda$buildLensAndProgram$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):412:416 -> a
+    347:347:void lambda$buildLensAndProgram$10(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):418:418 -> a
+    348:348:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
+    348:348:void lambda$buildLensAndProgram$10(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):418 -> a
+    349:349:void lambda$buildLensAndProgram$10(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):418:418 -> a
+    350:350:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
+    350:350:void lambda$buildLensAndProgram$10(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):419 -> a
+    351:351:void lambda$buildLensAndProgram$10(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):419:419 -> a
+    352:353:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):458:459 -> a
+    354:354:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":824,"2":825,"3":826}}
     824:824:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):459:459 -> a
     825:825:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):459:459 -> a
-    813:813:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):460:460 -> a
-    814:814:void ensureSourceFile(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString):350:350 -> a
-    814:814:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):461 -> a
-    815:815:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):181:181 -> a
-    815:815:void ensureSourceFile(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString):351 -> a
+    826:826:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):459:459 -> a
+    814:814:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):460:460 -> a
+    815:815:void ensureSourceFile(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString):350:350 -> a
     815:815:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):461 -> a
-    816:821:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):462:467 -> a
-    822:822:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):463:463 -> a
-    826:828:void lambda$buildLensAndProgram$15(com.android.tools.r8.graph.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):492:494 -> a
-    829:829:void lambda$buildLensAndProgram$14(com.android.tools.r8.graph.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.ProgramMember):496:496 -> a
-    830:830:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    830:830:void lambda$buildLensAndProgram$14(com.android.tools.r8.graph.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.ProgramMember):496 -> a
-    831:837:void lambda$buildLensAndProgram$14(com.android.tools.r8.graph.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.ProgramMember):497:503 -> a
-    838:839:boolean verifyNonRepresentativesRemovedFromApplication(com.android.tools.r8.graph.DexApplication,java.util.Map):521:522 -> a
-    840:840:void lambda$verifyNonRepresentativesRemovedFromApplication$16(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticDefinition):524:524 -> a
-    841:841:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):534:534 -> a
-    842:842:boolean shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):542:542 -> a
-    842:842:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):534 -> a
-    843:843:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535:535 -> a
-    844:844:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82:82 -> a
-    844:844:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
-    845:845:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    845:845:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82 -> a
+    816:816:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):181:181 -> a
+    816:816:void ensureSourceFile(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString):351 -> a
+    816:816:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):461 -> a
+    817:822:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):462:467 -> a
+    823:823:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):463:463 -> a
+    827:829:void lambda$buildLensAndProgram$15(com.android.tools.r8.graph.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):492:494 -> a
+    830:830:void lambda$buildLensAndProgram$14(com.android.tools.r8.graph.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.ProgramMember):496:496 -> a
+    831:831:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    831:831:void lambda$buildLensAndProgram$14(com.android.tools.r8.graph.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.ProgramMember):496 -> a
+    832:838:void lambda$buildLensAndProgram$14(com.android.tools.r8.graph.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.ProgramMember):497:503 -> a
+    839:840:boolean verifyNonRepresentativesRemovedFromApplication(com.android.tools.r8.graph.DexApplication,java.util.Map):521:522 -> a
+    841:841:void lambda$verifyNonRepresentativesRemovedFromApplication$16(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticDefinition):524:524 -> a
+    842:842:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):534:534 -> a
+    843:843:boolean shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):542:542 -> a
+    843:843:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):534 -> a
+    844:844:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535:535 -> a
+    845:845:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82:82 -> a
     845:845:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
-    846:851:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82:87 -> a
-    846:851:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
-    852:857:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createAnnotationSynthesizedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexItemFactory):393:398 -> a
-    852:857:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):87 -> a
-    852:857:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
-    858:871:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):183:196 -> a
-    858:871:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):86 -> a
-    858:871:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
-    872:872:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):83:83 -> a
-    872:872:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
-    873:933:java.util.Map computeActualEquivalences(java.util.Collection,java.util.Map,com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):553:613 -> a
-    934:934:java.util.List lambda$computeActualEquivalences$17(java.lang.String):571:571 -> a
-    935:943:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):580:588 -> a
-    944:952:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):585:593 -> a
-    953:954:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):823:824 -> a
-    953:954:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):702 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    953:954:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):592 -> a
-    955:955:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):703:703 -> a
+    846:846:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    846:846:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82 -> a
+    846:846:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
+    847:852:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82:87 -> a
+    847:852:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
+    853:858:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createAnnotationSynthesizedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexItemFactory):393:398 -> a
+    853:858:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):87 -> a
+    853:858:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
+    859:859:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):86:86 -> a
+    859:859:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
+    860:873:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):183:196 -> a
+    860:873:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):86 -> a
+    860:873:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
+    874:874:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):83:83 -> a
+    874:874:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
+    875:935:java.util.Map computeActualEquivalences(java.util.Collection,java.util.Map,com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):553:613 -> a
+    936:936:java.util.List lambda$computeActualEquivalences$17(java.lang.String):571:571 -> a
+    937:945:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):580:588 -> a
+    946:954:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):585:593 -> a
+    955:955:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):702:702 -> a
     955:955:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):592 -> a
     956:957:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):823:824 -> a
-    956:957:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):704 -> a
+    956:957:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):702 -> a
     956:957:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):592 -> a
-    958:958:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):704:704 -> a
+    958:958:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):703:703 -> a
     958:958:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):592 -> a
-    959:963:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):594:598 -> a
-    964:977:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):597:610 -> a
-    978:978:int lambda$computeActualEquivalences$19(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):581:581 -> a
-    979:980:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):823:824 -> a
-    979:980:int lambda$computeActualEquivalences$19(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):581 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    981:984:boolean lambda$computeActualEquivalences$20(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):606:609 -> a
-    985:985:void lambda$computeActualEquivalences$23(com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):615:615 -> a
-    986:986:void lambda$computeActualEquivalences$22(com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticDefinition):616:616 -> a
-    987:989:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):625:627 -> a
-    987:989:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):558 -> a
-    990:1007:boolean isPinned(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticDefinition):673:690 -> a
-    990:1007:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):628 -> a
-    990:1007:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):558 -> a
-    1008:1014:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):630:636 -> a
-    1008:1014:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):558 -> a
-    1015:1015:boolean com.android.tools.r8.synthesis.SyntheticDefinition.isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):96:96 -> a
-    1015:1015:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):631 -> a
-    1015:1015:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):558 -> a
-    1016:1039:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):638:661 -> a
-    1016:1039:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):558 -> a
-    1040:1051:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):559:570 -> a
-    1052:1055:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):569:572 -> a
-    1056:1066:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView,java.util.function.Predicate):714:724 -> a
-    1067:1076:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView,java.util.function.Predicate):723:732 -> a
-    1077:1077:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):309:309 -> a
-    1077:1077:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView,java.util.function.Predicate):732 -> a
-    1078:1078:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView,java.util.function.Predicate):733:733 -> a
-    1079:1105:java.util.Collection computePotentialEquivalences(java.util.Map,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):749:775 -> a
-    1106:1107:void lambda$computePotentialEquivalences$25(java.util.Set,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):764:765 -> a
-    1108:1108:com.android.tools.r8.graph.DexType lambda$computePotentialEquivalences$26(java.util.Set,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):768:768 -> a
-    1109:1109:java.util.List lambda$computePotentialEquivalences$27(com.android.tools.r8.com.google.common.hash.HashCode):773:773 -> a
-    1110:1123:java.util.Map lookupDefinitions(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap):781:794 -> a
+    959:960:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):823:824 -> a
+    959:960:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):704 -> a
+    959:960:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):592 -> a
+    961:961:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):704:704 -> a
+    961:961:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):592 -> a
+    962:966:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):594:598 -> a
+    967:980:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):597:610 -> a
+    981:981:int lambda$computeActualEquivalences$19(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):581:581 -> a
+    982:983:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):823:824 -> a
+    982:983:int lambda$computeActualEquivalences$19(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):581 -> a
+    984:987:boolean lambda$computeActualEquivalences$20(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):606:609 -> a
+    988:988:void lambda$computeActualEquivalences$23(com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):615:615 -> a
+    989:989:void lambda$computeActualEquivalences$22(com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticDefinition):616:616 -> a
+    990:992:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):625:627 -> a
+    990:992:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):558 -> a
+    993:1010:boolean isPinned(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticDefinition):673:690 -> a
+    993:1010:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):628 -> a
+    993:1010:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):558 -> a
+    1011:1017:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):630:636 -> a
+    1011:1017:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):558 -> a
+    1018:1018:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):631:631 -> a
+    1018:1018:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):558 -> a
+    1019:1019:boolean com.android.tools.r8.synthesis.SyntheticDefinition.isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):96:96 -> a
+    1019:1019:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):631 -> a
+    1019:1019:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):558 -> a
+    1020:1043:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):638:661 -> a
+    1020:1043:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):558 -> a
+    1044:1055:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):559:570 -> a
+    1056:1059:void lambda$computeActualEquivalences$18(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):569:572 -> a
+    1060:1070:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView,java.util.function.Predicate):714:724 -> a
+    1071:1080:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView,java.util.function.Predicate):723:732 -> a
+    1081:1081:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):309:309 -> a
+    1081:1081:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView,java.util.function.Predicate):732 -> a
+    1082:1082:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView,java.util.function.Predicate):733:733 -> a
+    1083:1109:java.util.Collection computePotentialEquivalences(java.util.Map,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):749:775 -> a
+    1110:1111:void lambda$computePotentialEquivalences$25(java.util.Set,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):764:765 -> a
+    1112:1112:com.android.tools.r8.graph.DexType lambda$computePotentialEquivalences$26(java.util.Set,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):768:768 -> a
+    1113:1113:java.util.List lambda$computePotentialEquivalences$27(com.android.tools.r8.com.google.common.hash.HashCode):773:773 -> a
+    1114:1127:java.util.Map lookupDefinitions(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap):781:794 -> a
     1:14:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):180:193 -> b
     15:15:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):189:189 -> b
     16:25:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):186:195 -> b
@@ -114776,21 +113574,18 @@
     39:41:void lambda$buildLensAndProgram$13(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):474:476 -> b
     42:42:boolean com.android.tools.r8.graph.MethodCollection.hasDirectMethods():66:66 -> b
     42:42:void lambda$buildLensAndProgram$13(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):476 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     43:51:void lambda$buildLensAndProgram$13(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):476:484 -> b
     52:52:void lambda$buildLensAndProgram$13(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):479:479 -> b
     53:53:com.android.tools.r8.ir.code.NumberGenerator lambda$createExternalType$24(java.lang.String):719:719 -> b
     1:4:void finalizeWithLiveness(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):201:204 -> c
     5:5:com.android.tools.r8.graph.DexApplication com.android.tools.r8.synthesis.CommittedItems.getApplication():50:50 -> c
     5:5:void finalizeWithLiveness(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):204 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void finalizeWithLiveness(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):204:204 -> c
     7:7:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):738:738 -> c
     7:7:void finalizeWithLiveness(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):204 -> c
     8:8:void finalizeWithLiveness(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):206:206 -> c
     9:9:com.android.tools.r8.graph.DexApplication com.android.tools.r8.synthesis.CommittedItems.getApplication():50:50 -> c
     9:9:void finalizeWithLiveness(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):206 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:13:void finalizeWithLiveness(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):206:209 -> c
 com.android.tools.r8.synthesis.SyntheticFinalization$1 -> com.android.tools.r8.synthesis.l:
     com.android.tools.r8.synthesis.SyntheticFinalization$Builder val$lensBuilder -> f
@@ -114851,7 +113646,7 @@
     1788:1788:java.lang.String toString():893:893 -> toString
     1789:1789:java.lang.String toString():893:893 -> toString
     1786:1786:java.lang.String toString():893:893 -> toString
-com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.UY:
+com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.lX:
     com.android.tools.r8.synthesis.CommittedItems commit -> a
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens lens -> b
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> d
@@ -114860,7 +113655,7 @@
 com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens -> com.android.tools.r8.synthesis.o:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$1):83:83 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map):90:90 -> <init>
-com.android.tools.r8.synthesis.SyntheticItems -> com.android.tools.r8.synthesis.s:
+com.android.tools.r8.synthesis.SyntheticItems -> com.android.tools.r8.synthesis.r:
     com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics pending -> c
     int nextSyntheticId -> a
     com.android.tools.r8.synthesis.CommittedSyntheticsCollection committed -> b
@@ -114869,356 +113664,364 @@
     1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems):113:113 -> <init>
     2:2:void <init>(int,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):116:116 -> <init>
     3:23:void <init>(int,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):98:118 -> <init>
-    void lambda$ensureFixedClasspathClassFromType$6(com.android.tools.r8.graph.DexClasspathClass) -> a
-    1:1:com.android.tools.r8.synthesis.SyntheticItems empty():102:102 -> a
-    2:6:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):123:127 -> a
-    7:7:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builder():166:166 -> a
-    7:7:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):127 -> a
-    8:15:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):129:136 -> a
-    16:18:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):135:137 -> a
-    19:19:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
-    19:19:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):139 -> a
-    20:20:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):139:139 -> a
-    21:21:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    21:21:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):143 -> a
-    22:22:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):143:143 -> a
-    23:37:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):140:154 -> a
-    38:38:com.android.tools.r8.synthesis.SyntheticProgramClassReference com.android.tools.r8.synthesis.SyntheticProgramClassDefinition.toReference():46:46 -> a
-    38:38:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder.addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):51 -> a
-    38:38:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):153 -> a
-    39:39:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder.addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):51:51 -> a
-    39:39:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):153 -> a
-    40:54:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):157:171 -> a
-    55:57:void lambda$collectSyntheticInputs$0(com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.graph.ProgramMethod):150:150 -> a
-    58:58:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder.addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):65:65 -> a
-    58:58:void lambda$collectSyntheticInputs$0(com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.graph.ProgramMethod):150 -> a
-    59:64:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):181:186 -> a
-    65:65:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    65:65:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):186 -> a
-    66:70:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):186:190 -> a
-    71:71:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":266,"2":267,"3":268,"4":269,"5":270}}
-    266:266:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:190 -> a
-    267:267:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:190 -> a
-    268:268:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:190 -> a
-    269:269:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:190 -> a
-    270:270:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:190 -> a
-    261:265:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:194 -> a
-    271:271:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234:234 -> a
-    272:272:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
-    272:272:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234 -> a
-    273:273:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
-    273:273:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
-    273:273:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234 -> a
-    274:275:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234:235 -> a
-    276:276:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):226:226 -> a
-    276:276:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):239 -> a
-    276:276:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
-    277:278:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):242:243 -> a
-    277:278:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
-    279:281:int com.android.tools.r8.com.google.common.collect.Iterables.size(java.lang.Iterable):124:126 -> a
-    279:281:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):244 -> a
-    279:281:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
-    282:286:int com.android.tools.r8.com.google.common.collect.Iterators.size(java.util.Iterator):163:167 -> a
-    282:286:int com.android.tools.r8.com.google.common.collect.Iterables.size(java.lang.Iterable):126 -> a
-    282:286:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):244 -> a
-    282:286:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
-    287:294:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):244:251 -> a
-    287:294:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
-    295:295:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256:256 -> a
-    296:296:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
-    296:296:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256 -> a
-    297:297:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
-    297:297:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
-    297:297:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256 -> a
-    298:298:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256:256 -> a
-    299:299:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273:273 -> a
-    299:299:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):257 -> a
-    300:300:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):206:206 -> a
-    300:300:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273 -> a
-    300:300:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):257 -> a
-    301:301:boolean isSyntheticOfKind(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):269:269 -> a
-    302:313:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):278:289 -> a
-    314:317:boolean verifyAllHaveSameFeature(java.util.List,java.util.function.Function):295:298 -> a
-    314:317:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):289 -> a
-    318:318:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):290:290 -> a
-    319:324:void forEachSynthesizingContext(com.android.tools.r8.graph.DexType,java.util.function.Consumer):304:309 -> a
-    319:324:void lambda$getSynthesizingContexts$1(com.android.tools.r8.graph.DexType,java.util.function.Consumer):314 -> a
-    325:326:java.util.Collection getSynthesizingContextTypes(com.android.tools.r8.graph.DexType):318:319 -> a
-    327:332:void forEachSynthesizingContext(com.android.tools.r8.graph.DexType,java.util.function.Consumer):304:309 -> a
-    327:332:java.util.Collection getSynthesizingContextTypes(com.android.tools.r8.graph.DexType):319 -> a
-    333:333:java.util.Collection getSynthesizingContextTypes(com.android.tools.r8.graph.DexType):321:321 -> a
-    334:334:void lambda$getSynthesizingContextTypes$2(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.synthesis.SynthesizingContext):320:320 -> a
-    335:335:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327:327 -> a
-    336:336:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
-    336:336:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327 -> a
-    337:337:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
-    337:337:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
-    337:337:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327 -> a
-    338:339:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327:328 -> a
-    340:340:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod) -> a
-    341:342:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):339:340 -> a
-    343:343:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):713:713 -> a
-    343:343:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):340 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    344:352:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):340:348 -> a
-    353:356:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):359:362 -> a
-    357:357:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    357:357:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):362 -> a
-    358:358:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):364:364 -> a
-    359:359:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    359:359:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):364 -> a
-    360:362:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):365:367 -> a
-    363:363:boolean lambda$verifySyntheticLambdaProperty$3(com.android.tools.r8.synthesis.SyntheticReference):364:364 -> a
-    364:364:int lambda$getSynthesizingContext$4(com.android.tools.r8.synthesis.SyntheticReference,com.android.tools.r8.synthesis.SyntheticReference):393:393 -> a
-    365:372:com.android.tools.r8.graph.DexProgramClass addSyntheticClassWithLibraryContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.function.Consumer):408:415 -> a
-    373:373:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):744:744 -> a
-    373:373:com.android.tools.r8.graph.DexProgramClass addSyntheticClassWithLibraryContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.function.Consumer):415 -> a
-    374:387:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):430:443 -> a
-    388:388:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):441:441 -> a
-    389:389:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):577:577 -> a
-    389:389:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):441 -> a
-    390:390:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    390:390:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):579 -> a
-    390:390:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):441 -> a
-    391:391:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):579:579 -> a
-    391:391:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):441 -> a
-    392:392:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):578:578 -> a
-    392:392:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):441 -> a
-    393:393:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
-    393:393:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):581 -> a
-    393:393:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):441 -> a
-    394:395:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):581:582 -> a
-    394:395:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):441 -> a
-    396:396:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):445:445 -> a
-    397:397:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
-    397:397:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):445 -> a
-    398:408:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):445:455 -> a
-    409:413:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):467:471 -> a
-    409:413:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):447 -> a
-    414:414:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):744:744 -> a
-    414:414:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):471 -> a
-    414:414:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):447 -> a
-    415:417:com.android.tools.r8.graph.DexProgramClass internalEnsureDexProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):456:458 -> a
-    418:419:void lambda$internalEnsureDexProgramClass$5(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):450:451 -> a
-    420:420:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):482:482 -> a
-    421:421:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
-    421:421:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):482 -> a
-    422:422:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
-    422:422:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):482 -> a
-    423:423:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):485:485 -> a
-    424:426:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):484:486 -> a
-    427:431:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):467:471 -> a
-    427:431:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):486 -> a
-    432:432:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):744:744 -> a
-    432:432:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):471 -> a
-    432:432:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):486 -> a
-    433:433:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):502:502 -> a
-    434:435:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):515:516 -> a
-    434:435:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):503 -> a
-    436:436:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
-    436:436:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):516 -> a
-    436:436:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):503 -> a
-    437:437:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
-    437:437:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):516 -> a
-    437:437:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):503 -> a
-    438:438:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):517:517 -> a
-    438:438:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):503 -> a
-    439:441:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):504:506 -> a
-    442:442:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
-    442:442:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):507 -> a
-    443:445:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):507:509 -> a
-    446:447:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):515:516 -> a
-    446:447:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):495 -> a
-    448:448:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
-    448:448:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):516 -> a
-    448:448:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):495 -> a
-    449:449:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
-    449:449:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):516 -> a
-    449:449:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):495 -> a
-    450:450:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):517:517 -> a
-    450:450:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):495 -> a
-    451:452:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):496:497 -> a
-    453:457:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):467:471 -> a
-    453:457:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):497 -> a
-    458:458:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):744:744 -> a
-    458:458:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):471 -> a
-    458:458:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):497 -> a
-    459:459:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):531:531 -> a
-    460:461:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):515:516 -> a
-    460:461:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):532 -> a
-    462:462:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
-    462:462:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):516 -> a
-    462:462:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):532 -> a
-    463:463:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
-    463:463:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):516 -> a
-    463:463:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):532 -> a
-    464:464:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):517:517 -> a
-    464:464:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):532 -> a
-    465:466:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):533:534 -> a
-    467:467:com.android.tools.r8.graph.ProgramMethod ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):567:567 -> a
-    468:470:com.android.tools.r8.graph.ProgramMethod ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):566:568 -> a
-    471:485:com.android.tools.r8.graph.DexEncodedMethod internalEnsureMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):679:693 -> a
-    471:485:com.android.tools.r8.graph.ProgramMethod ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):570 -> a
-    486:486:com.android.tools.r8.graph.ProgramMethod ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):572:572 -> a
-    487:487:com.android.tools.r8.graph.DexEncodedMethod internalEnsureMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):694:694 -> a
-    487:487:com.android.tools.r8.graph.ProgramMethod ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):570 -> a
-    488:490:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):622:624 -> a
-    491:492:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):599:600 -> a
-    491:492:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    493:493:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    493:493:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):602 -> a
-    493:493:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    494:494:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):605:605 -> a
-    494:494:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    495:495:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603:603 -> a
-    495:495:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    496:496:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):577:577 -> a
-    496:496:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    496:496:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    497:497:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    497:497:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):579 -> a
-    497:497:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    497:497:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    498:498:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):579:579 -> a
-    498:498:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    498:498:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    499:499:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):578:578 -> a
-    499:499:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    499:499:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    500:500:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
-    500:500:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):581 -> a
-    500:500:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    500:500:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    501:502:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):581:582 -> a
-    501:502:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    501:502:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    503:507:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):607:611 -> a
-    503:507:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    508:508:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):744:744 -> a
-    508:508:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):611 -> a
-    508:508:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    509:511:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):612:614 -> a
-    509:511:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):624 -> a
-    512:513:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):636:637 -> a
-    514:515:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):599:600 -> a
-    514:515:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    516:516:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    516:516:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):602 -> a
-    516:516:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    517:517:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):605:605 -> a
-    517:517:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    518:518:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603:603 -> a
-    518:518:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    519:519:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):577:577 -> a
-    519:519:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    519:519:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    520:520:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    520:520:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):579 -> a
-    520:520:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    520:520:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    521:521:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):579:579 -> a
-    521:521:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    521:521:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    522:522:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):578:578 -> a
-    522:522:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    522:522:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    523:523:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
-    523:523:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):581 -> a
-    523:523:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    523:523:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    524:525:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):581:582 -> a
-    524:525:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):603 -> a
-    524:525:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    526:530:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):607:611 -> a
-    526:530:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    531:531:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):744:744 -> a
-    531:531:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):611 -> a
-    531:531:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    532:534:com.android.tools.r8.graph.DexClasspathClass internalEnsureDexClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):612:614 -> a
-    532:534:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):638 -> a
-    535:550:com.android.tools.r8.graph.DexClassAndMethod ensureFixedClasspathClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):652:667 -> a
-    551:565:com.android.tools.r8.graph.DexEncodedMethod internalEnsureMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):679:693 -> a
-    551:565:com.android.tools.r8.graph.DexClassAndMethod ensureFixedClasspathClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):657 -> a
-    566:566:com.android.tools.r8.graph.DexClassAndMethod ensureFixedClasspathClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):668:668 -> a
-    567:567:com.android.tools.r8.graph.DexEncodedMethod internalEnsureMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):694:694 -> a
-    567:567:com.android.tools.r8.graph.DexClassAndMethod ensureFixedClasspathClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):657 -> a
-    568:568:void lambda$ensureFixedClasspathClassMethod$7(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):665:665 -> a
-    569:571:com.android.tools.r8.graph.DexProgramClass ensureFixedClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):705:707 -> a
-    572:572:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    572:572:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):381 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    573:581:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):382:390 -> a
-    582:583:java.lang.Object com.android.tools.r8.utils.IterableUtils.min(java.lang.Iterable,java.util.Comparator):101:102 -> a
-    582:583:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):390 -> a
-    584:591:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):390:397 -> a
-    592:592:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    592:592:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
-    592:592:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):397 -> a
-    593:593:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
-    593:593:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):397 -> a
-    594:594:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):398:398 -> a
-    595:595:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):725:725 -> a
-    596:596:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
-    596:596:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):728 -> a
-    597:597:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
-    597:597:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):728 -> a
-    598:598:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):731:731 -> a
-    599:608:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):730:739 -> a
-    609:609:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):744:744 -> a
-    609:609:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):739 -> a
-    610:610:void lambda$createMethod$8(com.android.tools.r8.synthesis.SyntheticMethodBuilder):736:736 -> a
-    611:611:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):750:750 -> a
-    612:612:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):754:754 -> a
-    612:612:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):750 -> a
-    613:613:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):754:754 -> a
-    614:616:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):759:761 -> a
-    617:617:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):760:760 -> a
-    618:620:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):769:771 -> a
-    621:621:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builder():166:166 -> a
-    621:621:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):771 -> a
-    622:634:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):775:787 -> a
-    635:640:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):786:791 -> a
-    641:641:boolean com.android.tools.r8.graph.DexApplication$Builder.isDirect():0:0 -> a
-    641:641:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):791 -> a
-    642:643:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):792:793 -> a
-    644:644:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    644:644:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16 -> a
-    644:644:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):793 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    645:645:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16:16 -> a
-    645:645:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):793 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    646:657:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):793:804 -> a
-    658:658:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):810:810 -> a
-    659:659:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    659:659:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):810 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    660:667:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):813:820 -> a
-    668:668:void com.android.tools.r8.synthesis.SyntheticMarker.writeMarkerAttribute(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):33:33 -> a
-    668:668:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):821 -> a
+    1:415:com.android.tools.r8.graph.DexProgramClass addSyntheticClassWithLibraryContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.function.Consumer):0:414 -> a
+    416:417:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():35:36 -> a
+    416:417:com.android.tools.r8.graph.DexProgramClass addSyntheticClassWithLibraryContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.function.Consumer):414 -> a
+    418:419:boolean com.android.tools.r8.synthesis.SyntheticMarker.isDefinitelyNotSyntheticProgramClass(com.android.tools.r8.graph.DexProgramClass):143:144 -> a
+    418:419:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():36 -> a
+    418:419:com.android.tools.r8.graph.DexProgramClass addSyntheticClassWithLibraryContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.function.Consumer):414 -> a
+    420:420:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():36:36 -> a
+    420:420:com.android.tools.r8.graph.DexProgramClass addSyntheticClassWithLibraryContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.function.Consumer):414 -> a
+    421:421:com.android.tools.r8.graph.DexProgramClass addSyntheticClassWithLibraryContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.function.Consumer):415:415 -> a
+    422:422:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):773:773 -> a
+    422:422:com.android.tools.r8.graph.DexProgramClass addSyntheticClassWithLibraryContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.function.Consumer):415 -> a
+    void lambda$ensureFixedClasspathClassFromType$10(com.android.tools.r8.graph.DexClasspathClass) -> a
+    423:423:com.android.tools.r8.synthesis.SyntheticItems empty():102:102 -> a
+    424:428:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):123:127 -> a
+    429:429:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builder():166:166 -> a
+    429:429:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):127 -> a
+    430:437:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):129:136 -> a
+    438:440:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):135:137 -> a
+    441:441:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
+    441:441:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):139 -> a
+    442:442:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):139:139 -> a
+    443:443:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    443:443:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):143 -> a
+    444:444:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):143:143 -> a
+    445:459:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):140:154 -> a
+    460:460:com.android.tools.r8.synthesis.SyntheticProgramClassReference com.android.tools.r8.synthesis.SyntheticProgramClassDefinition.toReference():46:46 -> a
+    460:460:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder.addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):51 -> a
+    460:460:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):153 -> a
+    461:461:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder.addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):51:51 -> a
+    461:461:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):153 -> a
+    462:476:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):157:171 -> a
+    477:479:void lambda$collectSyntheticInputs$0(com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.graph.ProgramMethod):150:150 -> a
+    480:480:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder.addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):65:65 -> a
+    480:480:void lambda$collectSyntheticInputs$0(com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.graph.ProgramMethod):150 -> a
+    481:486:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):181:186 -> a
+    487:487:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    487:487:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):186 -> a
+    488:492:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):186:190 -> a
+    493:493:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":688,"2":689,"3":690,"4":691,"5":692}}
+    688:688:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:190 -> a
+    689:689:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:190 -> a
+    690:690:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:190 -> a
+    691:691:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:190 -> a
+    692:692:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:190 -> a
+    683:687:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):190:194 -> a
+    693:693:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234:234 -> a
+    694:694:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
+    694:694:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234 -> a
+    695:695:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    695:695:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
+    695:695:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234 -> a
+    696:697:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234:235 -> a
+    698:698:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):226:226 -> a
+    698:698:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):239 -> a
+    698:698:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
+    699:700:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):242:243 -> a
+    699:700:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
+    701:703:int com.android.tools.r8.com.google.common.collect.Iterables.size(java.lang.Iterable):124:126 -> a
+    701:703:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):244 -> a
+    701:703:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
+    704:708:int com.android.tools.r8.com.google.common.collect.Iterators.size(java.util.Iterator):163:167 -> a
+    704:708:int com.android.tools.r8.com.google.common.collect.Iterables.size(java.lang.Iterable):126 -> a
+    704:708:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):244 -> a
+    704:708:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
+    709:716:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):244:251 -> a
+    709:716:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
+    717:717:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256:256 -> a
+    718:718:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
+    718:718:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256 -> a
+    719:719:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    719:719:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
+    719:719:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256 -> a
+    720:720:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256:256 -> a
+    721:721:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273:273 -> a
+    721:721:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):257 -> a
+    722:722:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):206:206 -> a
+    722:722:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273 -> a
+    722:722:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):257 -> a
+    723:723:boolean isSyntheticOfKind(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):269:269 -> a
+    724:735:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):278:289 -> a
+    736:739:boolean verifyAllHaveSameFeature(java.util.List,java.util.function.Function):295:298 -> a
+    736:739:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):289 -> a
+    740:740:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):290:290 -> a
+    741:746:void forEachSynthesizingContext(com.android.tools.r8.graph.DexType,java.util.function.Consumer):304:309 -> a
+    741:746:void lambda$getSynthesizingContexts$1(com.android.tools.r8.graph.DexType,java.util.function.Consumer):314 -> a
+    747:748:java.util.Collection getSynthesizingContextTypes(com.android.tools.r8.graph.DexType):318:319 -> a
+    749:754:void forEachSynthesizingContext(com.android.tools.r8.graph.DexType,java.util.function.Consumer):304:309 -> a
+    749:754:java.util.Collection getSynthesizingContextTypes(com.android.tools.r8.graph.DexType):319 -> a
+    755:755:java.util.Collection getSynthesizingContextTypes(com.android.tools.r8.graph.DexType):321:321 -> a
+    756:756:void lambda$getSynthesizingContextTypes$2(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.synthesis.SynthesizingContext):320:320 -> a
+    757:757:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327:327 -> a
+    758:758:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
+    758:758:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327 -> a
+    759:759:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    759:759:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
+    759:759:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327 -> a
+    760:761:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327:328 -> a
+    762:762:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):340:340 -> a
+    763:764:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):339:340 -> a
+    765:765:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):713:713 -> a
+    765:765:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):340 -> a
+    766:774:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):340:348 -> a
+    775:778:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):359:362 -> a
+    779:779:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
+    779:779:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):362 -> a
+    780:780:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):364:364 -> a
+    781:781:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
+    781:781:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):364 -> a
+    782:784:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):365:367 -> a
+    785:785:boolean lambda$verifySyntheticLambdaProperty$3(com.android.tools.r8.synthesis.SyntheticReference):364:364 -> a
+    786:786:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):381:381 -> a
+    787:787:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
+    787:787:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):381 -> a
+    788:796:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):382:390 -> a
+    797:798:java.lang.Object com.android.tools.r8.utils.IterableUtils.min(java.lang.Iterable,java.util.Comparator):101:102 -> a
+    797:798:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):390 -> a
+    799:806:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):390:397 -> a
+    807:807:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
+    807:807:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
+    807:807:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):397 -> a
+    808:808:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    808:808:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):397 -> a
+    809:809:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):398:398 -> a
+    810:810:int lambda$getSynthesizingContext$4(com.android.tools.r8.synthesis.SyntheticReference,com.android.tools.r8.synthesis.SyntheticReference):393:393 -> a
+    811:812:void lambda$internalEnsureFixedProgramClass$6(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):452:453 -> a
+    813:813:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):508:508 -> a
+    814:814:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
+    814:814:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):508 -> a
+    815:815:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
+    815:815:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):508 -> a
+    816:821:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):509:514 -> a
+    822:824:void registerSyntheticTypeRewriting(com.android.tools.r8.synthesis.SynthesizingContext,java.util.function.Function,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):485:487 -> a
+    822:824:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):471 -> a
+    822:824:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):513 -> a
+    825:832:void registerSyntheticTypeRewriting(com.android.tools.r8.synthesis.SynthesizingContext,java.util.function.Function,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):486:493 -> a
+    825:832:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):471 -> a
+    825:832:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):513 -> a
+    833:835:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):472:474 -> a
+    833:835:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):513 -> a
+    836:837:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():35:36 -> a
+    836:837:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):475 -> a
+    836:837:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):513 -> a
+    838:839:boolean com.android.tools.r8.synthesis.SyntheticMarker.isDefinitelyNotSyntheticProgramClass(com.android.tools.r8.graph.DexProgramClass):143:144 -> a
+    838:839:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():36 -> a
+    838:839:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):475 -> a
+    838:839:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):513 -> a
+    840:840:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():36:36 -> a
+    840:840:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):475 -> a
+    840:840:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):513 -> a
+    841:841:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):476:476 -> a
+    841:841:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):513 -> a
+    842:842:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):773:773 -> a
+    842:842:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):476 -> a
+    842:842:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):513 -> a
+    843:843:com.android.tools.r8.graph.DexType lambda$createClass$7(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SynthesizingContext):512:512 -> a
+    844:844:com.android.tools.r8.graph.DexType lambda$createClass$7(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SynthesizingContext):511:511 -> a
+    845:845:com.android.tools.r8.graph.DexType lambda$createFixedClass$8(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SynthesizingContext):525:525 -> a
+    846:846:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):532:532 -> a
+    847:848:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):545:546 -> a
+    847:848:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):533 -> a
+    849:849:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
+    849:849:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):546 -> a
+    849:849:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):533 -> a
+    850:850:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
+    850:850:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):546 -> a
+    850:850:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):533 -> a
+    851:851:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):547:547 -> a
+    851:851:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):533 -> a
+    852:854:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):534:536 -> a
+    855:855:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    855:855:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):537 -> a
+    856:858:com.android.tools.r8.graph.DexProgramClass getExistingFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):537:539 -> a
+    859:860:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):545:546 -> a
+    859:860:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):523 -> a
+    861:861:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
+    861:861:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):546 -> a
+    861:861:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):523 -> a
+    862:862:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
+    862:862:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):546 -> a
+    862:862:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):523 -> a
+    863:863:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):547:547 -> a
+    863:863:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):523 -> a
+    864:867:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):524:527 -> a
+    868:870:void registerSyntheticTypeRewriting(com.android.tools.r8.synthesis.SynthesizingContext,java.util.function.Function,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):485:487 -> a
+    868:870:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):471 -> a
+    868:870:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):526 -> a
+    871:878:void registerSyntheticTypeRewriting(com.android.tools.r8.synthesis.SynthesizingContext,java.util.function.Function,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):486:493 -> a
+    871:878:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):471 -> a
+    871:878:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):526 -> a
+    879:881:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):472:474 -> a
+    879:881:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):526 -> a
+    882:883:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():35:36 -> a
+    882:883:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):475 -> a
+    882:883:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):526 -> a
+    884:885:boolean com.android.tools.r8.synthesis.SyntheticMarker.isDefinitelyNotSyntheticProgramClass(com.android.tools.r8.graph.DexProgramClass):143:144 -> a
+    884:885:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():36 -> a
+    884:885:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):475 -> a
+    884:885:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):526 -> a
+    886:886:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():36:36 -> a
+    886:886:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):475 -> a
+    886:886:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):526 -> a
+    887:887:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):476:476 -> a
+    887:887:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):526 -> a
+    888:888:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):773:773 -> a
+    888:888:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):476 -> a
+    888:888:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):526 -> a
+    889:889:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):561:561 -> a
+    890:891:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):545:546 -> a
+    890:891:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):562 -> a
+    892:892:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
+    892:892:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):546 -> a
+    892:892:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):562 -> a
+    893:893:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
+    893:893:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):546 -> a
+    893:893:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):562 -> a
+    894:894:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):547:547 -> a
+    894:894:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):562 -> a
+    895:895:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):563:563 -> a
+    896:896:com.android.tools.r8.graph.ProgramMethod ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):596:596 -> a
+    897:899:com.android.tools.r8.graph.ProgramMethod ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):595:597 -> a
+    900:914:com.android.tools.r8.graph.DexEncodedMethod internalEnsureMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):709:723 -> a
+    900:914:com.android.tools.r8.graph.ProgramMethod ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):599 -> a
+    915:915:com.android.tools.r8.graph.ProgramMethod ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):601:601 -> a
+    916:916:com.android.tools.r8.graph.DexEncodedMethod internalEnsureMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):724:724 -> a
+    916:916:com.android.tools.r8.graph.ProgramMethod ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):599 -> a
+    917:917:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):606:606 -> a
+    918:918:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    918:918:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):608 -> a
+    919:919:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):608:608 -> a
+    920:923:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):607:610 -> a
+    924:924:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
+    924:924:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):610 -> a
+    925:925:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1537,"2":1538,"3":1539}}
+    1537:1537:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):610:610 -> a
+    1538:1538:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):610:610 -> a
+    1539:1539:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):610:610 -> a
+    1535:1536:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):610:611 -> a
+    1540:1544:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):627:631 -> a
+    1545:1545:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    1545:1545:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):633 -> a
+    1546:1546:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):636:636 -> a
+    1547:1547:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):634:634 -> a
+    1548:1550:void registerSyntheticTypeRewriting(com.android.tools.r8.synthesis.SynthesizingContext,java.util.function.Function,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):485:487 -> a
+    1548:1550:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):638 -> a
+    1551:1558:void registerSyntheticTypeRewriting(com.android.tools.r8.synthesis.SynthesizingContext,java.util.function.Function,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):486:493 -> a
+    1551:1558:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):638 -> a
+    1559:1563:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):639:643 -> a
+    1564:1564:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):773:773 -> a
+    1564:1564:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):643 -> a
+    1565:1567:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):644:646 -> a
+    1568:1569:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer):654:655 -> a
+    1570:1571:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):667:668 -> a
+    1572:1573:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):667:668 -> a
+    1572:1573:com.android.tools.r8.graph.DexClassAndMethod ensureFixedClasspathClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):682 -> a
+    1574:1586:com.android.tools.r8.graph.DexClassAndMethod ensureFixedClasspathClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):685:697 -> a
+    1587:1601:com.android.tools.r8.graph.DexEncodedMethod internalEnsureMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):709:723 -> a
+    1587:1601:com.android.tools.r8.graph.DexClassAndMethod ensureFixedClasspathClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):687 -> a
+    1602:1602:com.android.tools.r8.graph.DexClassAndMethod ensureFixedClasspathClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):698:698 -> a
+    1603:1603:com.android.tools.r8.graph.DexEncodedMethod internalEnsureMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):724:724 -> a
+    1603:1603:com.android.tools.r8.graph.DexClassAndMethod ensureFixedClasspathClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):687 -> a
+    1604:1604:void lambda$ensureFixedClasspathClassMethod$11(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):695:695 -> a
+    1605:1606:com.android.tools.r8.graph.DexProgramClass ensureFixedClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):735:736 -> a
+    1607:1607:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):754:754 -> a
+    1608:1608:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
+    1608:1608:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):757 -> a
+    1609:1609:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
+    1609:1609:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):757 -> a
+    1610:1610:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):760:760 -> a
+    1611:1618:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):759:766 -> a
+    1619:1620:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():35:36 -> a
+    1619:1620:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):766 -> a
+    1621:1622:boolean com.android.tools.r8.synthesis.SyntheticMarker.isDefinitelyNotSyntheticProgramClass(com.android.tools.r8.graph.DexProgramClass):143:144 -> a
+    1621:1622:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():36 -> a
+    1621:1622:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):766 -> a
+    1623:1623:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():36:36 -> a
+    1623:1623:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):766 -> a
+    1624:1625:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):767:768 -> a
+    1626:1626:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):773:773 -> a
+    1626:1626:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):768 -> a
+    1627:1627:void lambda$createMethod$12(com.android.tools.r8.synthesis.SyntheticMethodBuilder):765:765 -> a
+    1628:1628:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):779:779 -> a
+    1629:1629:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):783:783 -> a
+    1629:1629:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):779 -> a
+    1630:1630:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):783:783 -> a
+    1631:1633:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):788:790 -> a
+    1634:1634:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):789:789 -> a
+    1635:1637:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):798:800 -> a
+    1638:1638:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builder():166:166 -> a
+    1638:1638:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):800 -> a
+    1639:1651:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):804:816 -> a
+    1652:1657:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):815:820 -> a
+    1658:1658:boolean com.android.tools.r8.graph.DexApplication$Builder.isDirect():0:0 -> a
+    1658:1658:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):820 -> a
+    1659:1660:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):821:822 -> a
+    1661:1661:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
+    1661:1661:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16 -> a
+    1661:1661:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):822 -> a
+    1662:1662:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16:16 -> a
+    1662:1662:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):822 -> a
+    1663:1674:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):822:833 -> a
+    1675:1675:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):839:839 -> a
+    1676:1676:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    1676:1676:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):839 -> a
+    1677:1684:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):842:849 -> a
+    1685:1685:void com.android.tools.r8.synthesis.SyntheticMarker.writeMarkerAttribute(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):33:33 -> a
+    1685:1685:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):850 -> a
     1:2:com.android.tools.r8.synthesis.CommittedItems createInitialSyntheticItems(com.android.tools.r8.graph.DexApplication):107:108 -> b
     3:3:java.util.Collection getPendingSyntheticClasses():206:206 -> b
     4:4:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273:273 -> b
     5:5:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):206:206 -> b
     5:5:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:java.util.List getSynthesizingContexts(com.android.tools.r8.graph.DexType):314:314 -> b
-    7:7:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):716:716 -> b
-    8:10:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):828:830 -> b
+    7:24:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):428:445 -> b
+    25:29:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):443:447 -> b
+    30:30:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> b
+    30:30:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):447 -> b
+    31:32:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):447:448 -> b
+    33:35:void registerSyntheticTypeRewriting(com.android.tools.r8.synthesis.SynthesizingContext,java.util.function.Function,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):485:487 -> b
+    33:35:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):471 -> b
+    33:35:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> b
+    36:43:void registerSyntheticTypeRewriting(com.android.tools.r8.synthesis.SynthesizingContext,java.util.function.Function,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):486:493 -> b
+    36:43:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):471 -> b
+    36:43:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> b
+    44:46:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):472:474 -> b
+    44:46:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> b
+    47:48:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():35:36 -> b
+    47:48:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):475 -> b
+    47:48:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> b
+    49:50:boolean com.android.tools.r8.synthesis.SyntheticMarker.isDefinitelyNotSyntheticProgramClass(com.android.tools.r8.graph.DexProgramClass):143:144 -> b
+    49:50:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():36 -> b
+    49:50:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):475 -> b
+    49:50:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> b
+    51:51:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticProgramClassBuilder.build():36:36 -> b
+    51:51:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):475 -> b
+    51:51:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> b
+    52:52:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):476:476 -> b
+    52:52:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> b
+    53:53:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):773:773 -> b
+    53:53:com.android.tools.r8.graph.DexProgramClass internalCreateProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType,java.util.function.Function,com.android.tools.r8.graph.AppView):476 -> b
+    53:53:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> b
+    54:56:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):459:461 -> b
+    57:57:com.android.tools.r8.graph.DexType lambda$internalEnsureFixedClasspathClass$9(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SynthesizingContext):628:628 -> b
+    58:58:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):745:745 -> b
+    59:61:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):857:859 -> b
     1:1:boolean hasPendingSyntheticClasses():202:202 -> c
     2:2:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):210:210 -> c
     3:3:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsType(com.android.tools.r8.graph.DexType):176:176 -> c
     3:3:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):210 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4:4:com.android.tools.r8.graph.DexType lambda$internalEnsureFixedProgramClass$5(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SynthesizingContext):429:429 -> c
     1:1:boolean isFinalized():198:198 -> d
     2:2:boolean isNonLegacyCommittedSynthetic(com.android.tools.r8.graph.DexType):214:214 -> d
     2:2:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexType):230 -> d
     3:3:boolean isNonLegacyPendingSynthetic(com.android.tools.r8.graph.DexType):222:222 -> d
     3:3:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexType):230 -> d
     1:1:boolean isPendingSynthetic(com.android.tools.r8.graph.DexType):218:218 -> e
-com.android.tools.r8.synthesis.SyntheticItems$1 -> com.android.tools.r8.synthesis.q:
-com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics -> com.android.tools.r8.synthesis.r:
+com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics -> com.android.tools.r8.synthesis.q:
     java.util.concurrent.ConcurrentHashMap nonLegacyDefinitions -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():61:61 -> <clinit>
@@ -115228,19 +114031,19 @@
     2:2:boolean containsType(com.android.tools.r8.graph.DexType):72:72 -> a
     3:4:boolean containsTypeOfKind(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):76:77 -> a
     5:5:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):81:81 -> a
-    6:7:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.graph.GraphLens.rewriteTypes(java.util.Set):677:678 -> a
+    6:7:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.graph.GraphLens.rewriteTypes(java.util.Set):701:702 -> a
     6:7:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):81 -> a
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    8:8:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.graph.GraphLens.rewriteTypes(java.util.Set):679 -> a
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
+    8:8:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.graph.GraphLens.rewriteTypes(java.util.Set):703 -> a
     8:8:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):81 -> a
-    9:11:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.graph.GraphLens.rewriteTypes(java.util.Set):679:681 -> a
+    9:11:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.graph.GraphLens.rewriteTypes(java.util.Set):703:705 -> a
     9:11:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):81 -> a
     12:12:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):81:81 -> a
     13:19:java.util.Collection getAllProgramClasses():86:92 -> a
     1:1:boolean isEmpty():68:68 -> b
-com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle -> com.android.tools.r8.internal.YY:
+com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle -> com.android.tools.r8.internal.oX:
     java.util.Set getSynthesizingContexts(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.synthesis.SyntheticMarker -> com.android.tools.r8.synthesis.u:
+com.android.tools.r8.synthesis.SyntheticMarker -> com.android.tools.r8.synthesis.t:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> a
     com.android.tools.r8.synthesis.SyntheticMarker NO_MARKER -> c
     com.android.tools.r8.synthesis.SynthesizingContext context -> b
@@ -115254,16 +114057,16 @@
     11:13:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):96:98 -> a
     14:14:com.android.tools.r8.graph.DexType getSyntheticContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexItemFactory):149:149 -> a
     14:14:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):98 -> a
-    15:18:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):150:153 -> a
+    15:18:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):163:166 -> a
     15:18:com.android.tools.r8.graph.DexType getSyntheticContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexItemFactory):149 -> a
     15:18:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):98 -> a
-    19:24:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):152:157 -> a
+    19:24:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):165:170 -> a
     19:24:com.android.tools.r8.graph.DexType getSyntheticContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexItemFactory):149 -> a
     19:24:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):98 -> a
     25:25:com.android.tools.r8.graph.DexType getSyntheticContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexItemFactory):150:150 -> a
     25:25:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):98 -> a
     26:27:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):100:101 -> a
-    28:28:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):155:155 -> a
+    28:28:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):168:168 -> a
     28:28:com.android.tools.r8.graph.DexType getSyntheticContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexItemFactory):149 -> a
     28:28:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):98 -> a
     29:30:com.android.tools.r8.synthesis.SyntheticMarker internalStripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):112:113 -> a
@@ -115290,11 +114093,11 @@
     60:60:com.android.tools.r8.graph.DexType getSyntheticContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexItemFactory):149:149 -> a
     60:60:com.android.tools.r8.synthesis.SyntheticMarker internalStripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):136 -> a
     60:60:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):103 -> a
-    61:64:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):150:153 -> a
+    61:64:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):163:166 -> a
     61:64:com.android.tools.r8.graph.DexType getSyntheticContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexItemFactory):149 -> a
     61:64:com.android.tools.r8.synthesis.SyntheticMarker internalStripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):136 -> a
     61:64:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):103 -> a
-    65:70:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):152:157 -> a
+    65:70:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):165:170 -> a
     65:70:com.android.tools.r8.graph.DexType getSyntheticContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexItemFactory):149 -> a
     65:70:com.android.tools.r8.synthesis.SyntheticMarker internalStripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):136 -> a
     65:70:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):103 -> a
@@ -115307,7 +114110,7 @@
     77:77:boolean com.android.tools.r8.graph.DexAnnotation.hasSynthesizedClassAnnotation(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):405:405 -> a
     77:77:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):105 -> a
     78:78:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):104:104 -> a
-    79:79:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):155:155 -> a
+    79:79:java.lang.String com.android.tools.r8.synthesis.SyntheticNaming.getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):168:168 -> a
     79:79:com.android.tools.r8.graph.DexType getSyntheticContextType(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexItemFactory):149 -> a
     79:79:com.android.tools.r8.synthesis.SyntheticMarker internalStripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):136 -> a
     79:79:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):103 -> a
@@ -115316,7 +114119,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.Attribute getMarkerAttributePrototype():29:29 -> c
     1:1:boolean isSyntheticClass():168:168 -> d
     1:1:boolean isSyntheticMethods():164:164 -> e
-com.android.tools.r8.synthesis.SyntheticMarker$MarkerAttribute -> com.android.tools.r8.synthesis.t:
+com.android.tools.r8.synthesis.SyntheticMarker$MarkerAttribute -> com.android.tools.r8.synthesis.s:
     com.android.tools.r8.synthesis.SyntheticMarker$MarkerAttribute PROTOTYPE -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> d
@@ -115324,12 +114127,12 @@
     1:2:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):51:52 -> <init>
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind access$100(com.android.tools.r8.synthesis.SyntheticMarker$MarkerAttribute):44:44 -> a
     2:3:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):63:64 -> a
-    4:5:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.fromId(int):113:114 -> a
+    4:5:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.fromId(int):126:127 -> a
     4:5:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):65 -> a
     6:6:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):66:66 -> a
     7:9:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):72:74 -> a
     1:1:com.android.tools.r8.synthesis.SyntheticMarker$MarkerAttribute access$000():44:44 -> b
-com.android.tools.r8.synthesis.SyntheticMethodBuilder -> com.android.tools.r8.synthesis.v:
+com.android.tools.r8.synthesis.SyntheticMethodBuilder -> com.android.tools.r8.synthesis.u:
     com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator codeGenerator -> g
     boolean checkAndroidApiLevels -> o
     boolean $assertionsDisabled -> p
@@ -115386,9 +114189,9 @@
     1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):115:115 -> b
     2:2:com.android.tools.r8.synthesis.SyntheticMethodBuilder disableAndroidApiLevelCheck():125:125 -> b
     1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(java.lang.String):63:63 -> c
-com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.bZ:
+com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.rX:
     com.android.tools.r8.graph.Code generate(com.android.tools.r8.graph.DexMethod) -> a
-com.android.tools.r8.synthesis.SyntheticMethodDefinition -> com.android.tools.r8.synthesis.w:
+com.android.tools.r8.synthesis.SyntheticMethodDefinition -> com.android.tools.r8.synthesis.v:
     com.android.tools.r8.graph.ProgramMethod method -> d
     1:2:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.ProgramMethod):26:27 -> <init>
     1:1:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):18:18 -> a
@@ -115421,7 +114224,7 @@
     81:81:java.lang.String toString():78:78 -> toString
     82:82:java.lang.String toString():78:78 -> toString
     79:79:java.lang.String toString():78:78 -> toString
-com.android.tools.r8.synthesis.SyntheticMethodReference -> com.android.tools.r8.synthesis.x:
+com.android.tools.r8.synthesis.SyntheticMethodReference -> com.android.tools.r8.synthesis.w:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod method -> d
     1:1:void <clinit>():21:21 -> <clinit>
@@ -115431,223 +114234,223 @@
     2:9:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):21 -> a
     10:10:com.android.tools.r8.synthesis.SyntheticMethodReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):57:57 -> a
     10:10:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):21 -> a
-    11:11:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
+    11:11:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
     11:11:com.android.tools.r8.synthesis.SyntheticMethodReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):57 -> a
     11:11:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):21 -> a
     12:16:com.android.tools.r8.synthesis.SyntheticMethodReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):60:64 -> a
     12:16:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):21 -> a
-    17:17:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):209:209 -> a
+    17:17:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):222:222 -> a
     17:17:com.android.tools.r8.synthesis.SyntheticMethodReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):64 -> a
     17:17:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):21 -> a
     18:21:com.android.tools.r8.synthesis.SyntheticMethodReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):67:70 -> a
     18:21:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):21 -> a
     1:1:com.android.tools.r8.graph.DexMethod getReference():38:38 -> d
     1:1:com.android.tools.r8.graph.DexReference getReference():21 -> d
-com.android.tools.r8.synthesis.SyntheticNaming -> com.android.tools.r8.synthesis.y:
+com.android.tools.r8.synthesis.SyntheticNaming -> com.android.tools.r8.synthesis.x:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():15:15 -> <clinit>
-    1:2:com.android.tools.r8.graph.DexType createFixedType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):162:163 -> a
-    3:3:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):190:190 -> a
-    3:3:com.android.tools.r8.graph.DexType createFixedType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):163 -> a
-    4:4:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):204:204 -> a
-    4:4:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):190 -> a
-    4:4:com.android.tools.r8.graph.DexType createFixedType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):163 -> a
-    5:5:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):190:190 -> a
-    5:5:com.android.tools.r8.graph.DexType createFixedType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):163 -> a
-    6:10:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):168:172 -> a
-    11:11:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):169:169 -> a
-    12:12:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):190:190 -> a
-    12:12:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):169 -> a
-    13:13:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):204:204 -> a
-    13:13:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):190 -> a
-    13:13:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):169 -> a
-    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):190:190 -> a
-    14:14:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):169 -> a
-    15:17:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexItemFactory):179:181 -> a
-    18:18:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):204:204 -> a
-    18:18:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexItemFactory):199 -> a
-    18:18:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexItemFactory):180 -> a
-    19:19:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexItemFactory):199:199 -> a
-    19:19:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexItemFactory):180 -> a
-    20:20:boolean verifyNotInternalSynthetic(com.android.tools.r8.references.ClassReference):213:213 -> a
-    21:21:boolean verifyNotInternalSynthetic(java.lang.String):217:217 -> a
-    22:25:java.lang.String getPhaseSeparator(com.android.tools.r8.synthesis.SyntheticNaming$Phase):229:232 -> a
-    26:26:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):238:238 -> a
-    27:27:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):204:204 -> a
-    27:27:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):238 -> a
-    28:28:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):237:237 -> a
-    29:36:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):247:254 -> a
-    37:41:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):263:267 -> a
-    37:41:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):254 -> a
+    1:2:com.android.tools.r8.graph.DexType createFixedType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):175:176 -> a
+    3:3:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):203:203 -> a
+    3:3:com.android.tools.r8.graph.DexType createFixedType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):176 -> a
+    4:4:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):217:217 -> a
+    4:4:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):203 -> a
+    4:4:com.android.tools.r8.graph.DexType createFixedType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):176 -> a
+    5:5:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):203:203 -> a
+    5:5:com.android.tools.r8.graph.DexType createFixedType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):176 -> a
+    6:10:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):181:185 -> a
+    11:11:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):182:182 -> a
+    12:12:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):203:203 -> a
+    12:12:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):182 -> a
+    13:13:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):217:217 -> a
+    13:13:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):203 -> a
+    13:13:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):182 -> a
+    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):203:203 -> a
+    14:14:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):182 -> a
+    15:17:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexItemFactory):192:194 -> a
+    18:18:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):217:217 -> a
+    18:18:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexItemFactory):212 -> a
+    18:18:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexItemFactory):193 -> a
+    19:19:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexItemFactory):212:212 -> a
+    19:19:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexItemFactory):193 -> a
+    20:20:boolean verifyNotInternalSynthetic(com.android.tools.r8.references.ClassReference):226:226 -> a
+    21:21:boolean verifyNotInternalSynthetic(java.lang.String):230:230 -> a
+    22:25:java.lang.String getPhaseSeparator(com.android.tools.r8.synthesis.SyntheticNaming$Phase):242:245 -> a
+    26:26:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):251:251 -> a
+    27:27:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):217:217 -> a
+    27:27:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):251 -> a
+    28:28:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):250:250 -> a
+    29:36:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):260:267 -> a
+    37:41:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):276:280 -> a
+    37:41:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):267 -> a
     42:42:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":53,"2":54,"3":55}}
-    53:53:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):268:268 -> a
-    53:53:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):254 -> a
-    54:54:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):268:268 -> a
-    54:54:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):254 -> a
-    55:55:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):268:268 -> a
-    55:55:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):254 -> a
-    43:44:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):268:269 -> a
-    43:44:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):254 -> a
-    45:52:boolean isInt(java.lang.String):273:280 -> a
-    45:52:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):269 -> a
-    45:52:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):254 -> a
-com.android.tools.r8.synthesis.SyntheticNaming$Phase -> com.android.tools.r8.synthesis.y$a:
+    53:53:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):281:281 -> a
+    53:53:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):267 -> a
+    54:54:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):281:281 -> a
+    54:54:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):267 -> a
+    55:55:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):281:281 -> a
+    55:55:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):267 -> a
+    43:44:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):281:282 -> a
+    43:44:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):267 -> a
+    45:52:boolean isInt(java.lang.String):286:293 -> a
+    45:52:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):282 -> a
+    45:52:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):267 -> a
+com.android.tools.r8.synthesis.SyntheticNaming$Phase -> com.android.tools.r8.synthesis.x$a:
     com.android.tools.r8.synthesis.SyntheticNaming$Phase INTERNAL -> b
     com.android.tools.r8.synthesis.SyntheticNaming$Phase EXTERNAL -> c
-    1:2:void <clinit>():224:225 -> <clinit>
-    1:1:void <init>(java.lang.String,int):223:223 -> <init>
-com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind -> com.android.tools.r8.synthesis.y$b:
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind STATIC_INTERFACE_CALL -> y
-    boolean $assertionsDisabled -> P
+    1:2:void <clinit>():237:238 -> <clinit>
+    1:1:void <init>(java.lang.String,int):236:236 -> <init>
+com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind -> com.android.tools.r8.synthesis.x$b:
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind BACKPORT_WITH_FORWARDING -> y
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind HORIZONTAL_INIT_TYPE_ARGUMENT_2 -> s
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind INIT_TYPE_ARGUMENT -> q
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind BACKPORT -> w
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind ENUM_UNBOXING_CHECK_NOT_ZERO_METHOD -> u
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind RECORD_HELPER -> w
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind NON_FIXED_INIT_TYPE_ARGUMENT -> u
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind EMULATED_INTERFACE_CLASS -> k
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind EMULATED_INTERFACE_MARKER_CLASS -> J
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind API_CONVERSION_PARAMETERS -> J
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind RECORD_TAG -> i
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind API_CONVERSION -> H
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind OUTLINE -> H
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind VIVIFIED_WRAPPER -> o
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind API_MODEL_STUB -> N
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind API_MODEL_OUTLINE -> N
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind RETARGET_INTERFACE -> m
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind ENUM_CONVERSION -> L
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind CONST_DYNAMIC -> L
     boolean mayOverridesNonProgramType -> f
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_IAE -> B
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_CCE_IF_NOT_NULL -> B
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind[] $VALUES -> P
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind ENUM_UNBOXING_LOCAL_UTILITY_CLASS -> g
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind SERVICE_LOADER -> F
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind TWR_CLOSE_RESOURCE -> F
     boolean isSingleSyntheticMethod -> d
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_NSME -> D
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind TO_STRING_IF_NOT_NULL -> z
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind BACKPORT_WITH_FORWARDING -> x
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_ICCE -> D
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind STATIC_INTERFACE_CALL -> z
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind BACKPORT -> x
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind HORIZONTAL_INIT_TYPE_ARGUMENT_1 -> r
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind LAMBDA -> p
+    boolean $assertionsDisabled -> Q
     int id -> c
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind RECORD_HELPER -> v
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind ENUM_UNBOXING_CHECK_NOT_ZERO_METHOD -> v
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind HORIZONTAL_INIT_TYPE_ARGUMENT_3 -> t
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind CONST_DYNAMIC -> K
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind EMULATED_INTERFACE_MARKER_CLASS -> K
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind COMPANION_CLASS -> j
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind API_CONVERSION_PARAMETERS -> I
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind API_CONVERSION -> I
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind ENUM_UNBOXING_SHARED_UTILITY_CLASS -> h
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind API_MODEL_STUB -> O
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind WRAPPER -> n
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind API_MODEL_OUTLINE -> M
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind ENUM_CONVERSION -> M
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind RETARGET_CLASS -> l
     boolean isFixedSuffixSynthetic -> e
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_ICCE -> C
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_CCE_IF_NOT_NULL -> A
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind[] $VALUES -> O
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind OUTLINE -> G
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_IAE -> C
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind TO_STRING_IF_NOT_NULL -> A
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind SERVICE_LOADER -> G
     java.lang.String descriptor -> b
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind TWR_CLOSE_RESOURCE -> E
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_NSME -> E
     1:3:void <clinit>():26:28 -> <clinit>
-    4:4:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    4:4:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     4:4:void <clinit>():28 -> <clinit>
     5:6:void <clinit>():28:29 -> <clinit>
-    7:7:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    7:7:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     7:7:void <clinit>():29 -> <clinit>
     8:10:void <clinit>():29:31 -> <clinit>
-    11:11:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    11:11:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     11:11:void <clinit>():31 -> <clinit>
     12:13:void <clinit>():31:32 -> <clinit>
-    14:14:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    14:14:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     14:14:void <clinit>():32 -> <clinit>
     15:16:void <clinit>():32:33 -> <clinit>
-    17:17:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    17:17:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     17:17:void <clinit>():33 -> <clinit>
     18:19:void <clinit>():33:34 -> <clinit>
-    20:20:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    20:20:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     20:20:void <clinit>():34 -> <clinit>
     21:22:void <clinit>():34:35 -> <clinit>
-    23:23:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    23:23:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     23:23:void <clinit>():35 -> <clinit>
     24:25:void <clinit>():35:36 -> <clinit>
-    26:26:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    26:26:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     26:26:void <clinit>():36 -> <clinit>
     27:28:void <clinit>():36:37 -> <clinit>
-    29:29:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    29:29:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     29:29:void <clinit>():37 -> <clinit>
     30:31:void <clinit>():37:38 -> <clinit>
-    32:32:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    32:32:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     32:32:void <clinit>():38 -> <clinit>
     33:34:void <clinit>():38:39 -> <clinit>
-    35:35:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    35:35:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     35:35:void <clinit>():39 -> <clinit>
     36:37:void <clinit>():39:40 -> <clinit>
-    38:38:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    38:38:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     38:38:void <clinit>():40 -> <clinit>
     39:40:void <clinit>():40:41 -> <clinit>
-    41:41:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    41:41:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
     41:41:void <clinit>():41 -> <clinit>
-    42:44:void <clinit>():41:43 -> <clinit>
-    45:45:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
-    45:45:void <clinit>():43 -> <clinit>
-    46:47:void <clinit>():43:44 -> <clinit>
-    48:48:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    42:43:void <clinit>():41:42 -> <clinit>
+    44:44:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
+    44:44:void <clinit>():42 -> <clinit>
+    45:47:void <clinit>():42:44 -> <clinit>
+    48:48:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     48:48:void <clinit>():44 -> <clinit>
     49:50:void <clinit>():44:45 -> <clinit>
-    51:51:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    51:51:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     51:51:void <clinit>():45 -> <clinit>
     52:53:void <clinit>():45:46 -> <clinit>
-    54:54:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    54:54:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     54:54:void <clinit>():46 -> <clinit>
     55:56:void <clinit>():46:47 -> <clinit>
-    57:57:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    57:57:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     57:57:void <clinit>():47 -> <clinit>
     58:59:void <clinit>():47:48 -> <clinit>
-    60:60:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    60:60:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     60:60:void <clinit>():48 -> <clinit>
     61:62:void <clinit>():48:49 -> <clinit>
-    63:63:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    63:63:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     63:63:void <clinit>():49 -> <clinit>
     64:65:void <clinit>():49:50 -> <clinit>
-    66:66:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    66:66:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     66:66:void <clinit>():50 -> <clinit>
     67:68:void <clinit>():50:51 -> <clinit>
-    69:69:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    69:69:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     69:69:void <clinit>():51 -> <clinit>
     70:71:void <clinit>():51:52 -> <clinit>
-    72:72:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    72:72:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     72:72:void <clinit>():52 -> <clinit>
     73:74:void <clinit>():52:53 -> <clinit>
-    75:75:void <init>(java.lang.String,int,java.lang.String,int,boolean) -> <clinit>
+    75:75:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     75:75:void <clinit>():53 -> <clinit>
     76:77:void <clinit>():53:54 -> <clinit>
-    78:78:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    78:78:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     78:78:void <clinit>():54 -> <clinit>
     79:80:void <clinit>():54:55 -> <clinit>
-    81:81:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    81:81:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     81:81:void <clinit>():55 -> <clinit>
     82:83:void <clinit>():55:56 -> <clinit>
-    84:84:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    84:84:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     84:84:void <clinit>():56 -> <clinit>
     85:86:void <clinit>():56:57 -> <clinit>
-    87:87:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
+    87:87:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     87:87:void <clinit>():57 -> <clinit>
-    88:90:void <clinit>():57:59 -> <clinit>
-    91:91:void <init>(java.lang.String,int,java.lang.String,int,boolean):75:75 -> <clinit>
-    91:91:void <clinit>():59 -> <clinit>
-    92:93:void <clinit>():59:60 -> <clinit>
-    94:94:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <clinit>
+    88:89:void <clinit>():57:58 -> <clinit>
+    90:90:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
+    90:90:void <clinit>():58 -> <clinit>
+    91:93:void <clinit>():58:60 -> <clinit>
+    94:94:void <init>(java.lang.String,int,java.lang.String,int,boolean):76:76 -> <clinit>
     94:94:void <clinit>():60 -> <clinit>
-    95:97:void <clinit>():60:62 -> <clinit>
-    98:98:void <clinit>():26:26 -> <clinit>
-    99:102:boolean verifyNoOverlappingIds():122:125 -> <clinit>
-    99:102:void <clinit>():65 -> <clinit>
-    1:1:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):83:83 -> <init>
-    2:7:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean,boolean):91:96 -> <init>
+    95:96:void <clinit>():60:61 -> <clinit>
+    97:97:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <clinit>
+    97:97:void <clinit>():61 -> <clinit>
+    98:100:void <clinit>():61:63 -> <clinit>
+    101:101:void <clinit>():26:26 -> <clinit>
+    102:105:boolean verifyNoOverlappingIds():135:138 -> <clinit>
+    102:105:void <clinit>():66 -> <clinit>
+    1:1:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):84:84 -> <init>
+    2:7:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean,boolean):92:97 -> <init>
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind[] values():26:26 -> a
-com.android.tools.r8.synthesis.SyntheticProgramClassBuilder -> com.android.tools.r8.synthesis.z:
+com.android.tools.r8.synthesis.SyntheticProgramClassBuilder -> com.android.tools.r8.synthesis.y:
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):20:20 -> <init>
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():25:25 -> b
     com.android.tools.r8.synthesis.SyntheticClassBuilder self() -> f
-    1:2:com.android.tools.r8.graph.DexProgramClass build():35:36 -> k
-    3:4:boolean com.android.tools.r8.synthesis.SyntheticMarker.isDefinitelyNotSyntheticProgramClass(com.android.tools.r8.graph.DexProgramClass):143:144 -> k
-    3:4:com.android.tools.r8.graph.DexProgramClass build():36 -> k
-    5:5:com.android.tools.r8.graph.DexProgramClass build():36:36 -> k
-com.android.tools.r8.synthesis.SyntheticProgramClassDefinition -> com.android.tools.r8.synthesis.A:
+com.android.tools.r8.synthesis.SyntheticProgramClassDefinition -> com.android.tools.r8.synthesis.z:
     1:1:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexProgramClass):24:24 -> <init>
     1:1:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):17:17 -> a
     2:2:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):63:63 -> a
@@ -115662,12 +114465,10 @@
     1:1:boolean isValid():51:51 -> j
     2:2:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> j
     2:2:boolean isValid():51 -> j
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:4:boolean isValid():51:52 -> j
-    5:5:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> j
-    5:5:boolean isValid():53 -> j
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:boolean isValid():53:53 -> j
+    3:5:boolean isValid():51:53 -> j
+    6:6:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> j
+    6:6:boolean isValid():53 -> j
+    7:7:boolean isValid():53:53 -> j
     1:1:com.android.tools.r8.synthesis.SyntheticProgramClassReference toReference():46:46 -> k
     1:1:com.android.tools.r8.synthesis.SyntheticReference toReference():17 -> k
     1:1:java.lang.String toString():0:0 -> toString
@@ -115682,7 +114483,7 @@
     145:145:java.lang.String toString():69:69 -> toString
     146:146:java.lang.String toString():69:69 -> toString
     141:143:java.lang.String toString():71:73 -> toString
-com.android.tools.r8.synthesis.SyntheticProgramClassReference -> com.android.tools.r8.synthesis.B:
+com.android.tools.r8.synthesis.SyntheticProgramClassReference -> com.android.tools.r8.synthesis.A:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType):25:25 -> <init>
@@ -115690,15 +114491,15 @@
     1:6:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):19 -> a
     7:7:com.android.tools.r8.synthesis.SyntheticProgramClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):41:41 -> a
     7:7:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):19 -> a
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> a
     8:8:com.android.tools.r8.synthesis.SyntheticProgramClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):41 -> a
     8:8:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):19 -> a
     9:15:com.android.tools.r8.synthesis.SyntheticProgramClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):44:50 -> a
     9:15:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):19 -> a
-com.android.tools.r8.synthesis.SyntheticProgramDefinition -> com.android.tools.r8.internal.cZ:
+com.android.tools.r8.synthesis.SyntheticProgramDefinition -> com.android.tools.r8.internal.sX:
     void apply(java.util.function.Consumer,java.util.function.Consumer) -> a
     com.android.tools.r8.graph.DexProgramClass getHolder() -> a
-com.android.tools.r8.synthesis.SyntheticReference -> com.android.tools.r8.synthesis.C:
+com.android.tools.r8.synthesis.SyntheticReference -> com.android.tools.r8.synthesis.B:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> a
     boolean $assertionsDisabled -> c
     com.android.tools.r8.synthesis.SynthesizingContext rewrittenContext -> b
@@ -115906,7 +114707,6 @@
     1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):98:98 -> parse
     2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):102:102 -> parse
     3:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.util.Collection,com.android.tools.r8.origin.Origin):106:106 -> parse
-com.android.tools.r8.tracereferences.TraceReferencesCommand$1 -> com.android.tools.r8.tracereferences.c:
 com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder -> com.android.tools.r8.tracereferences.TraceReferencesCommand$a:
     com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> g
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder traceSourceBuilder -> f
@@ -115915,8 +114715,8 @@
     boolean printHelp -> a
     boolean printVersion -> b
     com.android.tools.r8.utils.Reporter reporter -> c
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.tracereferences.TraceReferencesCommand$1):117:117 -> <init>
-    2:2:void <init>(com.android.tools.r8.tracereferences.TraceReferencesCommand$1):117:117 -> <init>
+    1:1:void <init>(com.android.tools.r8.tracereferences.TraceReferencesCommand$1):117:117 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.tracereferences.TraceReferencesCommand$1):117:117 -> <init>
     3:3:void <init>():131:131 -> <init>
     4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):134:134 -> <init>
     5:21:void <init>(com.android.tools.r8.DiagnosticsHandler):119:135 -> <init>
@@ -116045,14 +114845,14 @@
     3:4:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.util.Collection):314:315 -> c
     3:4:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.nio.file.Path[]):309 -> c
     1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setPrintVersion(boolean):160:160 -> d
-com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$1 -> com.android.tools.r8.tracereferences.d:
+com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$1 -> com.android.tools.r8.tracereferences.c:
     1:1:void <init>():131:131 -> <init>
-com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$1ClassNameExtractor -> com.android.tools.r8.tracereferences.e:
+com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$1ClassNameExtractor -> com.android.tools.r8.tracereferences.d:
     java.lang.String className -> c
     1:1:void <init>():169:169 -> <init>
     1:1:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):180:180 -> a
     1:1:java.lang.String getClassInternalType():184:184 -> b
-com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$2 -> com.android.tools.r8.tracereferences.f:
+com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$2 -> com.android.tools.r8.tracereferences.e:
     byte[] val$bytes -> b
     java.nio.file.Path val$file -> a
     java.lang.String val$descriptor -> c
@@ -116060,68 +114860,67 @@
     1:3:java.util.Collection getProgramResources():230:232 -> getProgramResources
     4:4:java.util.Collection getProgramResources():231:231 -> getProgramResources
     5:5:java.util.Collection getProgramResources():230:230 -> getProgramResources
-com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$3 -> com.android.tools.r8.tracereferences.g:
+com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$3 -> com.android.tools.r8.tracereferences.f:
     com.android.tools.r8.ProgramResource dexResource -> a
     1:2:void <init>(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,java.nio.file.Path):278:279 -> <init>
     1:1:java.util.Collection getProgramResources():283:283 -> getProgramResources
-com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$SingleClassClassFileResourceProvider -> com.android.tools.r8.tracereferences.h:
+com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$SingleClassClassFileResourceProvider -> com.android.tools.r8.tracereferences.g:
     com.android.tools.r8.ProgramResource programResource -> c
     java.lang.String descriptor -> b
     1:4:void <init>(com.android.tools.r8.origin.Origin,byte[]):199:202 -> <init>
     1:1:java.util.Set getClassDescriptors():207:207 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):212:212 -> getProgramResource
-com.android.tools.r8.tracereferences.TraceReferencesCommandParser -> com.android.tools.r8.tracereferences.i:
+com.android.tools.r8.tracereferences.TraceReferencesCommandParser -> com.android.tools.r8.tracereferences.h:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
     1:25:void <clinit>():29:53 -> <clinit>
     26:26:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):434:434 -> <clinit>
     26:26:void <clinit>():34 -> <clinit>
     27:27:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>():26:26 -> <init>
     1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):70:70 -> a
-    2:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):85:86 -> a
-    4:20:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):103:119 -> a
-    21:21:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":543,"2":544,"3":545}}
+    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):86:86 -> a
+    3:19:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):103:119 -> a
+    20:20:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":542,"2":543,"3":544}}
+    542:542:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):119:119 -> a
     543:543:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):119:119 -> a
     544:544:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):119:119 -> a
+    139:139:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):119:119 -> a
+    140:140:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":545,"2":546,"3":547}}
     545:545:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):119:119 -> a
-    140:140:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):119:119 -> a
-    141:141:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":546,"2":547,"3":548}}
     546:546:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):119:119 -> a
     547:547:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):119:119 -> a
-    548:548:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):119:119 -> a
-    260:273:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):119:132 -> a
-    274:274:void checkCommandNotSet(com.android.tools.r8.tracereferences.TraceReferencesCommandParser$Command,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin):97:97 -> a
-    274:274:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):133 -> a
-    275:275:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):135:135 -> a
-    276:276:void checkCommandNotSet(com.android.tools.r8.tracereferences.TraceReferencesCommandParser$Command,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin):97:97 -> a
-    276:276:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):136 -> a
-    277:279:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):138:140 -> a
-    280:280:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):232:232 -> a
-    280:280:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):141 -> a
-    281:292:boolean isJdkHome(java.nio.file.Path):213:224 -> a
-    281:292:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):233 -> a
-    281:292:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):141 -> a
-    293:298:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):235:240 -> a
-    293:298:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):141 -> a
-    299:314:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):142:157 -> a
-    315:321:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):156:162 -> a
-    322:322:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":591,"2":592,"3":593,"4":594,"5":595,"6":596}}
+    259:272:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):119:132 -> a
+    273:273:void checkCommandNotSet(com.android.tools.r8.tracereferences.TraceReferencesCommandParser$Command,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin):97:97 -> a
+    273:273:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):133 -> a
+    274:274:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):135:135 -> a
+    275:275:void checkCommandNotSet(com.android.tools.r8.tracereferences.TraceReferencesCommandParser$Command,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin):97:97 -> a
+    275:275:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):136 -> a
+    276:278:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):138:140 -> a
+    279:279:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):232:232 -> a
+    279:279:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):141 -> a
+    280:291:boolean isJdkHome(java.nio.file.Path):213:224 -> a
+    280:291:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):233 -> a
+    280:291:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):141 -> a
+    292:297:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):235:240 -> a
+    292:297:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):141 -> a
+    298:313:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):142:157 -> a
+    314:320:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):156:162 -> a
+    321:321:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":590,"2":591,"3":592,"4":593,"5":594,"6":595}}
+    590:590:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):162:162 -> a
     591:591:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):162:162 -> a
     592:592:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):162:162 -> a
     593:593:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):162:162 -> a
     594:594:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):162:162 -> a
     595:595:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):162:162 -> a
-    596:596:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):162:162 -> a
-    484:521:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):162:199 -> a
-    522:522:void com.android.tools.r8.StringConsumer$WriterConsumer.<init>(com.android.tools.r8.origin.Origin,java.io.Writer):187:187 -> a
-    522:522:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):199 -> a
-    523:527:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):196:200 -> a
-    528:539:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):192:203 -> a
-    540:542:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):188:188 -> a
+    483:520:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):162:199 -> a
+    521:521:void com.android.tools.r8.StringConsumer$WriterConsumer.<init>(com.android.tools.r8.origin.Origin,java.io.Writer):187:187 -> a
+    521:521:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):199 -> a
+    522:526:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):196:200 -> a
+    527:538:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):192:203 -> a
+    539:541:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):188:188 -> a
 com.android.tools.r8.tracereferences.TraceReferencesConsumer -> com.android.tools.r8.tracereferences.TraceReferencesConsumer:
     1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer emptyConsumer():139:139 -> emptyConsumer
 com.android.tools.r8.tracereferences.TraceReferencesConsumer$ForwardingConsumer -> com.android.tools.r8.tracereferences.TraceReferencesConsumer$ForwardingConsumer:
@@ -116143,7 +114942,6 @@
     2:5:void <init>(com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder,com.android.tools.r8.StringConsumer,boolean):37:40 -> <init>
     1:1:com.android.tools.r8.tracereferences.TraceReferencesKeepRules$Builder builder():90:90 -> builder
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):95:99 -> finished
-com.android.tools.r8.tracereferences.TraceReferencesKeepRules$1 -> com.android.tools.r8.tracereferences.j:
 com.android.tools.r8.tracereferences.TraceReferencesKeepRules$Builder -> com.android.tools.r8.tracereferences.TraceReferencesKeepRules$Builder:
     boolean allowObfuscation -> b
     com.android.tools.r8.StringConsumer consumer -> a
@@ -116155,7 +114953,7 @@
     1:1:com.android.tools.r8.tracereferences.TraceReferencesKeepRules$Builder setAllowObfuscation(boolean):57:57 -> setAllowObfuscation
     1:1:com.android.tools.r8.tracereferences.TraceReferencesKeepRules$Builder setOutputConsumer(com.android.tools.r8.StringConsumer):77:77 -> setOutputConsumer
     1:1:com.android.tools.r8.tracereferences.TraceReferencesKeepRules$Builder setOutputPath(java.nio.file.Path):67:67 -> setOutputPath
-com.android.tools.r8.tracereferences.Tracer -> com.android.tools.r8.tracereferences.m:
+com.android.tools.r8.tracereferences.Tracer -> com.android.tools.r8.tracereferences.k:
     com.android.tools.r8.DiagnosticsHandler diagnostics -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Predicate targetPredicate -> c
@@ -116174,7 +114972,7 @@
     22:22:void com.android.tools.r8.tracereferences.Tracer$UseCollector.traceCode(com.android.tools.r8.graph.ProgramMethod):256:256 -> a
     22:22:void com.android.tools.r8.tracereferences.Tracer$UseCollector.access$1200(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
     22:22:void lambda$run$2(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):98 -> a
-com.android.tools.r8.tracereferences.Tracer$UseCollector -> com.android.tools.r8.tracereferences.l:
+com.android.tools.r8.tracereferences.Tracer$UseCollector -> com.android.tools.r8.tracereferences.j:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> c
     java.util.Set missingFields -> g
@@ -116189,121 +114987,131 @@
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.tracereferences.TraceReferencesConsumer,com.android.tools.r8.DiagnosticsHandler,java.util.function.Predicate):114:127 -> <init>
     1:1:void access$000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):106:106 -> a
     2:2:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.tracereferences.Tracer$UseCollector):106:106 -> a
-    3:3:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):106:106 -> a
-    4:5:void collectMissingField(com.android.tools.r8.tracereferences.internal.TracedFieldImpl):217:218 -> a
-    4:5:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):106 -> a
-    6:7:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):206:207 -> a
-    6:7:void collectMissingField(com.android.tools.r8.tracereferences.internal.TracedFieldImpl):218 -> a
-    6:7:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):106 -> a
-    8:8:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106:106 -> a
-    9:10:void registerMethod(com.android.tools.r8.graph.ProgramMethod):232:233 -> a
-    9:10:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
-    11:12:void addTypes(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):155:156 -> a
-    11:12:void registerMethod(com.android.tools.r8.graph.ProgramMethod):233 -> a
-    11:12:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
-    13:26:void registerMethod(com.android.tools.r8.graph.ProgramMethod):234:247 -> a
-    13:26:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
-    27:27:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    27:27:void registerMethod(com.android.tools.r8.graph.ProgramMethod):249 -> a
-    27:27:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
-    28:28:void registerMethod(com.android.tools.r8.graph.ProgramMethod):250:250 -> a
-    28:28:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
-    29:29:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
-    29:29:void registerMethod(com.android.tools.r8.graph.ProgramMethod):250 -> a
-    29:29:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
-    30:30:void registerMethod(com.android.tools.r8.graph.ProgramMethod):251:251 -> a
-    30:30:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
-    31:31:void access$1300(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramField):106:106 -> a
-    32:33:void registerField(com.android.tools.r8.graph.ProgramField):227:228 -> a
-    32:33:void access$1300(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramField):106 -> a
-    34:34:void access$200(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):106:106 -> a
-    35:35:void access$400(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):106:106 -> a
-    36:37:void addTypes(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):155:156 -> a
-    36:37:void access$400(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):106 -> a
-    38:38:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):106:106 -> a
-    39:40:void collectMissingMethod(com.android.tools.r8.tracereferences.internal.TracedMethodImpl):222:223 -> a
-    39:40:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):106 -> a
-    41:42:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):206:207 -> a
-    41:42:void collectMissingMethod(com.android.tools.r8.tracereferences.internal.TracedMethodImpl):223 -> a
-    41:42:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):106 -> a
-    43:43:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):106:106 -> a
-    44:44:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):173:173 -> a
-    44:44:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):106 -> a
-    45:45:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
-    45:45:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):173 -> a
-    45:45:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):106 -> a
-    46:50:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):174:178 -> a
-    46:50:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):106 -> a
-    51:51:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):177:177 -> a
-    51:51:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):106 -> a
-    52:52:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():131:131 -> a
-    53:53:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
-    53:53:boolean access$500(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexType):106 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    54:61:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):143:150 -> a
-    62:63:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):161:162 -> a
-    62:63:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
-    64:64:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):173:173 -> a
-    64:64:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):164 -> a
+    3:3:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106:106 -> a
+    4:5:void registerMethod(com.android.tools.r8.graph.ProgramMethod):232:233 -> a
+    4:5:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
+    6:7:void addTypes(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):155:156 -> a
+    6:7:void registerMethod(com.android.tools.r8.graph.ProgramMethod):233 -> a
+    6:7:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
+    8:21:void registerMethod(com.android.tools.r8.graph.ProgramMethod):234:247 -> a
+    8:21:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
+    22:22:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    22:22:void registerMethod(com.android.tools.r8.graph.ProgramMethod):249 -> a
+    22:22:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
+    23:23:void registerMethod(com.android.tools.r8.graph.ProgramMethod):250:250 -> a
+    23:23:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
+    24:24:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
+    24:24:void registerMethod(com.android.tools.r8.graph.ProgramMethod):250 -> a
+    24:24:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
+    25:25:void registerMethod(com.android.tools.r8.graph.ProgramMethod):251:251 -> a
+    25:25:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):106 -> a
+    26:26:void access$1300(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramField):106:106 -> a
+    27:28:void registerField(com.android.tools.r8.graph.ProgramField):227:228 -> a
+    27:28:void access$1300(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramField):106 -> a
+    29:29:void access$200(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):106:106 -> a
+    30:30:void access$400(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):106:106 -> a
+    31:32:void addTypes(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):155:156 -> a
+    31:32:void access$400(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):106 -> a
+    33:33:boolean access$500(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexType):106:106 -> a
+    34:34:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
+    34:34:boolean access$500(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexType):106 -> a
+    35:35:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):106:106 -> a
+    36:36:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):173:173 -> a
+    36:36:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):106 -> a
+    37:37:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
+    37:37:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):173 -> a
+    37:37:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):106 -> a
+    38:42:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):174:178 -> a
+    38:42:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):106 -> a
+    43:43:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):177:177 -> a
+    43:43:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):106 -> a
+    44:44:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():131:131 -> a
+    45:52:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):143:150 -> a
+    53:54:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):161:162 -> a
+    53:54:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
+    55:55:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):173:173 -> a
+    55:55:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):164 -> a
+    55:55:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
+    56:56:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
+    56:56:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):173 -> a
+    56:56:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):164 -> a
+    56:56:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
+    57:61:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):174:178 -> a
+    57:61:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):164 -> a
+    57:61:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
+    62:62:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):177:177 -> a
+    62:62:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):164 -> a
+    62:62:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
+    63:63:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):166:166 -> a
+    63:63:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
+    64:64:void com.android.tools.r8.tracereferences.internal.TracedClassImpl.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):17:17 -> a
+    64:64:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):166 -> a
     64:64:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
-    65:65:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
-    65:65:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):173 -> a
-    65:65:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):164 -> a
-    65:65:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
-    66:70:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):174:178 -> a
-    66:70:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):164 -> a
-    66:70:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
-    71:71:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):177:177 -> a
-    71:71:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):164 -> a
-    71:71:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
-    72:72:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):166:166 -> a
-    72:72:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
-    73:73:void com.android.tools.r8.tracereferences.internal.TracedClassImpl.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):17:17 -> a
-    73:73:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):166 -> a
-    73:73:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
-    74:75:void collectMissingClass(com.android.tools.r8.tracereferences.internal.TracedClassImpl):212:213 -> a
-    74:75:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):167 -> a
-    74:75:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
-    76:77:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):206:207 -> a
-    76:77:void collectMissingClass(com.android.tools.r8.tracereferences.internal.TracedClassImpl):213 -> a
-    76:77:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):167 -> a
-    76:77:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
-    78:78:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):168:168 -> a
-    78:78:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
-    79:79:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):185:185 -> a
-    80:80:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    80:80:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):185 -> a
-    81:82:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):185:186 -> a
-    83:83:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
-    83:83:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):186 -> a
-    84:93:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):186:195 -> a
-    94:94:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
-    94:94:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):195 -> a
-    95:98:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):196:199 -> a
-    99:99:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):198:198 -> a
-    100:102:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):261:263 -> a
-    103:105:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.graph.DexEncodedMethod):266:268 -> a
-    106:106:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    106:106:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.graph.DexEncodedMethod):270 -> a
-    107:107:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.graph.DexEncodedMethod):271:271 -> a
-    108:108:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
-    108:108:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.graph.DexEncodedMethod):271 -> a
-    109:109:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.graph.DexEncodedMethod):272:272 -> a
+    65:66:void collectMissingClass(com.android.tools.r8.tracereferences.internal.TracedClassImpl):212:213 -> a
+    65:66:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):167 -> a
+    65:66:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
+    67:68:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):206:207 -> a
+    67:68:void collectMissingClass(com.android.tools.r8.tracereferences.internal.TracedClassImpl):213 -> a
+    67:68:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):167 -> a
+    67:68:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
+    69:69:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):168:168 -> a
+    69:69:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):151 -> a
+    70:70:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):185:185 -> a
+    71:71:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    71:71:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):185 -> a
+    72:73:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):185:186 -> a
+    74:74:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
+    74:74:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):186 -> a
+    75:84:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):186:195 -> a
+    85:85:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
+    85:85:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):195 -> a
+    86:89:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):196:199 -> a
+    90:90:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):198:198 -> a
+    91:91:void collectMissingField(com.android.tools.r8.tracereferences.internal.TracedFieldImpl):217:217 -> a
+    91:91:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):106 -> a
+    92:92:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):106:106 -> a
+    93:93:void collectMissingField(com.android.tools.r8.tracereferences.internal.TracedFieldImpl):217:217 -> a
+    93:93:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):106 -> a
+    94:94:void collectMissingField(com.android.tools.r8.tracereferences.internal.TracedFieldImpl):218:218 -> a
+    94:94:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):106 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    95:96:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):206:207 -> a
+    95:96:void collectMissingField(com.android.tools.r8.tracereferences.internal.TracedFieldImpl):218 -> a
+    95:96:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):106 -> a
+    97:97:void collectMissingMethod(com.android.tools.r8.tracereferences.internal.TracedMethodImpl):222:222 -> a
+    97:97:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):106 -> a
+    98:98:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):106:106 -> a
+    99:99:void collectMissingMethod(com.android.tools.r8.tracereferences.internal.TracedMethodImpl):222:222 -> a
+    99:99:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):106 -> a
+    100:100:void collectMissingMethod(com.android.tools.r8.tracereferences.internal.TracedMethodImpl):223:223 -> a
+    100:100:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):106 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    101:102:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):206:207 -> a
+    101:102:void collectMissingMethod(com.android.tools.r8.tracereferences.internal.TracedMethodImpl):223 -> a
+    101:102:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):106 -> a
+    103:105:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):261:263 -> a
+    106:108:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.graph.DexEncodedMethod):266:268 -> a
+    109:109:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    109:109:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.graph.DexEncodedMethod):270 -> a
+    110:110:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.graph.DexEncodedMethod):271:271 -> a
+    111:111:boolean isTargetType(com.android.tools.r8.graph.DexType):139:139 -> a
+    111:111:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.graph.DexEncodedMethod):271 -> a
+    112:112:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.graph.DexEncodedMethod):272:272 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory access$300(com.android.tools.r8.tracereferences.Tracer$UseCollector):106:106 -> b
     2:2:com.android.tools.r8.graph.GraphLens graphLens():135:135 -> b
     1:1:com.android.tools.r8.DiagnosticsHandler access$600(com.android.tools.r8.tracereferences.Tracer$UseCollector):106:106 -> c
     1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer access$700(com.android.tools.r8.tracereferences.Tracer$UseCollector):106:106 -> d
-com.android.tools.r8.tracereferences.Tracer$UseCollector$MethodUseCollector -> com.android.tools.r8.tracereferences.k:
+com.android.tools.r8.tracereferences.Tracer$UseCollector$MethodUseCollector -> com.android.tools.r8.tracereferences.i:
     com.android.tools.r8.diagnostic.DefinitionContext referencedFrom -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.tracereferences.Tracer$UseCollector this$0 -> f
     1:1:void <clinit>():277:277 -> <clinit>
     1:3:void <init>(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):281:283 -> <init>
     1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):290:290 -> a
-    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405:405 -> a
+    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409:409 -> a
     2:2:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):290 -> a
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> a
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):405 -> a
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> a
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409 -> a
     3:3:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):290 -> a
     4:8:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):291:295 -> a
     9:9:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod):371:371 -> a
@@ -116331,17 +115139,17 @@
     68:69:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):397:398 -> a
     70:70:void handleFieldAccess(com.android.tools.r8.graph.DexField):432:432 -> a
     70:70:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):413 -> a
-    71:71:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):471:471 -> a
+    71:71:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):480:480 -> a
     71:71:void handleFieldAccess(com.android.tools.r8.graph.DexField):432 -> a
     71:71:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):413 -> a
     72:72:void handleFieldAccess(com.android.tools.r8.graph.DexField):433:433 -> a
     72:72:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):413 -> a
     73:91:void registerCallSite(com.android.tools.r8.graph.DexCallSite):472:490 -> a
     1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):300:300 -> b
-    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409:409 -> b
+    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):413:413 -> b
     2:2:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):300 -> b
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> b
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):409 -> b
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> b
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):413 -> b
     3:3:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):300 -> b
     4:5:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):301:302 -> b
     6:6:void lambda$handleRewrittenMethodResolution$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):361:361 -> b
@@ -116349,38 +115157,38 @@
     8:8:void registerInitClass(com.android.tools.r8.graph.DexType):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":417,"2":418,"3":419}}
     417:417:void registerInitClass(com.android.tools.r8.graph.DexType):406:406 -> b
-    418:418:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
+    418:418:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> b
     418:418:void registerInitClass(com.android.tools.r8.graph.DexType):406 -> b
-    419:419:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
+    419:419:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> b
     419:419:void registerInitClass(com.android.tools.r8.graph.DexType):406 -> b
     415:416:void registerInitClass(com.android.tools.r8.graph.DexType):407:408 -> b
     1:1:void handleFieldAccess(com.android.tools.r8.graph.DexField):432:432 -> c
     1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):418 -> c
-    2:2:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):471:471 -> c
+    2:2:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):480:480 -> c
     2:2:void handleFieldAccess(com.android.tools.r8.graph.DexField):432 -> c
     2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):418 -> c
     3:3:void handleFieldAccess(com.android.tools.r8.graph.DexField):433:433 -> c
     3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):418 -> c
     1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):307:307 -> d
-    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):413:413 -> d
+    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):417:417 -> d
     2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):307 -> d
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> d
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):413 -> d
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> d
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):417 -> d
     3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):307 -> d
     4:7:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):308:311 -> d
     8:8:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):310:310 -> d
     1:1:void handleFieldAccess(com.android.tools.r8.graph.DexField):432:432 -> e
     1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):423 -> e
-    2:2:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):471:471 -> e
+    2:2:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):480:480 -> e
     2:2:void handleFieldAccess(com.android.tools.r8.graph.DexField):432 -> e
     2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):423 -> e
     3:3:void handleFieldAccess(com.android.tools.r8.graph.DexField):433:433 -> e
     3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):423 -> e
     1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):316:316 -> f
-    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):417:417 -> f
+    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):421:421 -> f
     2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):316 -> f
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> f
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):417 -> f
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> f
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):421 -> f
     3:3:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):316 -> f
     4:15:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):317:328 -> f
     16:16:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod):371:371 -> f
@@ -116391,21 +115199,21 @@
     19:19:void registerTypeReference(com.android.tools.r8.graph.DexType):0:0 -> f
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":485,"2":486,"3":487}}
     485:485:void registerTypeReference(com.android.tools.r8.graph.DexType):465:465 -> f
-    486:486:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> f
+    486:486:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> f
     486:486:void registerTypeReference(com.android.tools.r8.graph.DexType):465 -> f
-    487:487:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> f
+    487:487:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):397:397 -> f
     487:487:void registerTypeReference(com.android.tools.r8.graph.DexType):465 -> f
     484:484:void registerTypeReference(com.android.tools.r8.graph.DexType):465:465 -> f
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):333:333 -> g
-    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):421:421 -> g
+    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):425:425 -> g
     2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):333 -> g
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):425:425 -> g
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):421 -> g
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):429:429 -> g
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):425 -> g
     3:3:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):333 -> g
     4:5:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):334:335 -> g
     6:6:void handleFieldAccess(com.android.tools.r8.graph.DexField):432:432 -> g
     6:6:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):428 -> g
-    7:7:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):471:471 -> g
+    7:7:com.android.tools.r8.graph.GraphLens$FieldLookupResult com.android.tools.r8.graph.GraphLens.lookupFieldResult(com.android.tools.r8.graph.DexField):480:480 -> g
     7:7:void handleFieldAccess(com.android.tools.r8.graph.DexField):432 -> g
     7:7:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):428 -> g
     8:8:void handleFieldAccess(com.android.tools.r8.graph.DexField):433:433 -> g
@@ -116422,15 +115230,15 @@
     1:1:boolean isProtected():29:29 -> isProtected
     1:1:boolean isPublic():24:24 -> isPublic
     1:1:boolean isStatic():19:19 -> isStatic
-com.android.tools.r8.tracereferences.internal.ClassAccessFlagsImpl -> com.android.tools.r8.internal.H9:
+com.android.tools.r8.tracereferences.internal.ClassAccessFlagsImpl -> com.android.tools.r8.internal.x9:
     1:1:void <init>(com.android.tools.r8.graph.ClassAccessFlags):13:13 -> <init>
     1:1:boolean isEnum():23:23 -> isEnum
     1:1:boolean isInterface():18:18 -> isInterface
-com.android.tools.r8.tracereferences.internal.FieldAccessFlagsImpl -> com.android.tools.r8.internal.wj:
+com.android.tools.r8.tracereferences.internal.FieldAccessFlagsImpl -> com.android.tools.r8.internal.ej:
     1:1:void <init>(com.android.tools.r8.graph.FieldAccessFlags):13:13 -> <init>
-com.android.tools.r8.tracereferences.internal.MethodAccessFlagsImpl -> com.android.tools.r8.internal.FE:
+com.android.tools.r8.tracereferences.internal.MethodAccessFlagsImpl -> com.android.tools.r8.internal.JD:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessFlags):13:13 -> <init>
-com.android.tools.r8.tracereferences.internal.TraceReferencesResult -> com.android.tools.r8.internal.PZ:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult -> com.android.tools.r8.internal.fY:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -116440,7 +115248,7 @@
     1:1:java.util.Map getTracedFields():43:43 -> b
     1:1:java.util.Map getTracedMethods():47:47 -> c
     1:1:java.util.Set getTracedPackageNames():51:51 -> d
-com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder -> com.android.tools.r8.internal.OZ:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder -> com.android.tools.r8.internal.eY:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -116453,22 +115261,22 @@
     1:1:void acceptPackage(com.android.tools.r8.references.PackageReference,com.android.tools.r8.DiagnosticsHandler):83:83 -> acceptPackage
     1:1:void acceptType(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass,com.android.tools.r8.DiagnosticsHandler):66:66 -> acceptType
     1:1:java.util.Set lambda$acceptMethod$1(com.android.tools.r8.references.ClassReference):78:78 -> b
-com.android.tools.r8.tracereferences.internal.TracedClassImpl -> com.android.tools.r8.internal.RZ:
+com.android.tools.r8.tracereferences.internal.TracedClassImpl -> com.android.tools.r8.internal.hY:
     1:3:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):21:21 -> <init>
     5:5:void <init>(com.android.tools.r8.references.ClassReference,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.tracereferences.TraceReferencesConsumer$ClassAccessFlags):31:31 -> <init>
     1:1:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedFieldImpl -> com.android.tools.r8.internal.SZ:
+com.android.tools.r8.tracereferences.internal.TracedFieldImpl -> com.android.tools.r8.internal.iY:
     1:3:void <init>(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.diagnostic.DefinitionContext):21:21 -> <init>
     5:5:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.tracereferences.TraceReferencesConsumer$FieldAccessFlags):31:31 -> <init>
     1:1:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedMethodImpl -> com.android.tools.r8.internal.TZ:
+com.android.tools.r8.tracereferences.internal.TracedMethodImpl -> com.android.tools.r8.internal.jY:
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.diagnostic.DefinitionContext):21:21 -> <init>
     5:5:void <init>(com.android.tools.r8.references.MethodReference,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.tracereferences.TraceReferencesConsumer$MethodAccessFlags):31:31 -> <init>
     1:1:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedReferenceBase -> com.android.tools.r8.internal.UZ:
+com.android.tools.r8.tracereferences.internal.TracedReferenceBase -> com.android.tools.r8.internal.kY:
     com.android.tools.r8.diagnostic.DefinitionContext referencedFrom -> b
     boolean $assertionsDisabled -> e
     java.lang.Object accessFlags -> c
@@ -116640,80 +115448,87 @@
     1:1:void <clinit>():90:90 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.StringResource,com.android.tools.r8.StringResource,java.util.List,java.util.List,com.android.tools.r8.utils.AndroidApp$1):90:90 -> <init>
     2:13:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.StringResource,com.android.tools.r8.StringResource,java.util.List,java.util.List):198:209 -> <init>
-    java.util.zip.ZipOutputStream lambda$dumpClassFileResources$3(java.util.zip.ZipOutputStream,java.lang.String) -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$200(com.android.tools.r8.utils.AndroidApp):90:90 -> a
+    1:1:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
     2:6:java.util.Map dumpFeatureSplitFileNames(com.android.tools.r8.features.FeatureSplitConfiguration):106:110 -> a
     2:6:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):594 -> a
-    7:31:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):595:619 -> a
-    32:66:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):616:650 -> a
-    67:76:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):647:656 -> a
-    77:90:void closeOutputStreams(java.util.Collection):664:677 -> a
-    77:90:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):656 -> a
-    91:91:void closeOutputStreams(java.util.Collection):674:674 -> a
-    91:91:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):656 -> a
-    92:123:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):611:642 -> a
-    124:170:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):610:656 -> a
-    171:173:void closeOutputStreams(java.util.Collection):664:666 -> a
-    171:173:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):656 -> a
-    174:174:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):656:656 -> a
-    175:175:void closeOutputStreams(java.util.Collection):677:677 -> a
-    175:175:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):656 -> a
-    176:176:void closeOutputStreams(java.util.Collection):674:674 -> a
+    7:24:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):595:612 -> a
+    25:25:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
+    25:25:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):612 -> a
+    26:32:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):613:619 -> a
+    33:67:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):616:650 -> a
+    68:77:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):647:656 -> a
+    78:91:void closeOutputStreams(java.util.Collection):664:677 -> a
+    78:91:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):656 -> a
+    92:92:void closeOutputStreams(java.util.Collection):674:674 -> a
+    92:92:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):656 -> a
+    93:124:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):611:642 -> a
+    125:171:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):610:656 -> a
+    172:174:void closeOutputStreams(java.util.Collection):664:666 -> a
+    172:174:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):656 -> a
+    175:175:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):656:656 -> a
+    176:176:void closeOutputStreams(java.util.Collection):677:677 -> a
     176:176:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):656 -> a
-    177:178:boolean verifyInternalProvidersInCloseSet(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList):215:216 -> a
-    179:179:boolean lambda$verifyInternalProvidersInCloseSet$0(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ClassFileResourceProvider):217:217 -> a
-    180:180:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.Reporter):233:233 -> a
-    181:181:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):245:245 -> a
-    182:184:int applicationSize():250:250 -> a
-    186:194:int applicationSize():252:252 -> a
-    201:201:int applicationSize():259:259 -> a
-    202:202:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):259:259 -> a
-    203:206:void write(java.nio.file.Path,com.android.tools.r8.OutputMode):417:420 -> a
-    207:208:java.lang.String getPrimaryClassDescriptor(com.android.tools.r8.Resource):465:466 -> a
-    209:213:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):474:478 -> a
-    214:217:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):477:480 -> a
-    218:224:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):479:485 -> a
-    225:246:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):482:503 -> a
-    247:256:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):500:509 -> a
-    257:257:java.util.List getMainDexListResources():389:389 -> a
-    257:257:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):511 -> a
-    258:259:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):511:512 -> a
-    260:260:java.util.List getMainDexClasses():396:396 -> a
-    260:260:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):515 -> a
-    261:271:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):515:525 -> a
-    272:281:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):522:531 -> a
-    282:282:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):529:529 -> a
-    283:284:int dumpClasspathResources(int,java.util.zip.ZipOutputStream):553:554 -> a
-    283:284:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):537 -> a
-    285:286:int dumpLibraryResources(int,java.util.zip.ZipOutputStream):546:547 -> a
-    285:286:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):538 -> a
-    287:287:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):539:539 -> a
-    288:352:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):476:540 -> a
-    353:357:java.util.zip.ZipOutputStream lambda$dumpProgramResources$2(com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.zip.ZipOutputStream,java.lang.String):629:633 -> a
-    358:377:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):687:706 -> a
-    378:394:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):688:704 -> a
-    395:414:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):687:706 -> a
-    415:421:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):717:723 -> a
-    422:422:java.lang.String extractClassDescriptor(byte[]):762:762 -> a
-    422:422:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):722 -> a
-    423:423:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(byte[]):166:166 -> a
-    423:423:java.lang.String extractClassDescriptor(byte[]):762 -> a
-    423:423:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):722 -> a
-    424:430:java.lang.String extractClassDescriptor(byte[]):763:769 -> a
-    424:430:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):722 -> a
-    431:436:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):724:729 -> a
-    437:440:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):728:731 -> a
-    441:441:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1176,"2":1177,"3":1178}}
-    1176:1176:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):732:732 -> a
-    1177:1177:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):732:732 -> a
-    1178:1178:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):732:732 -> a
-    442:442:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):0:0 -> a
+    177:177:void closeOutputStreams(java.util.Collection):674:674 -> a
+    177:177:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):656 -> a
+    java.util.zip.ZipOutputStream lambda$dumpClassFileResources$3(java.util.zip.ZipOutputStream,java.lang.String) -> a
+    178:178:com.android.tools.r8.com.google.common.collect.ImmutableList access$200(com.android.tools.r8.utils.AndroidApp):90:90 -> a
+    179:180:boolean verifyInternalProvidersInCloseSet(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList):215:216 -> a
+    181:181:boolean lambda$verifyInternalProvidersInCloseSet$0(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ClassFileResourceProvider):217:217 -> a
+    182:182:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.Reporter):233:233 -> a
+    183:183:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):245:245 -> a
+    184:186:int applicationSize():250:250 -> a
+    188:196:int applicationSize():252:252 -> a
+    203:203:int applicationSize():259:259 -> a
+    204:204:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):259:259 -> a
+    205:208:void write(java.nio.file.Path,com.android.tools.r8.OutputMode):417:420 -> a
+    209:210:java.lang.String getPrimaryClassDescriptor(com.android.tools.r8.Resource):465:466 -> a
+    211:215:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):474:478 -> a
+    216:219:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):477:480 -> a
+    220:226:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):479:485 -> a
+    227:248:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):482:503 -> a
+    249:258:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):500:509 -> a
+    259:259:java.util.List getMainDexListResources():389:389 -> a
+    259:259:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):511 -> a
+    260:261:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):511:512 -> a
+    262:262:java.util.List getMainDexClasses():396:396 -> a
+    262:262:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):515 -> a
+    263:273:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):515:525 -> a
+    274:283:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):522:531 -> a
+    284:284:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):529:529 -> a
+    285:286:int dumpClasspathResources(int,java.util.zip.ZipOutputStream):553:554 -> a
+    285:286:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):537 -> a
+    287:288:int dumpLibraryResources(int,java.util.zip.ZipOutputStream):546:547 -> a
+    287:288:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):538 -> a
+    289:289:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):539:539 -> a
+    290:354:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):476:540 -> a
+    355:359:java.util.zip.ZipOutputStream lambda$dumpProgramResources$2(com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.zip.ZipOutputStream,java.lang.String):629:633 -> a
+    360:362:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):687:689 -> a
+    363:363:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
+    363:363:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):689 -> a
+    364:380:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):690:706 -> a
+    381:397:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):688:704 -> a
+    398:417:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):687:706 -> a
+    418:424:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):717:723 -> a
+    425:425:java.lang.String extractClassDescriptor(byte[]):762:762 -> a
+    425:425:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):722 -> a
+    426:426:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(byte[]):166:166 -> a
+    426:426:java.lang.String extractClassDescriptor(byte[]):762 -> a
+    426:426:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):722 -> a
+    427:433:java.lang.String extractClassDescriptor(byte[]):763:769 -> a
+    427:433:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):722 -> a
+    434:439:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):724:729 -> a
+    440:443:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):728:731 -> a
+    444:444:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1179,"2":1180,"3":1181}}
     1179:1179:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):732:732 -> a
     1180:1180:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):732:732 -> a
     1181:1181:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):732:732 -> a
-    1175:1175:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):733:733 -> a
+    445:445:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1182,"2":1183,"3":1184}}
+    1182:1182:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):732:732 -> a
+    1183:1183:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):732:732 -> a
+    1184:1184:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):732:732 -> a
+    1178:1178:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):733:733 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$300(com.android.tools.r8.utils.AndroidApp):90:90 -> b
     2:2:com.android.tools.r8.utils.Reporter defaultReporter():221:221 -> b
     2:2:com.android.tools.r8.utils.AndroidApp$Builder builder():228 -> b
@@ -117049,7 +115864,7 @@
     java.util.Set descriptors -> a
     1:1:void <init>(java.util.Set,byte[],com.android.tools.r8.utils.AndroidAppConsumers$1):328:328 -> <init>
     2:4:void <init>(java.util.Set,byte[]):333:335 -> <init>
-com.android.tools.r8.utils.ArchiveBuilder -> com.android.tools.r8.internal.D2:
+com.android.tools.r8.utils.ArchiveBuilder -> com.android.tools.r8.internal.C2:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.origin.Origin origin -> b
     java.util.zip.ZipOutputStream stream -> c
@@ -117179,7 +115994,7 @@
     320:320:com.android.tools.r8.origin.Origin getOrigin():185:185 -> a
     1:1:java.nio.file.Path getPath():190:190 -> b
     1:2:void open():46:47 -> c
-com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> com.android.tools.r8.internal.C2:
+com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> com.android.tools.r8.internal.B2:
     com.android.tools.r8.ByteDataView content -> c
     java.lang.String name -> b
     boolean isDirectory -> d
@@ -117285,7 +116100,7 @@
     4:4:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):44:44 -> fromArchive
     1:1:com.android.tools.r8.origin.Origin getOrigin():55:55 -> getOrigin
     1:3:java.util.Collection getProgramResources():105:107 -> getProgramResources
-com.android.tools.r8.utils.ArrayUtils -> com.android.tools.r8.internal.n3:
+com.android.tools.r8.utils.ArrayUtils -> com.android.tools.r8.internal.l3:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -117298,42 +116113,42 @@
     36:45:java.lang.Object[] filter(java.lang.Object[],java.util.function.Predicate,java.lang.Object[],int):107:116 -> a
     46:47:java.lang.Object[] appendSingleElement(java.lang.Object[],java.lang.Object):160:161 -> a
     1:1:java.lang.Object last(java.lang.Object[]):66:66 -> b
-com.android.tools.r8.utils.AsmUtils -> com.android.tools.r8.internal.t3:
+com.android.tools.r8.utils.AsmUtils -> com.android.tools.r8.internal.r3:
     boolean isDeprecated(int) -> a
-com.android.tools.r8.utils.AssertionConfigurationWithDefault -> com.android.tools.r8.internal.v3:
+com.android.tools.r8.utils.AssertionConfigurationWithDefault -> com.android.tools.r8.internal.t3:
     java.util.List assertionsConfigurations -> b
     com.android.tools.r8.AssertionsConfiguration$AssertionTransformation defautlTransformation -> a
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void <init>(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.util.List):19:22 -> <init>
-com.android.tools.r8.utils.AssertionUtils -> com.android.tools.r8.internal.w3:
+com.android.tools.r8.utils.AssertionUtils -> com.android.tools.r8.internal.u3:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:boolean assertNotNull(java.lang.Object):12:12 -> a
-com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.G4:
-com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.I4:
+com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.D4:
+com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.F4:
     java.util.Map original -> a
     java.util.Map inverse -> b
     1:3:void <init>(java.util.Map,java.util.Map):21:23 -> <init>
-com.android.tools.r8.utils.BiPredicateUtils -> com.android.tools.r8.internal.J4:
+com.android.tools.r8.utils.BiPredicateUtils -> com.android.tools.r8.internal.G4:
     boolean lambda$alwaysFalse$0(java.lang.Object,java.lang.Object) -> a
     1:1:java.util.function.BiPredicate alwaysFalse():12:12 -> a
     2:2:java.util.function.BiPredicate or(java.util.function.BiPredicate[]):21:21 -> a
     3:4:boolean lambda$or$2(java.util.function.BiPredicate[],java.lang.Object,java.lang.Object):22:23 -> a
     boolean lambda$alwaysTrue$1(java.lang.Object,java.lang.Object) -> b
     1:1:java.util.function.BiPredicate alwaysTrue():16:16 -> b
-com.android.tools.r8.utils.BitSetUtils -> com.android.tools.r8.internal.e5:
+com.android.tools.r8.utils.BitSetUtils -> com.android.tools.r8.internal.b5:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:boolean verifyLessThanOrEqualTo(java.util.BitSet,java.util.BitSet):27:27 -> a
     2:3:java.util.BitSet com.android.tools.r8.utils.BitSetUtils.or(java.util.BitSet,java.util.BitSet):21:22 -> a
     2:3:boolean verifyLessThanOrEqualTo(java.util.BitSet,java.util.BitSet):27 -> a
     4:4:boolean verifyLessThanOrEqualTo(java.util.BitSet,java.util.BitSet):27:27 -> a
-com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.f5:
+com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.c5:
     boolean isBitInMaskSet(int,int) -> a
     boolean isBitSet(int,int) -> b
-com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.j5:
+com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.g5:
     boolean value -> a
     boolean assigned -> b
     1:1:void <init>():14:14 -> <init>
@@ -117350,7 +116165,7 @@
     1:1:boolean isTrue():35:35 -> c
     2:3:void set(boolean):43:44 -> c
     1:1:void set():39:39 -> d
-com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.t5:
+com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.q5:
     1:1:void <init>():27:27 -> <init>
     boolean isFalse() -> a
     1:1:boolean isPossiblyFalse():52:52 -> b
@@ -117358,13 +116173,13 @@
     boolean isTrue() -> d
     boolean isUnknown() -> e
     1:1:int hashCode():74:74 -> hashCode
-com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.A5:
+com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.x5:
     java.lang.Boolean[] VALUES -> a
     int $r8$clinit -> b
     1:1:void <clinit>():8:8 -> <clinit>
     int intValue(boolean) -> a
     1:1:java.lang.Boolean[] values():21:21 -> a
-com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.P5:
+com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.M5:
     java.lang.Object value -> a
     1:1:void <init>():15:15 -> <init>
     2:3:void <init>(java.lang.Object):17:18 -> <init>
@@ -117375,7 +116190,7 @@
     1:1:boolean isSet():43:43 -> c
     1:5:boolean equals(java.lang.Object):54:58 -> equals
     1:1:int hashCode():63:63 -> hashCode
-com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.M7:
+com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.E7:
     java.util.Map sourceMethodMapping -> a
     com.android.tools.r8.utils.AndroidApp inputApp -> b
     boolean $assertionsDisabled -> c
@@ -117386,8 +116201,7 @@
     2:7:java.lang.String lookupNameAndDescriptor(java.lang.String,int):31:36 -> a
     8:30:void readLineNumbersFromClassFiles():40:62 -> a
     31:36:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):46:51 -> a
-com.android.tools.r8.utils.CfLineToMethodMapper$1 -> com.android.tools.r8.internal.J7:
-com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.K7:
+com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.C7:
     com.android.tools.r8.utils.CfLineToMethodMapper this$0 -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap currentLineNumberMapping -> c
     1:1:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.CfLineToMethodMapper$1):85:85 -> <init>
@@ -117405,13 +116219,13 @@
     120:120:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):109:109 -> a
     114:114:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):109:109 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap lambda$visit$0(java.lang.String):103:103 -> d
-com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.internal.L7:
+com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.internal.D7:
     java.lang.String nameAndDescriptor -> j
     java.util.Map lineMethodMapping -> k
     1:1:void <init>(java.lang.String,java.util.Map,com.android.tools.r8.utils.CfLineToMethodMapper$1):114:114 -> <init>
     2:4:void <init>(java.lang.String,java.util.Map):120:122 -> <init>
     1:1:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):127:127 -> b
-com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.b9:
+com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.R8:
     java.util.Stack opened -> b
     java.lang.StringBuilder builder -> a
     int nextUnusedValue -> c
@@ -117437,14 +116251,14 @@
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49 -> d
     3:3:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):50:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.d9:
+com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.T8:
     com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String) -> a
     1:1:com.android.tools.r8.utils.ChainableStringConsumer wrap(java.util.function.Consumer):15:15 -> a
-com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.c9:
+com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.S8:
     java.util.function.Consumer val$consumer -> a
     1:1:void <init>(java.util.function.Consumer):15:15 -> <init>
     1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):18:18 -> a
-com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.va:
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.ia:
     java.util.Map classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
@@ -117465,8 +116279,7 @@
     com.android.tools.r8.graph.ClassKind getClassKind() -> c
     1:1:boolean isFullyLoaded():240:240 -> d
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.internal.ta:
-com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.ua:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.ha:
     com.android.tools.r8.graph.DexType type -> d
     boolean ready -> f
     boolean $assertionsDisabled -> g
@@ -117497,7 +116310,7 @@
     620:620:void lambda$get$0(com.android.tools.r8.graph.DexClass):278 -> a
     621:621:void lambda$get$0(com.android.tools.r8.graph.DexClass):278:278 -> a
     1:1:java.lang.Object get():246:246 -> get
-com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.Ta:
+com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.Da:
     com.android.tools.r8.graph.ClassKind classKind -> a
     1:2:void <init>(com.android.tools.r8.graph.ClassKind):29:30 -> <init>
     void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer) -> a
@@ -117509,8 +116322,7 @@
     4:4:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):67 -> a
     5:8:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):68:71 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():35:35 -> b
-com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.internal.Oa:
-com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.Pa:
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.za:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
@@ -117535,14 +116347,14 @@
     126:126:java.lang.String toString():123:123 -> toString
     127:127:java.lang.String toString():123:123 -> toString
     124:124:java.lang.String toString():123:123 -> toString
-com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.Qa:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.Aa:
     java.util.List providers -> b
     1:1:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List,com.android.tools.r8.utils.ClassProvider$1):194:194 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List):198:199 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:205 -> a
     3:5:java.util.Collection collectTypes():211:213 -> a
     1:8:java.lang.String toString():220:227 -> toString
-com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.tools.r8.internal.Ra:
+com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.tools.r8.internal.Ba:
     java.util.Set filteredOut -> c
     com.android.tools.r8.utils.ClassProvider provider -> b
     boolean $assertionsDisabled -> d
@@ -117560,7 +116372,7 @@
     6:9:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):175:178 -> a
     10:11:java.util.Collection collectTypes():183:184 -> a
     1:1:java.lang.String toString():190:190 -> toString
-com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.Sa:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.Ca:
     com.android.tools.r8.com.google.common.collect.Multimap classes -> b
     1:1:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap,com.android.tools.r8.utils.ClassProvider$1):127:127 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap):131:132 -> <init>
@@ -117572,7 +116384,7 @@
     152:152:java.lang.String toString():149:149 -> toString
     153:153:java.lang.String toString():149:149 -> toString
     150:150:java.lang.String toString():149:149 -> toString
-com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.Wa:
+com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.Ga:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:2:void <clinit>():16:17 -> <clinit>
@@ -117586,7 +116398,7 @@
     5:5:int compare(com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.MethodReference):31 -> a
     6:6:int compare(com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.MethodReference):31:31 -> a
     7:7:java.util.Comparator getClassReferenceComparator():36:36 -> a
-com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.ub:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.ab:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):19:19 -> <init>
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):12:12 -> a
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12:12 -> a
@@ -117621,7 +116433,7 @@
     46:46:java.lang.String toString():43:43 -> toString
     47:47:java.lang.String toString():43:43 -> toString
     44:44:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.mc:
+com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.Rb:
     1:1:java.util.Set mergeSets(java.util.Collection,java.util.Collection):22:22 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder.addAll(java.lang.Iterable):448:448 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.addAll(java.lang.Iterable):535 -> a
@@ -117639,33 +116451,86 @@
     5:5:java.util.Set mergeSets(java.util.Collection,java.util.Collection):24 -> a
     6:6:java.util.Set mergeSets(java.util.Collection,java.util.Collection):25:25 -> a
     7:8:java.util.Collection sort(java.util.Collection,java.util.Comparator):36:37 -> a
-com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.wc:
+com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.bc:
     1:3:int lambda$listComparator$0(java.util.Comparator,java.util.List,java.util.List):18:20 -> a
     4:4:java.util.Comparator arrayComparator(java.util.Comparator):57:57 -> a
     5:7:int lambda$arrayComparator$1(java.util.Comparator,java.lang.Object[],java.lang.Object[]):58:60 -> a
     8:8:java.util.Comparator unreachableComparator():67:67 -> a
     9:9:int lambda$unreachableComparator$2(java.lang.Object,java.lang.Object):68:68 -> a
     1:1:java.util.Comparator listComparator(java.util.Comparator):17:17 -> b
-com.android.tools.r8.utils.CompareResult$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.xc:
+com.android.tools.r8.utils.CompareResult$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.cc:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.fromComparisonResult(int) -> a
     boolean com.android.tools.r8.utils.CompareResult.isEqual() -> b
     int getComparisonResult(int) -> c
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.ge:
+com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.Id:
     void lambda$emptyBiConsumer$4(java.lang.Object,java.lang.Object) -> a
     void lambda$emptyConsumer$3(java.lang.Object) -> a
-    1:1:void acceptIfNotNull(java.lang.Object,java.util.function.Consumer):24:24 -> a
-    2:2:java.util.function.Consumer acceptIfNotSeen(java.util.function.Consumer,java.util.Set):29:29 -> a
-    3:4:void lambda$acceptIfNotSeen$2(java.util.Set,java.util.function.Consumer,java.lang.Object):30:31 -> a
-    5:5:java.util.function.BiConsumer emptyBiConsumer():41:41 -> a
+    1:1:java.util.function.Consumer acceptIfNotSeen(java.util.function.Consumer,java.util.Set):29:29 -> a
+    2:3:void lambda$acceptIfNotSeen$2(java.util.Set,java.util.function.Consumer,java.lang.Object):30:31 -> a
+    4:4:java.util.function.BiConsumer emptyBiConsumer():41:41 -> a
     void lambda$emptyThrowingConsumer$5(java.lang.Object) -> b
     1:1:java.util.function.Consumer emptyConsumer():37:37 -> b
     1:1:com.android.tools.r8.utils.ThrowingConsumer emptyThrowingConsumer():45:45 -> c
-com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.mf:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase -> com.android.tools.r8.internal.Te:
+    java.util.ArrayDeque workList -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:85:void <init>():21:105 -> <init>
+    1:11:com.android.tools.r8.utils.TraversalContinuation run(java.util.Collection):129:139 -> a
+    12:12:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList.internalOnVisit(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl):183:183 -> a
+    12:12:com.android.tools.r8.utils.TraversalContinuation run(java.util.Collection):139 -> a
+    13:14:com.android.tools.r8.utils.TraversalContinuation run(java.util.Collection):141:142 -> a
+    15:15:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList.internalOnJoin(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl):183:183 -> a
+    15:15:com.android.tools.r8.utils.TraversalContinuation run(java.util.Collection):142 -> a
+    16:18:com.android.tools.r8.utils.TraversalContinuation run(java.util.Collection):143:145 -> a
+    19:19:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList.createDfsNode(java.lang.Object):213:213 -> a
+    19:19:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList.createDfsNode(java.lang.Object):183 -> a
+    19:19:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl internalEnqueueNode(java.lang.Object):116 -> a
+    20:21:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl internalEnqueueNode(java.lang.Object):117:118 -> a
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNode -> com.android.tools.r8.internal.Oe:
+    java.lang.Object getNode() -> b
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl -> com.android.tools.r8.internal.Pe:
+    com.android.tools.r8.utils.DepthFirstSearchWorkListBase$ProcessingState processingState -> b
+    java.lang.Object node -> a
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():44:44 -> <clinit>
+    1:1:void <init>(java.lang.Object,com.android.tools.r8.utils.DepthFirstSearchWorkListBase$1):44:44 -> <init>
+    2:2:void <init>(java.lang.Object):49:49 -> <init>
+    3:6:void <init>(java.lang.Object):47:50 -> <init>
+    1:1:java.lang.Object getNode():72:72 -> b
+    1:1:boolean isFinished():58:58 -> d
+    1:1:boolean isNotProcessed():54:54 -> e
+    1:1:boolean seenAndNotProcessed():77:77 -> f
+    1:2:void setFinished():66:67 -> g
+    1:1:void setWaiting():62:62 -> h
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState -> com.android.tools.r8.internal.Qe:
+    java.lang.Object getState() -> a
+    void setState(java.lang.Object) -> a
+    boolean hasState() -> c
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl -> com.android.tools.r8.internal.Re:
+    java.lang.Object state -> d
+    1:1:void <init>(java.lang.Object,com.android.tools.r8.utils.DepthFirstSearchWorkListBase$1):81:81 -> <init>
+    2:2:void <init>(java.lang.Object):86:86 -> <init>
+    1:1:java.lang.Object getState():91:91 -> a
+    2:2:void setState(java.lang.Object):96:96 -> a
+    1:1:boolean hasState():101:101 -> c
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList -> com.android.tools.r8.internal.Se:
+    java.util.Map childStateMap -> c
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():183:183 -> <clinit>
+    1:4:void <init>():183:186 -> <init>
+    com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List) -> a
+    com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function) -> a
+    1:2:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState lambda$internalOnVisit$0(java.util.List,java.lang.Object):224:225 -> a
+    3:6:com.android.tools.r8.utils.TraversalContinuation internalOnJoin(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):232:232 -> a
+    1:4:com.android.tools.r8.utils.TraversalContinuation internalOnVisit(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):218:221 -> b
+    1:3:java.util.List lambda$internalOnJoin$1(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):237:237 -> c
+com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.We:
     1:2:java.util.Deque newArrayDeque(java.lang.Object):13:14 -> a
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.pf:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.Ze:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -117825,13 +116690,13 @@
     1:6:boolean isValidJavaType(java.lang.String):123:128 -> x
     1:2:java.lang.String javaTypeToDescriptor(java.lang.String):67:68 -> y
     1:2:java.lang.String javaTypeToDescriptorIgnorePrimitives(java.lang.String):82:83 -> z
-com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.of:
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.Ye:
     java.lang.String module -> a
     java.lang.String descriptor -> b
     1:3:void <init>(java.lang.String,java.lang.String):590:592 -> <init>
     1:1:java.lang.String getDescriptor():600:600 -> a
     1:1:java.lang.String getModule():596:596 -> b
-com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.gh:
+com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.Og:
     1:1:java.lang.String getDefaultDexFileName(int):10:10 -> a
     2:2:java.lang.String getDefaultDexFileName(int):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":14,"2":15,"3":16}}
@@ -117839,7 +116704,7 @@
     15:15:java.lang.String getDefaultDexFileName(int):11:11 -> a
     16:16:java.lang.String getDefaultDexFileName(int):11:11 -> a
     13:13:java.lang.String getDefaultDexFileName(int):11:11 -> a
-com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.ih:
+com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.Qg:
     com.android.tools.r8.utils.DexVersion[] $VALUES -> h
     int dexVersion -> b
     com.android.tools.r8.utils.DexVersion V35 -> d
@@ -117866,10 +116731,10 @@
     4:4:java.util.Optional getDexVersion(int):92:92 -> c
     5:5:java.util.Optional getDexVersion(int):90:90 -> c
     6:6:java.util.Optional getDexVersion(int):88:88 -> c
-com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.hh:
+com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.Pg:
     int[] $SwitchMap$com$android$tools$r8$utils$AndroidApiLevel -> a
     1:1:void <clinit>():40:40 -> <clinit>
-com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.mh:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.Ug:
     com.android.tools.r8.origin.Origin origin -> b
     java.nio.file.Path root -> a
     1:3:void <init>(java.nio.file.Path):24:26 -> <init>
@@ -117885,7 +116750,7 @@
     72:72:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):52:52 -> a
     77:82:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):61:66 -> a
     83:83:java.nio.file.Path getPath() -> a
-com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.ph:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.Xg:
     java.util.Map parent -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -117906,28 +116771,28 @@
     165:165:java.lang.String toString():151:151 -> toString
     166:166:java.lang.String toString():153:153 -> toString
     156:163:java.lang.String toString():154:161 -> toString
-com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.Bh:
+com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.ih:
     1:1:void <init>():8:8 -> <init>
     java.nio.file.Path getDumpInputToDirectory() -> a
     1:1:com.android.tools.r8.utils.DumpInputFlags dumpToDirectory(java.nio.file.Path):39:39 -> a
     java.nio.file.Path getDumpInputToFile() -> b
     1:1:com.android.tools.r8.utils.DumpInputFlags dumpToFile(java.nio.file.Path):25:25 -> b
     1:1:com.android.tools.r8.utils.DumpInputFlags noDump():11:11 -> c
-com.android.tools.r8.utils.DumpInputFlags$1 -> com.android.tools.r8.internal.yh:
+com.android.tools.r8.utils.DumpInputFlags$1 -> com.android.tools.r8.internal.fh:
     1:1:void <init>():11:11 -> <init>
     java.nio.file.Path getDumpInputToDirectory() -> a
     java.nio.file.Path getDumpInputToFile() -> b
-com.android.tools.r8.utils.DumpInputFlags$2 -> com.android.tools.r8.internal.zh:
+com.android.tools.r8.utils.DumpInputFlags$2 -> com.android.tools.r8.internal.gh:
     java.nio.file.Path val$file -> a
     1:1:void <init>(java.nio.file.Path):25:25 -> <init>
     java.nio.file.Path getDumpInputToDirectory() -> a
     1:1:java.nio.file.Path getDumpInputToFile():28:28 -> b
-com.android.tools.r8.utils.DumpInputFlags$3 -> com.android.tools.r8.internal.Ah:
+com.android.tools.r8.utils.DumpInputFlags$3 -> com.android.tools.r8.internal.hh:
     java.nio.file.Path val$file -> a
     1:1:void <init>(java.nio.file.Path):39:39 -> <init>
     1:1:java.nio.file.Path getDumpInputToDirectory():47:47 -> a
     java.nio.file.Path getDumpInputToFile() -> b
-com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.bi:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.Mh:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:6:int putBitsFromRightZeroExtended(com.android.tools.r8.dex.DexOutputBuffer,long,int):84:89 -> a
@@ -117961,7 +116826,7 @@
     1:1:java.lang.String getDiagnosticMessage():65:65 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():51:51 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():56:56 -> getPosition
-com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.ej:
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.Mi:
     1:1:com.android.tools.r8.origin.Origin access$000(java.lang.Throwable):28:28 -> a
     2:7:java.lang.String getMainStackTrace():31:36 -> a
     8:8:boolean lambda$getMainStackTrace$0(java.util.Map$Entry):32:32 -> a
@@ -118017,9 +116882,9 @@
     3:9:com.android.tools.r8.origin.Origin com.android.tools.r8.utils.ExceptionUtils.extractIOExceptionOrigin(java.io.IOException):211:217 -> c
     3:9:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):150 -> c
     10:22:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):152:164 -> c
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.ej$a:
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.fj:
-com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.gj:
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.Mi$a:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.Ni:
+com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.Oi:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     1:3:void <init>(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):263:265 -> <init>
@@ -118063,11 +116928,10 @@
     1:1:void addBaseNonClassMapping(java.lang.String):180:180 -> addBaseNonClassMapping
     1:1:void addMapping(java.lang.String,java.lang.String):184:184 -> addMapping
     1:1:void addNonClassMapping(java.lang.String,java.lang.String):189:189 -> addNonClassMapping
-    1:5:java.lang.String featureForClass(java.lang.String):200:204 -> featureForClass
-    6:11:boolean com.android.tools.r8.utils.FeatureClassMapping$FeaturePredicate.match(java.lang.String):300:305 -> featureForClass
-    6:11:java.lang.String featureForClass(java.lang.String):205 -> featureForClass
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:20:java.lang.String featureForClass(java.lang.String):206:214 -> featureForClass
+    1:6:java.lang.String featureForClass(java.lang.String):200:205 -> featureForClass
+    7:12:boolean com.android.tools.r8.utils.FeatureClassMapping$FeaturePredicate.match(java.lang.String):300:305 -> featureForClass
+    7:12:java.lang.String featureForClass(java.lang.String):205 -> featureForClass
+    13:21:java.lang.String featureForClass(java.lang.String):206:214 -> featureForClass
     1:1:java.lang.String featureForNonClass(java.lang.String):219:219 -> featureForNonClass
     1:1:com.android.tools.r8.utils.FeatureClassMapping fromSpecification(java.nio.file.Path):94:94 -> fromSpecification
     2:13:com.android.tools.r8.utils.FeatureClassMapping fromSpecification(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler):99:110 -> fromSpecification
@@ -118146,7 +117010,7 @@
     80:80:java.lang.String part():77:77 -> part
     81:81:java.lang.String part():77:77 -> part
     82:82:java.lang.String part():77:77 -> part
-com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.ck:
+com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.Ij:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -118169,7 +117033,7 @@
     8:8:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
     8:8:int lambda$static$0(com.android.tools.r8.references.FieldReference,com.android.tools.r8.references.FieldReference):29 -> b
     9:9:int lambda$static$0(com.android.tools.r8.references.FieldReference,com.android.tools.r8.references.FieldReference):31:31 -> b
-com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.gk:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Mj:
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
@@ -118180,7 +117044,7 @@
     4:4:int com.android.tools.r8.utils.FieldSignatureEquivalence.doHash(com.android.tools.r8.graph.DexField):48:48 -> a
     4:4:int doHash(java.lang.Object):14 -> a
     5:5:com.android.tools.r8.utils.FieldSignatureEquivalence get():28:28 -> a
-com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.nk:
+com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.Tj:
     boolean isAndroid -> a
     boolean $assertionsDisabled -> b
     1:16:void <clinit>():21:36 -> <clinit>
@@ -118210,9 +117074,9 @@
     1:1:java.util.List readAllLines(java.nio.file.Path):90:90 -> g
 com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.y:
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
-com.android.tools.r8.utils.FlagFile -> com.android.tools.r8.internal.Fk:
+com.android.tools.r8.utils.FlagFile -> com.android.tools.r8.internal.kk:
     1:15:java.lang.String[] expandFlagFiles(java.lang.String[],java.util.function.Consumer):34:48 -> a
-com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.Ek:
+com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.jk:
     java.nio.file.Path path -> f
     1:2:void <init>(java.nio.file.Path):23:24 -> <init>
     1:1:java.lang.String part():0:0 -> part
@@ -118221,16 +117085,16 @@
     32:32:java.lang.String part():29:29 -> part
     33:33:java.lang.String part():29:29 -> part
     30:30:java.lang.String part():29:29 -> part
-com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.Sk:
-com.android.tools.r8.utils.ForEachableUtils -> com.android.tools.r8.internal.Tk:
+com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.wk:
+com.android.tools.r8.utils.ForEachableUtils -> com.android.tools.r8.internal.xk:
     void lambda$empty$0(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.utils.ForEachable empty():10:10 -> a
-com.android.tools.r8.utils.FunctionUtils -> com.android.tools.r8.internal.Gl:
+com.android.tools.r8.utils.FunctionUtils -> com.android.tools.r8.internal.kl:
     1:1:java.lang.Object applyOrElse(java.lang.Object,java.util.function.Function,java.lang.Object):15:15 -> a
     2:3:void forEachApply(java.lang.Iterable,java.util.function.Function,java.lang.Object):28:29 -> a
     4:4:java.util.function.Function ignoreArgument(java.util.function.Supplier):34:34 -> a
     5:5:java.lang.Object lambda$ignoreArgument$2(java.util.function.Supplier,java.lang.Object):34:34 -> a
-com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.Tm:
+com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.vm:
     com.sun.management.HotSpotDiagnosticMXBean hotSpotDiagnosticMXBean -> a
     1:3:void com.android.tools.r8.utils.HeapUtils.initHotSpotMBean():19:21 -> a
     1:3:void dumpHeap(java.nio.file.Path,boolean):35 -> a
@@ -118240,28 +117104,28 @@
     6:8:void com.android.tools.r8.utils.HeapUtils.initHotSpotMBean():22:24 -> a
     6:8:void dumpHeap(java.nio.file.Path,boolean):35 -> a
     9:9:void dumpHeap(java.nio.file.Path,boolean):36:36 -> a
-com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.Cn:
+com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.hn:
     java.lang.Iterable order(java.lang.Iterable) -> a
-com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.An:
+com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.fn:
     com.android.tools.r8.utils.IROrdering$IdentityIROrdering INSTANCE -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():27:27 -> <init>
     java.lang.Iterable order(java.lang.Iterable) -> a
     1:1:com.android.tools.r8.utils.IROrdering$IdentityIROrdering getInstance():30:30 -> a
-com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.Bn:
+com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.gn:
     com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering INSTANCE -> a
     1:1:void <clinit>():51:51 -> <clinit>
     1:1:void <init>():53:53 -> <init>
     1:1:com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering getInstance():56:56 -> a
     2:3:java.util.List com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering.order(java.lang.Iterable):61:62 -> a
     2:3:java.lang.Iterable order(java.lang.Iterable):49 -> a
-com.android.tools.r8.utils.IdentifierUtils -> com.android.tools.r8.internal.Nn:
+com.android.tools.r8.utils.IdentifierUtils -> com.android.tools.r8.internal.sn:
     1:1:boolean isDexIdentifierPart(int):14:14 -> a
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> b
     1:1:boolean isDexIdentifierStart(int):10 -> b
     1:1:boolean isRelaxedDexIdentifierPart(int):18:18 -> c
     boolean isSimpleNameChar(int) -> d
-com.android.tools.r8.utils.Int2StructuralItemArrayMap -> com.android.tools.r8.internal.bt:
+com.android.tools.r8.utils.Int2StructuralItemArrayMap -> com.android.tools.r8.internal.xs:
     int[] keys -> b
     java.util.List values -> c
     boolean $assertionsDisabled -> d
@@ -118278,8 +117142,7 @@
     1:2:boolean equals(java.lang.Object):63:64 -> equals
     1:1:int hashCode():69:69 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():37:37 -> n
-com.android.tools.r8.utils.Int2StructuralItemArrayMap$1 -> com.android.tools.r8.internal.Zs:
-com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder -> com.android.tools.r8.internal.at:
+com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder -> com.android.tools.r8.internal.ws:
     java.util.List keys -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder values -> b
     1:1:void <init>(com.android.tools.r8.utils.Int2StructuralItemArrayMap$1):80:80 -> <init>
@@ -118296,7 +117159,7 @@
     11:11:com.android.tools.r8.utils.Int2StructuralItemArrayMap build():98 -> a
     12:12:com.android.tools.r8.utils.Int2StructuralItemArrayMap build():98:98 -> a
     1:1:boolean isEmpty():94:94 -> b
-com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.it:
+com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.Es:
     boolean $assertionsDisabled -> b
     int value -> a
     1:1:void <clinit>():7:7 -> <clinit>
@@ -118310,11 +117173,11 @@
     1:1:void increment():48:48 -> c
     2:3:void increment(int):52:53 -> c
     1:1:void set(int):57:57 -> d
-com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.zt:
+com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.Vs:
     void accept(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.At:
+com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.Ws:
     boolean test(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.Bt:
+com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.Xs:
     java.lang.Object apply(int,java.lang.Object) -> a
 com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.z:
     java.util.zip.ZipFile openedZipFile -> e
@@ -118348,7 +117211,7 @@
     122:122:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> getProgramResource
     122:122:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     123:123:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
-com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.mu:
+com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.Gt:
     boolean printTimes -> i
     boolean ignoreMainDexMissingClasses -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
@@ -118473,412 +117336,411 @@
     boolean ignoreBootClasspathEnumsForMaindexTracing -> m0
     boolean enableServiceLoaderRewriting -> B
     com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions -> J0
-    1:32:void <clinit>():106:137 -> <clinit>
-    1:1:void <init>():168:168 -> <init>
-    2:923:void <init>():159:1080 -> <init>
-    924:928:void <init>():169:173 -> <init>
-    929:929:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):177:177 -> <init>
-    930:1851:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):159:1080 -> <init>
-    1852:1859:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):178:185 -> <init>
-    1860:1860:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):190:190 -> <init>
-    1861:2782:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):159:1080 -> <init>
-    2783:2803:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):191:211 -> <init>
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> A
-    1:1:boolean canHaveTracingPastInstructionsStreamBug():2175 -> A
-    2:2:boolean canHaveTracingPastInstructionsStreamBug():2175:2175 -> A
-    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():661:661 -> A0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> B
-    1:1:boolean canHaveZipFileWithMissingCloseableBug():2300 -> B
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> B
-    2:2:boolean canHaveZipFileWithMissingCloseableBug():2300 -> B
-    3:3:boolean canHaveZipFileWithMissingCloseableBug():2300:2300 -> B
-    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():666:666 -> B0
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1949:1949 -> C
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> C
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> C
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1949 -> C
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> C
-    3:3:boolean canInitCauseAfterAssertionErrorObjectConstructor():1949 -> C
-    1:3:boolean isMinifying():595:595 -> C0
-    5:5:boolean isMinifying():597:597 -> C0
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1843:1843 -> D
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> D
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> D
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1843 -> D
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> D
-    3:3:boolean canLeaveStaticInterfaceMethodInvokes():1843 -> D
-    1:1:boolean isOptimizing():581:581 -> D0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> E
-    1:1:boolean canParseNumbersWithPlusPrefix():2316 -> E
-    2:2:boolean canParseNumbersWithPlusPrefix():2316:2316 -> E
-    1:1:boolean isRelease():585:585 -> E0
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1930:1930 -> F
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> F
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> F
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1930 -> F
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> F
-    3:3:boolean canUseAssertionErrorTwoArgumentConstructor():1930 -> F
-    1:1:boolean isRepackagingEnabled():622:622 -> F0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1226:1226 -> F0
-    2:2:boolean isRepackagingEnabled():622 -> F0
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1210:1210 -> F0
-    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1226 -> F0
-    3:3:boolean isRepackagingEnabled():622 -> F0
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4:4:boolean isRepackagingEnabled():622:622 -> F0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> G
-    1:1:boolean canUseConstantMethodHandle():1819 -> G
-    2:2:boolean canUseConstantMethodHandle():1819:1819 -> G
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> G
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> G
-    3:3:boolean canUseConstantMethodHandle():1819 -> G
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> G
-    4:4:boolean canUseConstantMethodHandle():1819 -> G
-    1:3:boolean isShrinking():589:589 -> G0
-    5:5:boolean isShrinking():591:591 -> G0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> H
-    1:1:boolean canUseConstantMethodType():1823 -> H
-    2:2:boolean canUseConstantMethodType():1823:1823 -> H
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> H
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> H
-    3:3:boolean canUseConstantMethodType():1823 -> H
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> H
-    4:4:boolean canUseConstantMethodType():1823 -> H
-    1:1:boolean isStringSwitchConversionEnabled():1904:1904 -> H0
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1831:1831 -> I
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> I
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> I
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1831 -> I
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> I
-    3:3:boolean canUseDefaultAndStaticInterfaceMethods():1831 -> I
-    1:6:void keepDebugRelatedInformation():216:221 -> I0
-    1:2:boolean canUseFilledNewArrayOfObjects():1961:1962 -> J
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> J
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> J
-    3:3:boolean canUseFilledNewArrayOfObjects():1962 -> J
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> J
-    4:4:boolean canUseFilledNewArrayOfObjects():1962 -> J
-    1:2:boolean keepInnerClassStructure():699:700 -> J0
-    1:1:boolean canUseInputStackMaps():704:704 -> K
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> K
-    2:2:boolean canUseInputStackMaps():704 -> K
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():771:771 -> K0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> L
-    1:1:boolean canUseInvokeCustom():1827 -> L
-    2:2:boolean canUseInvokeCustom():1827:1827 -> L
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> L
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> L
-    3:3:boolean canUseInvokeCustom():1827 -> L
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> L
-    4:4:boolean canUseInvokeCustom():1827 -> L
-    1:1:boolean parseSignatureAttribute():631:631 -> L0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> M
-    1:1:boolean canUseInvokePolymorphic():1815 -> M
-    2:2:boolean canUseInvokePolymorphic():1815:1815 -> M
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> M
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> M
-    3:3:boolean canUseInvokePolymorphic():1815 -> M
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> M
-    4:4:boolean canUseInvokePolymorphic():1815 -> M
-    1:32:boolean printWarnings():1100:1131 -> M0
-    33:72:boolean printWarnings():1127:1166 -> M0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> N
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1811 -> N
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1811:1811 -> N
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> N
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> N
-    3:3:boolean canUseInvokePolymorphicOnVarHandle():1811 -> N
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> N
-    4:4:boolean canUseInvokePolymorphicOnVarHandle():1811 -> N
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():767:767 -> N0
-    1:1:boolean canUseJavaUtilObjects():1913:1913 -> O
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> O
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> O
-    2:2:boolean canUseJavaUtilObjects():1913 -> O
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> O
-    3:3:boolean canUseJavaUtilObjects():1913 -> O
-    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1806:1806 -> O0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> O0
-    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1806 -> O0
-    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1806:1807 -> O0
-    1:1:boolean canUseJavaUtilObjectsIsNull():1917:1917 -> P
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> P
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> P
-    2:2:boolean canUseJavaUtilObjectsIsNull():1917 -> P
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> P
-    3:3:boolean canUseJavaUtilObjectsIsNull():1917 -> P
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():421:421 -> P0
-    1:1:boolean shouldBackportMethods():449 -> P0
-    2:2:boolean shouldBackportMethods():449:449 -> P0
-    1:1:boolean canUseJavaUtilObjectsRequireNonNull():1921:1921 -> Q
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> Q
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> Q
-    2:2:boolean canUseJavaUtilObjectsRequireNonNull():1921 -> Q
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> Q
-    3:3:boolean canUseJavaUtilObjectsRequireNonNull():1921 -> Q
-    1:1:boolean shouldDesugarRecords():522:522 -> Q0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1839:1839 -> Q0
-    2:2:boolean shouldDesugarRecords():522 -> Q0
-    1:2:boolean canUseMultidex():1908:1909 -> R
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> R
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> R
-    3:3:boolean canUseMultidex():1909 -> R
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> R
-    4:4:boolean canUseMultidex():1909 -> R
-    1:1:boolean shouldKeepStackMapTable():453:453 -> R0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():445:445 -> R0
-    2:2:boolean shouldKeepStackMapTable():453 -> R0
-    3:4:boolean shouldKeepStackMapTable():453:454 -> R0
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():445:445 -> R0
-    5:5:boolean shouldKeepStackMapTable():455 -> R0
-    6:6:boolean shouldKeepStackMapTable():456:456 -> R0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1880:1880 -> S
-    1:1:boolean canUseNativeDexPcInsteadOfDebugInfo():1884 -> S
-    2:2:boolean canUseNativeDexPcInsteadOfDebugInfo():1884:1884 -> S
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> S
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> S
-    3:3:boolean canUseNativeDexPcInsteadOfDebugInfo():1885 -> S
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> S
-    4:4:boolean canUseNativeDexPcInsteadOfDebugInfo():1885 -> S
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1876:1876 -> S
-    5:5:boolean canUseNativeDexPcInsteadOfDebugInfo():1886 -> S
-    1:1:boolean shouldRerunEnqueuer():460:460 -> S0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> T
-    1:1:boolean canUseNotInstruction():1997 -> T
-    2:2:boolean canUseNotInstruction():1997:1997 -> T
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> T
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> T
-    3:3:boolean canUseNotInstruction():1997 -> T
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> T
-    4:4:boolean canUseNotInstruction():1997 -> T
-    1:18:void signalFinishedToConsumers():496:513 -> T0
-    1:1:boolean canUsePrivateInterfaceMethods():1869:1869 -> U
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> U
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> U
-    2:2:boolean canUsePrivateInterfaceMethods():1869 -> U
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> U
-    3:3:boolean canUsePrivateInterfaceMethods():1869 -> U
-    1:2:void warningReadingKotlinMetadataReflective():1026:1027 -> U0
-    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1970:1970 -> V
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> V
-    2:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1971 -> V
-    3:3:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1971:1971 -> V
-    1:1:boolean canUseSuppressedExceptions():1926:1926 -> W
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> W
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> W
-    2:2:boolean canUseSuppressedExceptions():1926 -> W
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> W
-    3:3:boolean canUseSuppressedExceptions():1926 -> W
-    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():755:755 -> X
-    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():779:779 -> Y
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():144:144 -> Z
+    1:32:void <clinit>():108:139 -> <clinit>
+    1:1:void <init>():170:170 -> <init>
+    2:931:void <init>():161:1090 -> <init>
+    932:936:void <init>():171:175 -> <init>
+    937:937:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):179:179 -> <init>
+    938:1867:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):161:1090 -> <init>
+    1868:1875:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):180:187 -> <init>
+    1876:1876:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):192:192 -> <init>
+    1877:2806:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):161:1090 -> <init>
+    2807:2827:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):193:213 -> <init>
+    1:1:boolean canHaveThisTypeVerifierBug():2026:2026 -> A
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> A
+    2:2:boolean canHaveThisTypeVerifierBug():2026 -> A
+    3:3:boolean canHaveThisTypeVerifierBug():2026:2026 -> A
+    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():652:652 -> A0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> B
+    1:1:boolean canHaveTracingPastInstructionsStreamBug():2197 -> B
+    2:2:boolean canHaveTracingPastInstructionsStreamBug():2197:2197 -> B
+    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():657:657 -> B0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> C
+    1:1:boolean canHaveZipFileWithMissingCloseableBug():2322 -> C
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> C
+    2:2:boolean canHaveZipFileWithMissingCloseableBug():2322 -> C
+    3:3:boolean canHaveZipFileWithMissingCloseableBug():2322:2322 -> C
+    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():662:662 -> C0
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1971:1971 -> D
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> D
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> D
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1971 -> D
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> D
+    3:3:boolean canInitCauseAfterAssertionErrorObjectConstructor():1971 -> D
+    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():667:667 -> D0
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1865:1865 -> E
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> E
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> E
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1865 -> E
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> E
+    3:3:boolean canLeaveStaticInterfaceMethodInvokes():1865 -> E
+    1:3:boolean isMinifying():596:596 -> E0
+    5:5:boolean isMinifying():598:598 -> E0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> F
+    1:1:boolean canParseNumbersWithPlusPrefix():2338 -> F
+    2:2:boolean canParseNumbersWithPlusPrefix():2338:2338 -> F
+    1:1:boolean isOptimizing():582:582 -> F0
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1952:1952 -> G
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> G
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> G
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1952 -> G
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> G
+    3:3:boolean canUseAssertionErrorTwoArgumentConstructor():1952 -> G
+    1:1:boolean isRelease():586:586 -> G0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> H
+    1:1:boolean canUseConstantMethodHandle():1841 -> H
+    2:2:boolean canUseConstantMethodHandle():1841:1841 -> H
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> H
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> H
+    3:3:boolean canUseConstantMethodHandle():1841 -> H
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> H
+    4:4:boolean canUseConstantMethodHandle():1841 -> H
+    1:1:boolean isRepackagingEnabled():623:623 -> H0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1220:1220 -> H0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1236 -> H0
+    2:2:boolean isRepackagingEnabled():623 -> H0
+    3:3:boolean isRepackagingEnabled():623:623 -> H0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> I
+    1:1:boolean canUseConstantMethodType():1845 -> I
+    2:2:boolean canUseConstantMethodType():1845:1845 -> I
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> I
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> I
+    3:3:boolean canUseConstantMethodType():1845 -> I
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> I
+    4:4:boolean canUseConstantMethodType():1845 -> I
+    1:3:boolean isShrinking():590:590 -> I0
+    5:5:boolean isShrinking():592:592 -> I0
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1853:1853 -> J
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> J
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> J
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1853 -> J
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> J
+    3:3:boolean canUseDefaultAndStaticInterfaceMethods():1853 -> J
+    1:1:boolean isStringSwitchConversionEnabled():1926:1926 -> J0
+    1:2:boolean canUseFilledNewArrayOfObjects():1983:1984 -> K
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> K
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> K
+    3:3:boolean canUseFilledNewArrayOfObjects():1984 -> K
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> K
+    4:4:boolean canUseFilledNewArrayOfObjects():1984 -> K
+    1:6:void keepDebugRelatedInformation():218:223 -> K0
+    1:1:boolean canUseInputStackMaps():705:705 -> L
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> L
+    2:2:boolean canUseInputStackMaps():705 -> L
+    1:2:boolean keepInnerClassStructure():700:701 -> L0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> M
+    1:1:boolean canUseInvokeCustom():1849 -> M
+    2:2:boolean canUseInvokeCustom():1849:1849 -> M
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> M
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> M
+    3:3:boolean canUseInvokeCustom():1849 -> M
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> M
+    4:4:boolean canUseInvokeCustom():1849 -> M
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():772:772 -> M0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> N
+    1:1:boolean canUseInvokePolymorphic():1837 -> N
+    2:2:boolean canUseInvokePolymorphic():1837:1837 -> N
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> N
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> N
+    3:3:boolean canUseInvokePolymorphic():1837 -> N
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> N
+    4:4:boolean canUseInvokePolymorphic():1837 -> N
+    1:1:boolean parseSignatureAttribute():632:632 -> N0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> O
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1833 -> O
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1833:1833 -> O
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> O
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> O
+    3:3:boolean canUseInvokePolymorphicOnVarHandle():1833 -> O
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> O
+    4:4:boolean canUseInvokePolymorphicOnVarHandle():1833 -> O
+    1:32:boolean printWarnings():1110:1141 -> O0
+    33:72:boolean printWarnings():1137:1176 -> O0
+    1:1:boolean canUseJavaUtilObjects():1935:1935 -> P
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> P
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> P
+    2:2:boolean canUseJavaUtilObjects():1935 -> P
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> P
+    3:3:boolean canUseJavaUtilObjects():1935 -> P
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():768:768 -> P0
+    1:1:boolean canUseJavaUtilObjectsIsNull():1939:1939 -> Q
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> Q
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> Q
+    2:2:boolean canUseJavaUtilObjectsIsNull():1939 -> Q
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> Q
+    3:3:boolean canUseJavaUtilObjectsIsNull():1939 -> Q
+    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1828:1828 -> Q0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> Q0
+    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1828 -> Q0
+    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1828:1829 -> Q0
+    1:1:boolean canUseJavaUtilObjectsRequireNonNull():1943:1943 -> R
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> R
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> R
+    2:2:boolean canUseJavaUtilObjectsRequireNonNull():1943 -> R
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> R
+    3:3:boolean canUseJavaUtilObjectsRequireNonNull():1943 -> R
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():422:422 -> R0
+    1:1:boolean shouldBackportMethods():450 -> R0
+    2:2:boolean shouldBackportMethods():450:450 -> R0
+    1:2:boolean canUseMultidex():1930:1931 -> S
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> S
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> S
+    3:3:boolean canUseMultidex():1931 -> S
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> S
+    4:4:boolean canUseMultidex():1931 -> S
+    1:1:boolean shouldDesugarRecords():523:523 -> S0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1861:1861 -> S0
+    2:2:boolean shouldDesugarRecords():523 -> S0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1902:1902 -> T
+    1:1:boolean canUseNativeDexPcInsteadOfDebugInfo():1906 -> T
+    2:2:boolean canUseNativeDexPcInsteadOfDebugInfo():1906:1906 -> T
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> T
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> T
+    3:3:boolean canUseNativeDexPcInsteadOfDebugInfo():1907 -> T
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> T
+    4:4:boolean canUseNativeDexPcInsteadOfDebugInfo():1907 -> T
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1898:1898 -> T
+    5:5:boolean canUseNativeDexPcInsteadOfDebugInfo():1908 -> T
+    1:1:boolean shouldKeepStackMapTable():454:454 -> T0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():446:446 -> T0
+    2:2:boolean shouldKeepStackMapTable():454 -> T0
+    3:4:boolean shouldKeepStackMapTable():454:455 -> T0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():446:446 -> T0
+    5:5:boolean shouldKeepStackMapTable():456 -> T0
+    6:6:boolean shouldKeepStackMapTable():457:457 -> T0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> U
+    1:1:boolean canUseNotInstruction():2019 -> U
+    2:2:boolean canUseNotInstruction():2019:2019 -> U
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> U
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> U
+    3:3:boolean canUseNotInstruction():2019 -> U
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> U
+    4:4:boolean canUseNotInstruction():2019 -> U
+    1:1:boolean shouldRerunEnqueuer():461:461 -> U0
+    1:1:boolean canUsePrivateInterfaceMethods():1891:1891 -> V
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> V
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> V
+    2:2:boolean canUsePrivateInterfaceMethods():1891 -> V
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> V
+    3:3:boolean canUsePrivateInterfaceMethods():1891 -> V
+    1:18:void signalFinishedToConsumers():497:514 -> V0
+    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1992:1992 -> W
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> W
+    2:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1993 -> W
+    3:3:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1993:1993 -> W
+    1:2:void warningReadingKotlinMetadataReflective():1036:1037 -> W0
+    1:1:boolean canUseSuppressedExceptions():1948:1948 -> X
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> X
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> X
+    2:2:boolean canUseSuppressedExceptions():1948 -> X
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> X
+    3:3:boolean canUseSuppressedExceptions():1948 -> X
+    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():756:756 -> Y
+    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():780:780 -> Z
+    1:1:boolean access$000(java.lang.String):0:0 -> a
+    2:3:boolean com.android.tools.r8.utils.InternalOptions.isSystemPropertyForDevelopmentSet(java.lang.String):813:814 -> a
+    2:3:boolean access$000(java.lang.String):108 -> a
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions access$200(com.android.tools.r8.utils.InternalOptions):106:106 -> a
-    2:3:void setMarker(com.android.tools.r8.dex.Marker):365:366 -> a
-    4:5:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370:371 -> a
-    6:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):378:384 -> a
-    6:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
-    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    13:13:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):385 -> a
-    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
-    14:19:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):385:390 -> a
-    14:19:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
-    20:20:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> a
-    20:20:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):391 -> a
-    20:20:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
-    21:30:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):391:400 -> a
-    21:30:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
-    31:40:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):407:416 -> a
-    41:42:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):576:577 -> a
-    43:52:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):674:683 -> a
-    53:54:boolean com.android.tools.r8.utils.InternalOptions.isSystemPropertyForDevelopmentSet(java.lang.String):812:813 -> a
-    53:54:boolean access$000(java.lang.String):106 -> a
-    55:57:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):955:957 -> a
-    58:58:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    58:58:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):957 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    59:59:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):957:957 -> a
-    60:60:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):955:955 -> a
-    61:67:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):999:1005 -> a
-    68:68:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):1000:1000 -> a
-    69:70:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1012:1013 -> a
-    71:71:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    71:71:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1015 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    72:78:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1015:1021 -> a
-    79:79:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1013:1013 -> a
-    80:88:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1041:1049 -> a
-    89:89:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1048:1048 -> a
-    90:90:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1042:1042 -> a
-    91:91:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexMethod):1049:1049 -> a
-    92:95:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1054:1057 -> a
-    96:100:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1062:1066 -> a
-    101:107:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1071:1077 -> a
-    108:108:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1072:1072 -> a
-    109:109:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1076:1076 -> a
-    110:115:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1180:1185 -> a
-    116:116:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1801:1801 -> a
-    117:117:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    117:117:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1801 -> a
-    118:119:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1801:1802 -> a
-    1:3:void disableAllOptimizations():234:236 -> a0
-    1:1:com.android.tools.r8.utils.Box access$300(com.android.tools.r8.utils.InternalOptions):106:106 -> b
-    2:5:int com.android.tools.r8.utils.InternalOptions.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,int):820:823 -> b
-    2:5:int access$100(java.lang.String,int):106 -> b
-    6:39:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):961:994 -> b
-    40:40:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):1065:1065 -> b
-    1:14:void disableGlobalOptimizations():240:253 -> b0
-    15:15:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableApiCallerIdentification():1537:1537 -> b0
-    15:15:void disableGlobalOptimizations():253 -> b0
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():775:775 -> c
-    2:2:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):1056:1056 -> c
-    1:1:void disableNameReflectionOptimization():1768:1768 -> c0
-    1:1:boolean assertionsEnabled():922:922 -> d
-    2:11:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1083:1092 -> d
-    12:18:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1088:1094 -> d
-    1:1:boolean enableBackportedMethodRewriting():1855:1855 -> d0
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> d0
-    2:2:boolean enableBackportedMethodRewriting():1855 -> d0
-    3:3:boolean enableBackportedMethodRewriting():1855:1855 -> d0
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():751:751 -> e
-    1:6:void enableProtoShrinking():225:230 -> e0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> f
-    1:1:boolean canHaveArtCheckCastVerifierBug():2247 -> f
-    2:2:boolean canHaveArtCheckCastVerifierBug():2247:2247 -> f
-    1:5:boolean enableTryWithResourcesDesugaring():1859:1863 -> f0
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1847:1847 -> f0
-    6:6:boolean enableTryWithResourcesDesugaring():1863 -> f0
-    7:7:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> f0
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772 -> f0
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1847 -> f0
-    7:7:boolean enableTryWithResourcesDesugaring():1863 -> f0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1772:1772 -> f0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1847 -> f0
-    8:8:boolean enableTryWithResourcesDesugaring():1863 -> f0
-    9:9:boolean enableTryWithResourcesDesugaring():1865:1865 -> f0
-    1:1:boolean canHaveArtInstanceOfVerifierBug():2202:2202 -> g
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> g
-    2:2:boolean canHaveArtInstanceOfVerifierBug():2203 -> g
-    3:3:boolean canHaveArtInstanceOfVerifierBug():2203:2203 -> g
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():800:808 -> g0
-    1:1:boolean canHaveArtStringNewInitBug():2127:2127 -> h
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> h
-    2:2:boolean canHaveArtStringNewInitBug():2127 -> h
-    3:3:boolean canHaveArtStringNewInitBug():2127:2127 -> h
-    1:9:java.util.Set getExtensiveLoggingFilter():787:795 -> h0
-    1:1:boolean canHaveBoundsCheckEliminationBug():1988:1988 -> i
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> i
-    2:2:boolean canHaveBoundsCheckEliminationBug():1988 -> i
-    3:3:boolean canHaveBoundsCheckEliminationBug():1988:1988 -> i
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():425:425 -> i0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():421:421 -> i0
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():425 -> i0
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():425:425 -> i0
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():468:468 -> i0
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():426 -> i0
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():427:427 -> i0
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():472:472 -> i0
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():428 -> i0
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():429:429 -> i0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> i0
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():430 -> i0
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():431:433 -> i0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> j
-    1:1:boolean canHaveCmpIfFloatBug():2080 -> j
-    2:2:boolean canHaveCmpIfFloatBug():2080:2080 -> j
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():572:572 -> j0
-    1:1:boolean canHaveCmpLongBug():2052:2052 -> k
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> k
-    2:2:boolean canHaveCmpLongBug():2052 -> k
-    3:3:boolean canHaveCmpLongBug():2052:2052 -> k
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():152:152 -> k0
-    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2279:2279 -> l
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> l
-    2:2:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2279 -> l
-    3:3:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2279:2279 -> l
-    1:1:boolean hasMethodsFilter():1175:1175 -> l0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> m
-    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():2271 -> m
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> m
-    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():2271 -> m
-    3:3:boolean canHaveDalvikCatchHandlerVerificationBug():2271:2271 -> m
-    1:1:boolean hasProguardConfiguration():148:148 -> m0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> n
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2293 -> n
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> n
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2293 -> n
-    3:3:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2293:2293 -> n
-    1:1:boolean hasUsageInformationConsumer():879:879 -> n0
-    1:1:boolean canHaveDex2OatInliningIssue():2119:2119 -> o
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> o
-    2:2:boolean canHaveDex2OatInliningIssue():2119 -> o
-    3:3:boolean canHaveDex2OatInliningIssue():2119:2119 -> o
-    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():763:763 -> o0
-    1:1:boolean canHaveDex2OatLinkedListBug():2111:2111 -> p
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> p
-    2:2:boolean canHaveDex2OatLinkedListBug():2111 -> p
-    3:3:boolean canHaveDex2OatLinkedListBug():2111:2111 -> p
-    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():759:759 -> p0
-    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():2160:2160 -> q
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> q
-    2:2:boolean canHaveExceptionTargetingLoopHeaderBug():2160 -> q
-    3:3:boolean canHaveExceptionTargetingLoopHeaderBug():2160:2160 -> q
-    1:1:boolean isDesugaredLibraryCompilation():441:441 -> q0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> r
-    1:1:boolean canHaveExceptionTypeBug():2239 -> r
-    2:2:boolean canHaveExceptionTypeBug():2239:2239 -> r
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> r0
-    1:1:boolean isDesugaring():480 -> r0
-    2:2:boolean isDesugaring():480:480 -> r0
-    1:1:boolean canHaveForwardingInitInliningBug():2148:2148 -> s
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> s
-    2:2:boolean canHaveForwardingInitInliningBug():2148 -> s
-    3:3:boolean canHaveForwardingInitInliningBug():2148:2148 -> s
-    1:1:boolean isGeneratingClassFiles():476:476 -> s0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> t
-    1:1:boolean canHaveLongToIntBug():2226 -> t
-    2:2:boolean canHaveLongToIntBug():2226:2226 -> t
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():468:468 -> t0
-    1:1:boolean isGeneratingDex():464 -> t0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():472:472 -> t0
-    2:2:boolean isGeneratingDex():464 -> t0
-    1:1:boolean canHaveMul2AddrBug():2102:2102 -> u
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> u
-    2:2:boolean canHaveMul2AddrBug():2102 -> u
-    3:3:boolean canHaveMul2AddrBug():2102:2102 -> u
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():421:421 -> u0
-    1:1:boolean isInterfaceMethodDesugaringEnabled():1891 -> u0
-    2:4:boolean isInterfaceMethodDesugaringEnabled():1894:1896 -> u0
-    1:1:boolean canHaveNumberConversionRegisterAllocationBug():2135:2135 -> v
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> v
-    2:2:boolean canHaveNumberConversionRegisterAllocationBug():2135 -> v
-    3:3:boolean canHaveNumberConversionRegisterAllocationBug():2135:2135 -> v
-    1:1:boolean isKeepAttributesSignatureEnabled():636:636 -> v0
-    1:1:boolean canHaveOverlappingLongRegisterBug():2019:2019 -> w
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> w
-    2:2:boolean canHaveOverlappingLongRegisterBug():2019 -> w
-    3:3:boolean canHaveOverlappingLongRegisterBug():2019:2019 -> w
-    1:1:boolean isKeepEnclosingMethodAttributeEnabled():641:641 -> w0
-    1:1:boolean canHaveSwitchMaxIntBug():2308:2308 -> x
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> x
-    2:2:boolean canHaveSwitchMaxIntBug():2308 -> x
-    3:3:boolean canHaveSwitchMaxIntBug():2308:2308 -> x
-    1:1:boolean isKeepInnerClassesAttributeEnabled():646:646 -> x0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> y
-    1:1:boolean canHaveThisJitCodeDebuggingBug():2013 -> y
-    2:2:boolean canHaveThisJitCodeDebuggingBug():2013:2013 -> y
-    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():651:651 -> y0
-    1:1:boolean canHaveThisTypeVerifierBug():2004:2004 -> z
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> z
-    2:2:boolean canHaveThisTypeVerifierBug():2004 -> z
-    3:3:boolean canHaveThisTypeVerifierBug():2004:2004 -> z
-    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():656:656 -> z0
-com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.ku:
+    4:4:com.android.tools.r8.utils.InternalOptions$InlinerOptions access$200(com.android.tools.r8.utils.InternalOptions):108:108 -> a
+    5:6:void setMarker(com.android.tools.r8.dex.Marker):366:367 -> a
+    7:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):371:372 -> a
+    9:15:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):379:385 -> a
+    9:15:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):374 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    16:16:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):386 -> a
+    16:16:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):374 -> a
+    17:22:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):386:391 -> a
+    17:22:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):374 -> a
+    23:23:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> a
+    23:23:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):392 -> a
+    23:23:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):374 -> a
+    24:33:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):392:401 -> a
+    24:33:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):374 -> a
+    34:43:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):408:417 -> a
+    44:45:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):577:578 -> a
+    46:55:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):675:684 -> a
+    56:58:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):965:967 -> a
+    59:59:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    59:59:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):967 -> a
+    60:60:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):967:967 -> a
+    61:61:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):965:965 -> a
+    62:68:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):1009:1015 -> a
+    69:69:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):1010:1010 -> a
+    70:73:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1022:1025 -> a
+    74:74:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    74:74:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1025 -> a
+    75:81:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1025:1031 -> a
+    82:82:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1023:1023 -> a
+    83:91:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1051:1059 -> a
+    92:92:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1058:1058 -> a
+    93:93:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1052:1052 -> a
+    94:94:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexMethod):1059:1059 -> a
+    95:98:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1064:1067 -> a
+    99:103:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1072:1076 -> a
+    104:110:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1081:1087 -> a
+    111:111:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1082:1082 -> a
+    112:112:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1086:1086 -> a
+    113:118:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1190:1195 -> a
+    119:119:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1823:1823 -> a
+    120:120:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    120:120:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1823 -> a
+    121:122:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1823:1824 -> a
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():146:146 -> a0
+    1:1:int access$100(java.lang.String,int):0:0 -> b
+    2:5:int com.android.tools.r8.utils.InternalOptions.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,int):821:824 -> b
+    2:5:int access$100(java.lang.String,int):108 -> b
+    6:6:com.android.tools.r8.utils.Box access$300(com.android.tools.r8.utils.InternalOptions):108:108 -> b
+    7:40:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):971:1004 -> b
+    41:41:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):1075:1075 -> b
+    1:3:void disableAllOptimizations():236:238 -> b0
+    1:1:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():776:776 -> c
+    2:2:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):1066:1066 -> c
+    1:13:void disableGlobalOptimizations():242:254 -> c0
+    14:14:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableApiCallerIdentification():1559:1559 -> c0
+    14:14:void disableGlobalOptimizations():254 -> c0
+    1:1:boolean assertionsEnabled():932:932 -> d
+    2:11:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1093:1102 -> d
+    12:18:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1098:1104 -> d
+    1:1:void disableNameReflectionOptimization():1790:1790 -> d0
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():752:752 -> e
+    1:1:boolean enableBackportedMethodRewriting():1877:1877 -> e0
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> e0
+    2:2:boolean enableBackportedMethodRewriting():1877 -> e0
+    3:3:boolean enableBackportedMethodRewriting():1877:1877 -> e0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> f
+    1:1:boolean canHaveArtCheckCastVerifierBug():2269 -> f
+    2:2:boolean canHaveArtCheckCastVerifierBug():2269:2269 -> f
+    1:6:void enableProtoShrinking():227:232 -> f0
+    1:1:boolean canHaveArtInstanceOfVerifierBug():2224:2224 -> g
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> g
+    2:2:boolean canHaveArtInstanceOfVerifierBug():2225 -> g
+    3:3:boolean canHaveArtInstanceOfVerifierBug():2225:2225 -> g
+    1:5:boolean enableTryWithResourcesDesugaring():1881:1885 -> g0
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1869:1869 -> g0
+    6:6:boolean enableTryWithResourcesDesugaring():1885 -> g0
+    7:7:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> g0
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794 -> g0
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1869 -> g0
+    7:7:boolean enableTryWithResourcesDesugaring():1885 -> g0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1794:1794 -> g0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1869 -> g0
+    8:8:boolean enableTryWithResourcesDesugaring():1885 -> g0
+    9:9:boolean enableTryWithResourcesDesugaring():1887:1887 -> g0
+    1:1:boolean canHaveArtStringNewInitBug():2149:2149 -> h
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> h
+    2:2:boolean canHaveArtStringNewInitBug():2149 -> h
+    3:3:boolean canHaveArtStringNewInitBug():2149:2149 -> h
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():801:809 -> h0
+    1:1:boolean canHaveBoundsCheckEliminationBug():2010:2010 -> i
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> i
+    2:2:boolean canHaveBoundsCheckEliminationBug():2010 -> i
+    3:3:boolean canHaveBoundsCheckEliminationBug():2010:2010 -> i
+    1:9:java.util.Set getExtensiveLoggingFilter():788:796 -> i0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> j
+    1:1:boolean canHaveCmpIfFloatBug():2102 -> j
+    2:2:boolean canHaveCmpIfFloatBug():2102:2102 -> j
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():426:426 -> j0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():422:422 -> j0
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():426 -> j0
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():426:426 -> j0
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():469:469 -> j0
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():427 -> j0
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():428:428 -> j0
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():473:473 -> j0
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():429 -> j0
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():430:430 -> j0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> j0
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():431 -> j0
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():432:434 -> j0
+    1:1:boolean canHaveCmpLongBug():2074:2074 -> k
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> k
+    2:2:boolean canHaveCmpLongBug():2074 -> k
+    3:3:boolean canHaveCmpLongBug():2074:2074 -> k
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():573:573 -> k0
+    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2301:2301 -> l
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> l
+    2:2:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2301 -> l
+    3:3:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2301:2301 -> l
+    1:6:com.android.tools.r8.ir.desugar.PrefixRewritingMapper getPrefixRewritingMapper():897:902 -> l0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> m
+    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():2293 -> m
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> m
+    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():2293 -> m
+    3:3:boolean canHaveDalvikCatchHandlerVerificationBug():2293:2293 -> m
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():154:154 -> m0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> n
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2315 -> n
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> n
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2315 -> n
+    3:3:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2315:2315 -> n
+    1:1:boolean hasMethodsFilter():1185:1185 -> n0
+    1:1:boolean canHaveDex2OatInliningIssue():2141:2141 -> o
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> o
+    2:2:boolean canHaveDex2OatInliningIssue():2141 -> o
+    3:3:boolean canHaveDex2OatInliningIssue():2141:2141 -> o
+    1:1:boolean hasProguardConfiguration():150:150 -> o0
+    1:1:boolean canHaveDex2OatLinkedListBug():2133:2133 -> p
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> p
+    2:2:boolean canHaveDex2OatLinkedListBug():2133 -> p
+    3:3:boolean canHaveDex2OatLinkedListBug():2133:2133 -> p
+    1:1:boolean hasUsageInformationConsumer():880:880 -> p0
+    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():2182:2182 -> q
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> q
+    2:2:boolean canHaveExceptionTargetingLoopHeaderBug():2182 -> q
+    3:3:boolean canHaveExceptionTargetingLoopHeaderBug():2182:2182 -> q
+    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():764:764 -> q0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> r
+    1:1:boolean canHaveExceptionTypeBug():2261 -> r
+    2:2:boolean canHaveExceptionTypeBug():2261:2261 -> r
+    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():760:760 -> r0
+    1:1:boolean canHaveForwardingInitInliningBug():2170:2170 -> s
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> s
+    2:2:boolean canHaveForwardingInitInliningBug():2170 -> s
+    3:3:boolean canHaveForwardingInitInliningBug():2170:2170 -> s
+    1:1:boolean isDesugaredLibraryCompilation():442:442 -> s0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> t
+    1:1:boolean canHaveLongToIntBug():2248 -> t
+    2:2:boolean canHaveLongToIntBug():2248:2248 -> t
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> t0
+    1:1:boolean isDesugaring():481 -> t0
+    2:2:boolean isDesugaring():481:481 -> t0
+    1:1:boolean canHaveMul2AddrBug():2124:2124 -> u
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> u
+    2:2:boolean canHaveMul2AddrBug():2124 -> u
+    3:3:boolean canHaveMul2AddrBug():2124:2124 -> u
+    1:1:boolean isGeneratingClassFiles():477:477 -> u0
+    1:1:boolean canHaveNumberConversionRegisterAllocationBug():2157:2157 -> v
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> v
+    2:2:boolean canHaveNumberConversionRegisterAllocationBug():2157 -> v
+    3:3:boolean canHaveNumberConversionRegisterAllocationBug():2157:2157 -> v
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():469:469 -> v0
+    1:1:boolean isGeneratingDex():465 -> v0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():473:473 -> v0
+    2:2:boolean isGeneratingDex():465 -> v0
+    1:1:boolean canHaveOverlappingLongRegisterBug():2041:2041 -> w
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> w
+    2:2:boolean canHaveOverlappingLongRegisterBug():2041 -> w
+    3:3:boolean canHaveOverlappingLongRegisterBug():2041:2041 -> w
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():422:422 -> w0
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1913 -> w0
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1916:1918 -> w0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> x
+    1:1:boolean canHaveSuperInvokeBug():2346 -> x
+    2:2:boolean canHaveSuperInvokeBug():2346:2346 -> x
+    1:1:boolean isKeepAttributesSignatureEnabled():637:637 -> x0
+    1:1:boolean canHaveSwitchMaxIntBug():2330:2330 -> y
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> y
+    2:2:boolean canHaveSwitchMaxIntBug():2330 -> y
+    3:3:boolean canHaveSwitchMaxIntBug():2330:2330 -> y
+    1:1:boolean isKeepEnclosingMethodAttributeEnabled():642:642 -> y0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():573:573 -> z
+    1:1:boolean canHaveThisJitCodeDebuggingBug():2035 -> z
+    2:2:boolean canHaveThisJitCodeDebuggingBug():2035:2035 -> z
+    1:1:boolean isKeepInnerClassesAttributeEnabled():647:647 -> z0
+com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.Et:
     int[] $SwitchMap$com$android$tools$r8$utils$OffOrAuto -> a
-    1:1:void <clinit>():1859:1859 -> <clinit>
-com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.mu$a:
+    1:1:void <clinit>():1881:1881 -> <clinit>
+com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.Gt$a:
     java.util.Map methodApiMapping -> a
     java.util.Map fieldApiMapping -> b
     java.util.Map classApiMapping -> c
@@ -118887,61 +117749,63 @@
     boolean checkAllApiReferencesAreSet -> f
     boolean enableStubbingOfClasses -> g
     boolean enableOutliningOfMethods -> h
-    1:16:void <init>():1468:1483 -> <init>
-    1:11:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1487:1497 -> a
-    12:12:void lambda$visitMockedApiLevelsForReferences$0(java.util.Set,com.android.tools.r8.references.MethodReference):1493:1493 -> a
-    13:13:void lambda$visitMockedApiLevelsForReferences$1(java.util.Set,com.android.tools.r8.references.FieldReference):1496:1496 -> a
-    14:14:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.Consumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference):1499:1499 -> a
-com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions$1 -> com.android.tools.r8.internal.lu:
+    1:16:void <init>():1490:1505 -> <init>
+    1:11:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1509:1519 -> a
+    12:12:void lambda$visitMockedApiLevelsForReferences$0(java.util.Set,com.android.tools.r8.references.MethodReference):1515:1515 -> a
+    13:13:void lambda$visitMockedApiLevelsForReferences$1(java.util.Set,com.android.tools.r8.references.FieldReference):1518:1518 -> a
+    14:14:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.Consumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference):1521:1521 -> a
+com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions$1 -> com.android.tools.r8.internal.Ft:
     com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions this$0 -> c
     com.android.tools.r8.references.ClassReference val$classReference -> b
     com.android.tools.r8.graph.DexItemFactory val$factory -> a
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference):1500:1500 -> <init>
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1508:1508 -> a
-    2:2:void visitMethodsWithApiLevels(java.util.function.BiConsumer):1514:1514 -> a
-    3:4:void lambda$visitMethodsWithApiLevels$0(com.android.tools.r8.references.ClassReference,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.MethodReference,com.android.tools.r8.utils.AndroidApiLevel):1516:1517 -> a
-    5:6:void lambda$visitFieldsWithApiLevels$1(com.android.tools.r8.references.ClassReference,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.FieldReference,com.android.tools.r8.utils.AndroidApiLevel):1527:1528 -> a
-    1:1:void visitFieldsWithApiLevels(java.util.function.BiConsumer):1525:1525 -> b
-    1:1:com.android.tools.r8.graph.DexType getType():1503:1503 -> getType
-com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.mu$b:
-    com.android.tools.r8.utils.InternalOptions this$0 -> c
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference):1522:1522 -> <init>
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1530:1530 -> a
+    2:2:void visitMethodsWithApiLevels(java.util.function.BiConsumer):1536:1536 -> a
+    3:4:void lambda$visitMethodsWithApiLevels$0(com.android.tools.r8.references.ClassReference,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.MethodReference,com.android.tools.r8.utils.AndroidApiLevel):1538:1539 -> a
+    5:6:void lambda$visitFieldsWithApiLevels$1(com.android.tools.r8.references.ClassReference,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.FieldReference,com.android.tools.r8.utils.AndroidApiLevel):1549:1550 -> a
+    1:1:void visitFieldsWithApiLevels(java.util.function.BiConsumer):1547:1547 -> b
+    1:1:com.android.tools.r8.graph.DexType getType():1525:1525 -> getType
+com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.Gt$b:
+    com.android.tools.r8.utils.InternalOptions this$0 -> d
+    boolean $assertionsDisabled -> e
     boolean enabled -> a
     boolean enableMethodStaticizing -> b
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():1262:1262 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.utils.InternalOptions):1262:1265 -> <init>
-    1:1:void disableOptimization():1268:1268 -> a
-    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnableMethodStaticizing(boolean):1296:1296 -> a
-    1:4:boolean isEnabled():1276:1279 -> b
-    5:5:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1288:1288 -> b
-    6:6:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1268:1268 -> b
-    6:6:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1290 -> b
-    1:1:boolean isMethodStaticizingEnabled():1283:1283 -> c
-com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions -> com.android.tools.r8.internal.mu$c:
+    boolean forceSyntheticsForInstanceInitializers -> c
+    1:1:void <clinit>():1272:1272 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):1272:1277 -> <init>
+    1:1:void disableOptimization():1280:1280 -> a
+    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnableMethodStaticizing(boolean):1318:1318 -> a
+    1:4:boolean isEnabled():1288:1291 -> b
+    5:5:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1304:1304 -> b
+    6:6:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1280:1280 -> b
+    6:6:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1306 -> b
+    1:1:boolean isForceSyntheticsForInstanceInitializersEnabled():1295:1295 -> c
+    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setForceSyntheticsForInstanceInitializers(boolean):1313:1313 -> c
+    1:1:boolean isMethodStaticizingEnabled():1299:1299 -> d
+com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions -> com.android.tools.r8.internal.Gt$c:
     com.android.tools.r8.utils.InternalOptions this$0 -> b
     boolean $assertionsDisabled -> c
     int classInliningInstructionAllowance -> a
-    1:1:void <clinit>():1301:1301 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1301:1303 -> <init>
-    1:4:int getClassInliningInstructionAllowance():1306:1309 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    5:5:int getClassInliningInstructionAllowance():1309 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:int getClassInliningInstructionAllowance():1312:1312 -> a
-com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.mu$d:
+    1:1:void <clinit>():1323:1323 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1323:1325 -> <init>
+    1:4:int getClassInliningInstructionAllowance():1328:1331 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    5:5:int getClassInliningInstructionAllowance():1331 -> a
+    6:6:int getClassInliningInstructionAllowance():1334:1334 -> a
+com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.Gt$d:
     boolean sortMethodsOnCfOutput -> a
     boolean allowAllDesugaredInput -> b
     boolean noCfMarkerForDesugaredCode -> c
     boolean lambdaClassFieldsFinal -> d
-    1:15:void <init>():1245:1259 -> <init>
-com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.mu$e:
+    1:15:void <init>():1255:1269 -> <init>
+com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.Gt$e:
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> c
-    1:2:void <clinit>():121:122 -> <clinit>
-    1:1:void <init>(java.lang.String,int):120:120 -> <init>
-    1:1:boolean isOff():125:125 -> a
-    1:1:boolean isOn():129:129 -> b
-com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.mu$f:
+    1:2:void <clinit>():123:124 -> <clinit>
+    1:1:void <init>(java.lang.String,int):122:122 -> <init>
+    1:1:boolean isOff():127:127 -> a
+    1:1:boolean isOn():131:131 -> b
+com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.Gt$f:
     boolean enableSyntheticMerging -> e
     boolean restrictToSynthetics -> f
     com.android.tools.r8.utils.InternalOptions this$0 -> g
@@ -118950,23 +117814,23 @@
     boolean enableClassInitializerDeadlockDetection -> b
     boolean enableInterfaceMerging -> c
     boolean enableInterfaceMergingInInitial -> d
-    1:1:void <clinit>():1366:1366 -> <clinit>
-    1:14:void <init>(com.android.tools.r8.utils.InternalOptions):1366:1379 -> <init>
-    1:1:void disable():1382:1382 -> a
-    2:2:void enableIf(boolean):1394:1394 -> a
-    3:9:boolean isEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1414:1420 -> a
-    1:1:void disableSyntheticMerging():1386:1386 -> b
-    2:8:boolean isInterfaceMergingEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1433:1439 -> b
-    1:1:void enable():1390:1390 -> c
+    1:1:void <clinit>():1388:1388 -> <clinit>
+    1:14:void <init>(com.android.tools.r8.utils.InternalOptions):1388:1401 -> <init>
+    1:1:void disable():1404:1404 -> a
+    2:2:void enableIf(boolean):1416:1416 -> a
+    3:9:boolean isEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1436:1442 -> a
+    1:1:void disableSyntheticMerging():1408:1408 -> b
+    2:8:boolean isInterfaceMergingEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1455:1461 -> b
+    1:1:void enable():1412:1412 -> c
     int getMaxClassGroupSize() -> d
-    1:1:boolean isClassInitializerDeadlockDetectionEnabled():1410:1410 -> e
-    1:1:boolean isRestrictedToSynthetics():1444:1444 -> f
-    1:1:boolean isSyntheticMergingEnabled():1429:1429 -> g
-    1:1:void setEnableClassInitializerDeadlockDetection():1448:1448 -> h
-    1:1:void setEnableInterfaceMerging():1452:1452 -> i
-    1:1:void setEnableInterfaceMergingInInitial():1456:1456 -> j
-    1:1:void setRestrictToSynthetics():1464:1464 -> k
-com.android.tools.r8.utils.InternalOptions$InlinerOptions -> com.android.tools.r8.internal.mu$g:
+    1:1:boolean isClassInitializerDeadlockDetectionEnabled():1432:1432 -> e
+    1:1:boolean isRestrictedToSynthetics():1466:1466 -> f
+    1:1:boolean isSyntheticMergingEnabled():1451:1451 -> g
+    1:1:void setEnableClassInitializerDeadlockDetection():1470:1470 -> h
+    1:1:void setEnableInterfaceMerging():1474:1474 -> i
+    1:1:void setEnableInterfaceMergingInInitial():1478:1478 -> j
+    1:1:void setRestrictToSynthetics():1486:1486 -> k
+com.android.tools.r8.utils.InternalOptions$InlinerOptions -> com.android.tools.r8.internal.Gt$g:
     boolean $assertionsDisabled -> m
     boolean enableInliningOfInvokesWithClassInitializationSideEffects -> i
     boolean enableInliningOfInvokesWithNullableReceivers -> j
@@ -118980,50 +117844,49 @@
     int[] multiCallerInliningInstructionLimits -> c
     boolean applyInliningToInlinee -> g
     boolean enableInlining -> a
-    1:1:void <clinit>():1317:1317 -> <clinit>
-    1:33:void <init>(com.android.tools.r8.utils.InternalOptions):1317:1349 -> <init>
-    1:5:int getSimpleInliningInstructionLimit():1353:1357 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
-    6:6:int getSimpleInliningInstructionLimit():1357 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:int getSimpleInliningInstructionLimit():1361:1361 -> a
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.nu:
+    1:1:void <clinit>():1339:1339 -> <clinit>
+    1:33:void <init>(com.android.tools.r8.utils.InternalOptions):1339:1371 -> <init>
+    1:5:int getSimpleInliningInstructionLimit():1375:1379 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
+    6:6:int getSimpleInliningInstructionLimit():1379 -> a
+    7:7:int getSimpleInliningInstructionLimit():1383:1383 -> a
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.Ht:
     int expectedParameterCount -> b
     int actualParameterCount -> c
     com.android.tools.r8.graph.DexMethod method -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):836:839 -> <init>
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.ou:
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):837:840 -> <init>
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.It:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():1238:1240 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.mu$h:
+    1:3:void <init>():1248:1250 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.Gt$h:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> c
-    1:2:void <clinit>():116:117 -> <clinit>
-    1:1:void <init>(java.lang.String,int):115:115 -> <init>
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.mu$i:
+    1:2:void <clinit>():118:119 -> <clinit>
+    1:1:void <init>(java.lang.String,int):117:117 -> <init>
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.Gt$i:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:5:void <init>():1230:1234 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.mu$j:
+    1:5:void <init>():1240:1244 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.Gt$j:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> e
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode MINIFICATION -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> b
-    1:8:void <clinit>():1200:1207 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1198:1198 -> <init>
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.mu$k:
+    1:8:void <clinit>():1210:1217 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1208:1208 -> <init>
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.Gt$k:
     boolean enableEnumLiteProtoShrinking -> e
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:7:void <init>():1541:1547 -> <init>
-    1:1:boolean enableRemoveProtoEnumSwitchMap():1561:1561 -> a
-    1:1:boolean isEnumLiteProtoShrinkingEnabled():1572:1572 -> b
-    1:1:boolean isProtoShrinkingEnabled():1565:1565 -> c
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.mu$l:
+    1:7:void <init>():1563:1569 -> <init>
+    1:1:boolean enableRemoveProtoEnumSwitchMap():1583:1583 -> a
+    1:1:boolean isEnumLiteProtoShrinkingEnabled():1594:1594 -> b
+    1:1:boolean isProtoShrinkingEnabled():1587:1587 -> c
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.Gt$l:
     boolean disableMarkingClassesFinal -> d0
     boolean keepMetadataInR8IfNotRewritten -> f0
     boolean enableTestAssertions -> b0
@@ -119098,24 +117961,24 @@
     boolean forceRedundantConstNumberRemoval -> B
     boolean enableD8ResourcesPassThrough -> i0
     boolean verifyKeptGraphInfo -> k0
-    1:180:void <init>():1576:1755 -> <init>
+    1:180:void <init>():1598:1777 -> <init>
     com.android.tools.r8.graph.DexProgramClass lambda$new$0(com.android.tools.r8.graph.AppView,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass) -> a
     void lambda$new$1(java.util.Deque) -> a
-    1:1:void allowExperimentClassFileVersion(com.android.tools.r8.utils.InternalOptions):1579:1579 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.mu$l$a:
+    1:1:void allowExperimentClassFileVersion(com.android.tools.r8.utils.InternalOptions):1601:1601 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.Gt$l$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1726:1728 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1732:1733 -> a
-    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1734:1734 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.mu$l$b:
+    1:3:void <init>():1748:1750 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1754:1755 -> a
+    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1756:1756 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.Gt$l$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1744:1747 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.pu:
+    1:4:void <init>():1766:1769 -> <init>
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.Jt:
     com.android.tools.r8.cf.CfVersion version -> a
     com.android.tools.r8.graph.DexType type -> b
-    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):848:850 -> <init>
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.qu:
+    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):849:851 -> <init>
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.Kt:
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> d
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> b
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> c
@@ -119123,7 +117986,7 @@
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean isGeneratingClassFiles():13:13 -> a
     1:1:boolean isGeneratingDex():17:17 -> b
-com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.av:
+com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.uu:
     1:7:boolean allIdentical(java.lang.Iterable,java.util.function.Function):27:33 -> a
     8:9:boolean any(java.lang.Iterable,java.util.function.Function,java.util.function.Predicate):43:44 -> a
     10:10:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):92:92 -> a
@@ -119142,7 +118005,7 @@
     1:1:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):92:92 -> d
     2:2:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.filter(java.util.Iterator,java.util.function.Predicate):49:49 -> d
     2:2:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):92 -> d
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.jv:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Du:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:java.util.Iterator createCircularIterator(java.lang.Iterable):21:22 -> a
@@ -119156,12 +118019,12 @@
     1:3:java.lang.Object nextUntil(java.util.Iterator,java.util.function.Predicate):82:84 -> b
     4:6:java.lang.Object peekPrevious(java.util.ListIterator):92:94 -> b
     7:13:java.lang.Object previousUntil(java.util.ListIterator,java.util.function.Predicate):109:115 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.hv:
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Bu:
     java.util.Iterator iterator -> b
     java.lang.Iterable val$iterable -> c
     1:3:void <init>(java.lang.Iterable):22:24 -> <init>
     1:4:java.lang.Object next():33:36 -> next
-com.android.tools.r8.utils.IteratorUtils$2 -> com.android.tools.r8.internal.iv:
+com.android.tools.r8.utils.IteratorUtils$2 -> com.android.tools.r8.internal.Cu:
     java.util.Iterator val$iterator -> c
     java.lang.Object next -> b
     java.util.function.Predicate val$predicate -> d
@@ -119170,7 +118033,7 @@
     1:3:java.lang.Object advance():55:57 -> l
     1:5:java.lang.Object next():71:75 -> next
     6:6:java.lang.Object next():73:73 -> next
-com.android.tools.r8.utils.JoiningStringConsumer -> com.android.tools.r8.internal.Jv:
+com.android.tools.r8.utils.JoiningStringConsumer -> com.android.tools.r8.internal.cv:
     com.android.tools.r8.StringConsumer consumer -> c
     java.lang.String separator -> b
     java.lang.StringBuilder builder -> d
@@ -119179,7 +118042,7 @@
     1:1:com.android.tools.r8.StringConsumer getConsumer():42:42 -> a
     1:4:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):29:32 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):37:38 -> finished
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.MA:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.Vz:
     int rowCapacity -> b
     int columnCapacity -> c
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -119187,15 +118050,15 @@
     2:3:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
     1:1:com.android.tools.r8.utils.LRUCacheTable create(int,int):37:37 -> e
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.LA:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.Uz:
     int columnCapacity -> b
     1:2:void <init>(int,float):17:18 -> <init>
     1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
-com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.lB:
+com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.uA:
     java.util.function.Supplier supplier -> b
     1:2:void <init>(java.util.function.Supplier):13:14 -> <init>
     1:1:java.lang.Object computeIfAbsent():18:18 -> d
-com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.qB:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.zA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -119206,12 +118069,15 @@
     17:21:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> b
     1:1:int sizeAsSleb128(int):110:110 -> c
     1:1:int sizeAsUleb128(int):57:57 -> d
-com.android.tools.r8.utils.LensUtils -> com.android.tools.r8.internal.BB:
-    1:4:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):28:31 -> a
-    5:5:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    5:5:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):31 -> a
-    6:9:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):31:34 -> a
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.CB:
+com.android.tools.r8.utils.LensUtils -> com.android.tools.r8.internal.LA:
+    1:1:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):28:28 -> a
+    2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.GraphLens.rewriteReference(com.android.tools.r8.graph.DexReference):635:635 -> a
+    2:2:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):28 -> a
+    3:3:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):31:31 -> a
+    4:4:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    4:4:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):31 -> a
+    5:8:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):31:34 -> a
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.MA:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):15:15 -> <init>
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):13:13 -> a
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13:13 -> a
@@ -119226,7 +118092,7 @@
     42:42:java.lang.String toString():39:39 -> toString
     43:43:java.lang.String toString():39:39 -> toString
     40:40:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.hC:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.rB:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():90:90 -> <clinit>
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> a
@@ -119235,9 +118101,8 @@
     3:3:void access$1700(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):90:90 -> a
     4:14:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId runAndWriteMap(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.OriginalSourceFiles):338:348 -> a
     15:23: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,com.android.tools.r8.utils.OriginalSourceFiles):471:479 -> a
-    24:24:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1876:1876 -> a
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1898:1898 -> a
     24:24: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,com.android.tools.r8.utils.OriginalSourceFiles):479 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:29: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,com.android.tools.r8.utils.OriginalSourceFiles):479:483 -> a
     30:30:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
     30:30: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,com.android.tools.r8.utils.OriginalSourceFiles):483 -> a
@@ -119252,146 +118117,145 @@
     68:86: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,com.android.tools.r8.utils.OriginalSourceFiles):523:541 -> a
     87:87:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):808:808 -> a
     87: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,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
-    88:88:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    88:88:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():477:477 -> a
     88:88:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):808 -> 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,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
     89:104:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):808:823 -> a
     89:104:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
-    105:105:boolean com.android.tools.r8.shaking.KeepInfoCollection.isMinificationAllowed(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):186 -> a
+    105:105:boolean com.android.tools.r8.shaking.KeepInfoCollection.isMinificationAllowed(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):186:186 -> a
     105:105:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):823 -> a
     105:105:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
-    106:106:boolean com.android.tools.r8.shaking.KeepInfoCollection.isMinificationAllowed(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):187:187 -> a
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():613:613 -> a
+    106:106:boolean com.android.tools.r8.shaking.KeepInfoCollection.isMinificationAllowed(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):186 -> a
     106:106:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):823 -> a
     106:106:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
-    107:123:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):827:843 -> a
-    107:123: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,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
-    124:142: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,com.android.tools.r8.utils.OriginalSourceFiles):545:563 -> a
-    143:143:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1880:1880 -> a
-    143:143: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,com.android.tools.r8.utils.OriginalSourceFiles):563 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    144:146: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,com.android.tools.r8.utils.OriginalSourceFiles):563:565 -> a
-    147:155:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.DexCode):947:955 -> a
-    147: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,com.android.tools.r8.utils.OriginalSourceFiles):565 -> a
-    156:168:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1123:1135 -> a
-    156:168:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
-    169:169:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    169:169:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1135 -> a
-    169:169:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
-    170:203:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1135:1168 -> a
-    170:203: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
-    204:219:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1165:1180 -> a
-    204:219: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
-    220:223:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1179:1182 -> a
-    220:223: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
-    224:224: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,com.android.tools.r8.utils.OriginalSourceFiles):573:573 -> a
-    225:238:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):978:991 -> a
-    225:238: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
-    239:239:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    239:239:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):991 -> a
-    239:239: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
-    240:249:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):991:1000 -> a
-    240:249: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
-    250:250:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    250:250:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1000 -> a
-    250:250: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
-    251:328:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1000:1077 -> a
-    251:328: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
-    329:329:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1876:1876 -> a
-    329:329:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1077 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    329:329: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
-    330:342:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1078:1090 -> a
-    330:342: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
-    343:346:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo,com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):1189:1192 -> a
-    343:346:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1091 -> a
-    343:346: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
-    347:347:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1093:1093 -> a
-    347:347: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
-    348:349: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,com.android.tools.r8.utils.OriginalSourceFiles):575:576 -> a
-    350:352:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.CfCode):963:965 -> a
-    350:352: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,com.android.tools.r8.utils.OriginalSourceFiles):576 -> a
-    353:353: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,com.android.tools.r8.utils.OriginalSourceFiles):577:577 -> a
-    354:366:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1199:1211 -> a
-    354:366: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
-    367:378:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1231:1242 -> a
-    367:378:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1211 -> a
-    367:378: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
-    379:379:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1234:1234 -> a
-    379:379:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1211 -> a
-    379:379: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
-    380:393:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1211:1224 -> a
-    380:393: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
-    394:394:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> a
-    394:394:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1224 -> a
-    394:394: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
-    395:395:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1217:1217 -> a
+    107:107:boolean com.android.tools.r8.shaking.KeepInfoCollection.isMinificationAllowed(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):187:187 -> a
+    107:107:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):823 -> a
+    107:107:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
+    108:124:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):827:843 -> a
+    108:124: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,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
+    125:143: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,com.android.tools.r8.utils.OriginalSourceFiles):545:563 -> a
+    144:144:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1902:1902 -> a
+    144:144: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,com.android.tools.r8.utils.OriginalSourceFiles):563 -> a
+    145:147: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,com.android.tools.r8.utils.OriginalSourceFiles):563:565 -> a
+    148:156:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.DexCode):947:955 -> a
+    148:156: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,com.android.tools.r8.utils.OriginalSourceFiles):565 -> a
+    157:169:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1123:1135 -> a
+    157:169:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
+    170:170:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    170:170:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1135 -> a
+    170:170: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
+    171:204:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1135:1168 -> a
+    171:204: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
+    205:220:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1165:1180 -> a
+    205:220: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
+    221:224:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1179:1182 -> a
+    221:224: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
+    225:225: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,com.android.tools.r8.utils.OriginalSourceFiles):573:573 -> a
+    226:239:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):978:991 -> a
+    226:239: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    240:240:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    240:240:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):991 -> a
+    240:240: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    241:250:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):991:1000 -> a
+    241:250: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    251:251:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    251:251:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1000 -> a
+    251:251: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    252:329:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1000:1077 -> a
+    252:329: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    330:330:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1898:1898 -> a
+    330:330:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1077 -> a
+    330:330: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    331:343:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1078:1090 -> a
+    331:343: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    344:347:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo,com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):1189:1192 -> a
+    344:347:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1091 -> a
+    344:347: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    348:348:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1093:1093 -> a
+    348:348: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    349:350: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,com.android.tools.r8.utils.OriginalSourceFiles):575:576 -> a
+    351:353:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.CfCode):963:965 -> a
+    351:353: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,com.android.tools.r8.utils.OriginalSourceFiles):576 -> a
+    354:354: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,com.android.tools.r8.utils.OriginalSourceFiles):577:577 -> a
+    355:367:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1199:1211 -> a
+    355:367: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    368:379:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1231:1242 -> a
+    368:379:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1211 -> a
+    368:379: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    380:380:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1234:1234 -> a
+    380:380:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1211 -> a
+    380:380: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    381:394:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1211:1224 -> a
+    381:394: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    395:395:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):172:172 -> a
+    395:395:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1224 -> a
     395:395:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
-    396:403: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,com.android.tools.r8.utils.OriginalSourceFiles):580:587 -> a
-    404:404:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    404:404: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,com.android.tools.r8.utils.OriginalSourceFiles):587 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    405:423:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):588:606 -> a
-    424:452: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,com.android.tools.r8.utils.OriginalSourceFiles):604:632 -> a
-    453:460:com.android.tools.r8.graph.DexMethod com.android.tools.r8.utils.LineNumberOptimizer.getOutlineMethod(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):757:764 -> a
-    453:460: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,com.android.tools.r8.utils.OriginalSourceFiles):632 -> a
-    461:463: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,com.android.tools.r8.utils.OriginalSourceFiles):634:636 -> a
-    464:464:com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation$Builder.build():56:56 -> a
-    464:464: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,com.android.tools.r8.utils.OriginalSourceFiles):637 -> a
-    465:530: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,com.android.tools.r8.utils.OriginalSourceFiles):637:702 -> a
-    531:569: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,com.android.tools.r8.utils.OriginalSourceFiles):694:732 -> a
-    570:580: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,com.android.tools.r8.utils.OriginalSourceFiles):731:741 -> a
-    581:594: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,com.android.tools.r8.utils.OriginalSourceFiles):740:753 -> a
-    595:596: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):497:498 -> a
-    597:597: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):496:496 -> a
-    598:598:void lambda$run$4(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):620:620 -> a
-    599:599:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$6(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):628:628 -> a
-    600:600:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):629:629 -> a
-    601:615:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.lang.Integer,com.android.tools.r8.ir.code.Position):714:728 -> a
-    616:616:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.lang.Integer,com.android.tools.r8.ir.code.Position):720:720 -> a
-    617:617:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$10(com.android.tools.r8.graph.DexMethod):732:732 -> a
-    618:618:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):779:779 -> a
-    619:631:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):777:789 -> a
-    632:639:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):786:793 -> a
-    640:640:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation.builder():109:109 -> a
-    640:640:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):793 -> a
-    641:644:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):793:796 -> a
-    645:645:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):795:795 -> a
-    646:646:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):794:794 -> a
-    647:647:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction.create(int):269:269 -> a
-    647:647:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):797 -> a
-    648:649:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):797:798 -> a
-    650:659:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):792:801 -> a
-    660:660:void sortMethods(java.util.List):871:871 -> a
-    661:662:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):873:874 -> a
-    663:663:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1249:1249 -> a
-    663:663:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):877 -> a
-    664:664: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):899:899 -> a
-    665:669:void lambda$addFieldsToClassNaming$13(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):901:905 -> a
-    670:670:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):185:185 -> a
-    670:670:void lambda$addFieldsToClassNaming$13(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):906 -> a
-    671:671:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
-    671:671:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
+    396:396:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1217:1217 -> a
+    396: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    397:404: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,com.android.tools.r8.utils.OriginalSourceFiles):580:587 -> a
+    405:405:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    405:405: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,com.android.tools.r8.utils.OriginalSourceFiles):587 -> a
+    406:424: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,com.android.tools.r8.utils.OriginalSourceFiles):588:606 -> a
+    425:453: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,com.android.tools.r8.utils.OriginalSourceFiles):604:632 -> a
+    454:461:com.android.tools.r8.graph.DexMethod com.android.tools.r8.utils.LineNumberOptimizer.getOutlineMethod(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):757:764 -> a
+    454:461: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,com.android.tools.r8.utils.OriginalSourceFiles):632 -> a
+    462:464: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,com.android.tools.r8.utils.OriginalSourceFiles):634:636 -> a
+    465:465:com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation$Builder.build():56:56 -> a
+    465:465: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,com.android.tools.r8.utils.OriginalSourceFiles):637 -> a
+    466:531: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,com.android.tools.r8.utils.OriginalSourceFiles):637:702 -> a
+    532:570: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,com.android.tools.r8.utils.OriginalSourceFiles):694:732 -> a
+    571:581: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,com.android.tools.r8.utils.OriginalSourceFiles):731:741 -> a
+    582:595: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,com.android.tools.r8.utils.OriginalSourceFiles):740:753 -> a
+    596:597: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):497:498 -> a
+    598:598: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):496:496 -> a
+    599:599:void lambda$run$4(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):620:620 -> a
+    600:600:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$6(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):628:628 -> a
+    601:601:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):629:629 -> a
+    602:616:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.lang.Integer,com.android.tools.r8.ir.code.Position):714:728 -> a
+    617:617:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.lang.Integer,com.android.tools.r8.ir.code.Position):720:720 -> a
+    618:618:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$10(com.android.tools.r8.graph.DexMethod):732:732 -> a
+    619:619:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):779:779 -> a
+    620:632:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):777:789 -> a
+    633:640:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):786:793 -> a
+    641:641:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation.builder():109:109 -> a
+    641:641:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):793 -> a
+    642:645:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):793:796 -> a
+    646:646:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):795:795 -> a
+    647:647:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):794:794 -> a
+    648:648:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction.create(int):269:269 -> a
+    648:648:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):797 -> a
+    649:650:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):797:798 -> a
+    651:660:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):792:801 -> a
+    661:661:void sortMethods(java.util.List):871:871 -> a
+    662:663:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):873:874 -> a
+    664:664:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1249:1249 -> a
+    664:664:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):877 -> a
+    665:665: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):899:899 -> a
+    666:670:void lambda$addFieldsToClassNaming$13(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):901:905 -> a
+    671:671:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):185:185 -> a
     671:671:void lambda$addFieldsToClassNaming$13(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):906 -> a
-    672:673:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186:187 -> a
-    672:673:void lambda$addFieldsToClassNaming$13(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):906 -> a
-    674:675:void lambda$addFieldsToClassNaming$13(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):907:908 -> a
-    676:682:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):915:921 -> a
-    683:683:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    683:683:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):922 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    684:688:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):923:927 -> a
-    689:689:java.util.List lambda$groupMethodsByRenamedName$14(com.android.tools.r8.graph.DexString):926:926 -> a
-    690:695:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):934:939 -> a
-    696:704:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.DexCode):947:955 -> a
-    696:704:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):939 -> a
-    705:706:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):940:941 -> a
-    707:709:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.CfCode):963:965 -> a
-    707:709:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):941 -> a
-    710:721:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1231:1242 -> a
-    710:721:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):90 -> a
-    722:722:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1234:1234 -> a
-    722:722:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):90 -> a
+    672:672:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
+    672:672:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
+    672:672:void lambda$addFieldsToClassNaming$13(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):906 -> a
+    673:674:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186:187 -> a
+    673:674:void lambda$addFieldsToClassNaming$13(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):906 -> a
+    675:676:void lambda$addFieldsToClassNaming$13(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):907:908 -> a
+    677:684:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):915:922 -> a
+    685:685:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    685:685:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):922 -> a
+    686:690:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):923:927 -> a
+    691:691:java.util.List lambda$groupMethodsByRenamedName$14(com.android.tools.r8.graph.DexString):926:926 -> a
+    692:697:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):934:939 -> a
+    698:706:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.DexCode):947:955 -> a
+    698:706:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):939 -> a
+    707:708:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):940:941 -> a
+    709:711:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.CfCode):963:965 -> a
+    709:711:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):941 -> a
+    712:723:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1231:1242 -> a
+    712:723:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):90 -> a
+    724:724:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1234:1234 -> a
+    724:724:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):90 -> a
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> b
     1:1:void lambda$run$1(java.lang.Object):508 -> b
     2:2:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$7(com.android.tools.r8.graph.DexMethod):635:635 -> b
@@ -119405,7 +118269,7 @@
     1:1:void lambda$run$3(java.lang.Object):620 -> d
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> e
     1:1:void lambda$run$8(java.lang.Object):704 -> e
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.VB:
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.fB:
     java.util.List val$processedEvents -> o
     boolean $assertionsDisabled -> p
     int emittedPc -> j
@@ -119428,7 +118292,7 @@
     23:23:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):1034:1034 -> a
     24:24:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):1039:1039 -> a
     25:25:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):1044:1044 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.WB:
+com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.gB:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> l
     com.android.tools.r8.utils.BooleanBox val$singleOriginalLine -> k
@@ -119438,13 +118302,13 @@
     1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1135:1135 -> <init>
     1:12:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1138:1149 -> a
     13:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1146:1155 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.XB:
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.hB:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():100:100 -> <clinit>
     1:1:void <init>():100:100 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):100:100 -> <init>
     1:2:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):105:106 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.YB:
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.iB:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> g
     java.util.Map parsedKotlinSourceDebugExtensions -> c
@@ -119471,7 +118335,7 @@
     42:52:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):193:203 -> a
     53:75:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):200:222 -> a
     76:88:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):217:229 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.ZB:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.jB:
     boolean isOutline -> e
     com.android.tools.r8.graph.DexMethod outlineCallee -> f
     int obfuscatedLine -> d
@@ -119489,7 +118353,7 @@
     1:1:com.android.tools.r8.ir.code.Position access$700(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):300:300 -> e
     1:1:com.android.tools.r8.graph.DexMethod access$800(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):300:300 -> f
     1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap access$900(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):300:300 -> g
-com.android.tools.r8.utils.LineNumberOptimizer$NativePcSupport -> com.android.tools.r8.internal.aC:
+com.android.tools.r8.utils.LineNumberOptimizer$NativePcSupport -> com.android.tools.r8.internal.kB:
     1:1:void <init>():438:438 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):438:438 -> <init>
     void updateDebugInfoInCodeObjects() -> a
@@ -119497,7 +118361,7 @@
     2:2:void com.android.tools.r8.utils.LineNumberOptimizer$NativePcSupport.recordSingleLineFor(com.android.tools.r8.graph.DexCode,int):449:449 -> a
     2:2:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int):454 -> a
     1:1:void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int):443:443 -> b
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.bC:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.lB:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
@@ -119507,7 +118371,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):116:116 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):112:120 -> <init>
     1:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):125:142 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder -> com.android.tools.r8.internal.cC:
+com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder -> com.android.tools.r8.internal.mB:
     java.util.List mappedOutlineCalleePositions -> b
     java.util.List mappedOutlinePositions -> a
     boolean $assertionsDisabled -> c
@@ -119518,14 +118382,17 @@
     1:1:void lambda$fixup$1(java.lang.Object):1306 -> a
     2:2:void setMappedPositionsOutline(java.util.List):1279:1279 -> a
     3:3:void addMappedRangeForOutlineCallee(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):1284:1284 -> a
-    4:22:void fixup():1288:1306 -> a
-    23:23:void fixup():1305:1305 -> a
-    24:25:void fixup():1289:1290 -> a
-    26:26:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1300:1300 -> a
-    27:29:int com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder.getMinifiedLinePosition(int,java.util.List):1312:1314 -> a
-    27:29:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1300 -> a
-    30:30:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1302:1302 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport -> com.android.tools.r8.internal.dC:
+    4:12:void fixup():1288:1296 -> a
+    13:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.<init>():176:176 -> a
+    13:13:void fixup():1296 -> a
+    14:23:void fixup():1297:1306 -> a
+    24:24:void fixup():1305:1305 -> a
+    25:26:void fixup():1289:1290 -> a
+    27:27:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1300:1300 -> a
+    28:30:int com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder.getMinifiedLinePosition(int,java.util.List):1312:1314 -> a
+    28:30:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1300 -> a
+    31:31:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1302:1302 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport -> com.android.tools.r8.internal.nB:
     java.util.List codesToUpdate -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap paramToMaxPc -> a
     java.util.List singleLineCodesToClear -> c
@@ -119547,12 +118414,12 @@
     40:40:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):425 -> a
     41:41:void lambda$updateDebugInfoInCodeObjects$2(com.android.tools.r8.graph.DexCode):429:429 -> a
     1:4:void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int):388:391 -> b
-com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder -> com.android.tools.r8.internal.eC:
+com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder -> com.android.tools.r8.internal.oB:
     void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int) -> a
     void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int) -> a
     void updateDebugInfoInCodeObjects() -> a
     void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int) -> b
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.fC:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.pB:
     java.util.List processedEvents -> f
     int previousPc -> d
     boolean $assertionsDisabled -> g
@@ -119564,18 +118431,17 @@
     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):256:256 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):265:265 -> <init>
     3:13:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):258:268 -> <init>
-    1:2:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitAdvancePc(int):272:273 -> a
-    1:2:void access$1200(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):256 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:16:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitPositionEvents(int,com.android.tools.r8.ir.code.Position):277:290 -> a
-    3:16:void access$1500(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):256 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:18:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():294:295 -> a
-    17:18:int access$1600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):256 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.gC:
+    1:1:void access$1200(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):256:256 -> a
+    2:3:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitAdvancePc(int):272:273 -> a
+    2:3:void access$1200(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):256 -> a
+    4:4:void access$1500(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):256:256 -> a
+    5:18:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitPositionEvents(int,com.android.tools.r8.ir.code.Position):277:290 -> a
+    5:18:void access$1500(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):256 -> a
+    19:20:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():294:295 -> a
+    19:20:int access$1600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):256 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.qB:
     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.tC:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.DB:
     1:2:java.util.List flatMap(java.util.List,java.util.function.Function):52:53 -> a
     3:3:void lambda$flatMap$0(java.util.List,java.util.function.Function,java.lang.Object):53:53 -> a
     4:5:java.util.List filter(java.util.Collection,java.util.function.Predicate):58:59 -> a
@@ -119598,8 +118464,9 @@
     18:20:com.android.tools.r8.com.google.common.collect.ImmutableList newImmutableList(com.android.tools.r8.utils.ForEachable):215:217 -> b
     1:2:int firstIndexMatching(java.util.List,java.util.function.Predicate):78:79 -> c
     1:2:int lastIndexMatching(java.util.List,java.util.function.Predicate):91:92 -> d
-com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.sC:
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.iD:
+    1:3:int uniqueIndexMatching(java.util.List,java.util.function.Predicate):284:286 -> e
+com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.CB:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.qC:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -119620,7 +118487,7 @@
     77:77:java.lang.String toString():74:74 -> toString
     78:78:java.lang.String toString():74:74 -> toString
     75:75:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.ED:
+com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.LC:
     1:1:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:21 -> a
     2:2:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41,"3":42}}
@@ -119656,7 +118523,7 @@
     76:76:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     76:76:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37 -> a
     77:77:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
-com.android.tools.r8.utils.MapIdTemplateProvider -> com.android.tools.r8.internal.GD:
+com.android.tools.r8.utils.MapIdTemplateProvider -> com.android.tools.r8.internal.NC:
     java.util.Map HANDLERS -> c
     java.lang.String template -> a
     java.lang.String cachedValue -> b
@@ -119681,7 +118548,7 @@
     57:63:com.android.tools.r8.MapIdProvider create(java.lang.String,com.android.tools.r8.DiagnosticsHandler):45:51 -> a
     69:69:void lambda$get$0(com.android.tools.r8.MapIdEnvironment,java.lang.String,com.android.tools.r8.MapIdProvider):67:67 -> a
     1:8:java.lang.String get(com.android.tools.r8.MapIdEnvironment):63:70 -> get
-com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.JD:
+com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.QC:
     1:1:java.util.Map clone(java.util.Map,java.util.Map,java.util.function.Function):25:25 -> a
     2:2:void lambda$clone$0(java.util.Map,java.util.function.Function,java.lang.Object,java.lang.Object):25:25 -> a
     3:3:java.util.function.Function ignoreKey(java.util.function.Supplier):38:38 -> a
@@ -119696,7 +118563,7 @@
     1:1:java.lang.String lambda$toString$4(java.util.Map$Entry):57:57 -> b
     2:2:java.lang.String toString(java.util.Map):57:57 -> b
     3:3:java.lang.String toString(java.util.Map):56:56 -> b
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.WE:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.YD:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -119710,7 +118577,7 @@
     7:10:int doHash(java.lang.Object):15 -> a
     11:11:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> a
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> b
-com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal.lF:
+com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal.nE:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():24:24 -> <clinit>
@@ -119756,7 +118623,7 @@
     22:22:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
     22:22:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):52 -> b
     23:23:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):55:55 -> b
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.nF:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.pE:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
@@ -119767,10 +118634,10 @@
     4:4:int com.android.tools.r8.utils.MethodSignatureEquivalence.doHash(com.android.tools.r8.graph.DexMethod):48:48 -> a
     4:4:int doHash(java.lang.Object):14 -> a
     5:5:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> a
-com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.LK:
+com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.HJ:
     1:1:boolean getBooleanOrElse(java.lang.Object,java.util.function.Predicate,boolean):14:14 -> a
     2:2:java.lang.Object mapNotNullOrDefault(java.lang.Object,java.lang.Object,java.util.function.Function):31:31 -> a
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.QK:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.MJ:
     com.android.tools.r8.utils.OffOrAuto Auto -> c
     com.android.tools.r8.utils.OffOrAuto Off -> b
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> d
@@ -119792,7 +118659,7 @@
     1:1:java.util.Set getClassDescriptors():59:59 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.hL:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.dK:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> c
     com.android.tools.r8.utils.OptionalBool TRUE -> a
     com.android.tools.r8.utils.OptionalBool FALSE -> b
@@ -119801,22 +118668,22 @@
     1:1:com.android.tools.r8.utils.OptionalBool of(boolean):69:69 -> a
     int ordinal() -> f
     1:1:int hashCode():88:88 -> hashCode
-com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.eL:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.aK:
     1:1:void <init>():10:10 -> <init>
     boolean isTrue() -> d
     int ordinal() -> f
     1:1:java.lang.String toString():24:24 -> toString
-com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.fL:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.bK:
     1:1:void <init>():29:29 -> <init>
     boolean isFalse() -> a
     int ordinal() -> f
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.gL:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.cK:
     1:1:void <init>():48:48 -> <init>
     boolean isUnknown() -> e
     int ordinal() -> f
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.kL:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.gK:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:13:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):37:49 -> a
@@ -119830,14 +118697,14 @@
     96:96:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):65:65 -> a
     91:93:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):65:67 -> a
     1:11:java.util.List tryParseMulti(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):18:28 -> b
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.jL:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.fK:
     java.lang.String[] args -> a
     int nextIndex -> b
     1:1:void <init>(java.lang.String[]):76:76 -> <init>
     2:5:void <init>(java.lang.String[]):74:77 -> <init>
     1:1:java.lang.String head():81:81 -> a
     1:5:java.lang.String next():85:89 -> b
-com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.pL:
+com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.lK:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     1:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):14:16 -> <init>
@@ -119845,7 +118712,7 @@
     1:1:com.android.tools.r8.position.Position getPosition():24:24 -> b
     1:3:boolean equals(java.lang.Object):34:36 -> equals
     1:1:int hashCode():29:29 -> hashCode
-com.android.tools.r8.utils.OriginalSourceFiles -> com.android.tools.r8.internal.tL:
+com.android.tools.r8.utils.OriginalSourceFiles -> com.android.tools.r8.internal.pK:
     com.android.tools.r8.utils.OriginalSourceFiles UNREACHABLE -> a
     com.android.tools.r8.utils.OriginalSourceFiles FROM_CLASSES -> b
     1:9:void <clinit>():15:23 -> <clinit>
@@ -119854,17 +118721,17 @@
     1:1:com.android.tools.r8.utils.OriginalSourceFiles fromClasses():38:38 -> a
     2:2:com.android.tools.r8.utils.OriginalSourceFiles fromMap(java.util.Map):43:43 -> a
     1:1:com.android.tools.r8.utils.OriginalSourceFiles unreachable():33:33 -> b
-com.android.tools.r8.utils.OriginalSourceFiles$1 -> com.android.tools.r8.internal.qL:
+com.android.tools.r8.utils.OriginalSourceFiles$1 -> com.android.tools.r8.internal.mK:
     1:1:void <init>():16:16 -> <init>
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):19:19 -> a
-com.android.tools.r8.utils.OriginalSourceFiles$2 -> com.android.tools.r8.internal.rL:
+com.android.tools.r8.utils.OriginalSourceFiles$2 -> com.android.tools.r8.internal.nK:
     1:1:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
-com.android.tools.r8.utils.OriginalSourceFiles$3 -> com.android.tools.r8.internal.sL:
+com.android.tools.r8.utils.OriginalSourceFiles$3 -> com.android.tools.r8.internal.oK:
     java.util.Map val$map -> c
     1:1:void <init>(java.util.Map):43:43 -> <init>
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):46:46 -> a
-com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.RL:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.NK:
 # {"id":"sourceFile","fileName":"Pair.java"}
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -119883,7 +118750,7 @@
     59:59:java.lang.String toString():56:56 -> toString
     60:60:java.lang.String toString():56:56 -> toString
     57:57:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.FM:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.yL:
     java.util.List predicates -> b
     java.util.Set elements -> a
     1:4:void <init>():14:17 -> <init>
@@ -119892,13 +118759,13 @@
     3:3:com.android.tools.r8.utils.PredicateSet empty():28:28 -> a
     4:10:com.android.tools.r8.utils.PredicateSet rewriteItems(java.util.function.Function):32:38 -> a
     1:5:boolean contains(java.lang.Object):43:47 -> b
-com.android.tools.r8.utils.PredicateUtils -> com.android.tools.r8.internal.GM:
+com.android.tools.r8.utils.PredicateUtils -> com.android.tools.r8.internal.zL:
     1:2:java.lang.Object findFirst(java.lang.Object[],java.util.function.Predicate):13:14 -> a
     3:3:boolean lambda$not$0(java.util.function.Predicate,java.lang.Object):22:22 -> a
     4:4:java.util.function.Predicate not(java.util.function.Predicate):22:22 -> a
     5:5:java.util.function.Predicate isNull(java.util.function.Function):26:26 -> a
     6:6:boolean lambda$isNull$1(java.util.function.Function,java.lang.Object):26:26 -> a
-com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.UM:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.ML:
     java.util.Map content -> b
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.PreloadedClassFileProvider$1):19:19 -> <init>
     2:3:void <init>(java.util.Map):37:38 -> <init>
@@ -119917,8 +118784,7 @@
     1:6:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):48:53 -> getProgramResource
     7:7:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):52:52 -> getProgramResource
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.internal.TM:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.UM$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.ML$a:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
@@ -119927,11 +118793,11 @@
     3:3:void <init>():76:76 -> <init>
     1:5:com.android.tools.r8.utils.PreloadedClassFileProvider$Builder addResource(java.lang.String,byte[]):82:86 -> a
     6:8:com.android.tools.r8.utils.PreloadedClassFileProvider build():91:93 -> a
-com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.VM:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.NL:
     java.lang.String descriptor -> f
     1:2:void <init>(java.lang.String):25:26 -> <init>
     1:1:java.lang.String part():31:31 -> part
-com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.tN:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.kM:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -119944,39 +118810,44 @@
     10:10:java.util.function.Supplier lambda$create$0(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,java.util.function.Supplier,java.util.function.Supplier):28:28 -> a
     11:11:com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver defaultConflictResolver(com.android.tools.r8.utils.Reporter):63:63 -> a
     12:13:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):64:65 -> a
-    14:14:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):82:82 -> a
-    14:14:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
-    15:16:boolean com.android.tools.r8.graph.DexType.isSynthesizedTypeAllowedDuplication():348:349 -> a
-    15:16:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):83 -> a
-    15:16:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
-    17:19:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:76 -> a
-    17:19:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):87 -> a
-    17:19:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
-    20:20:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    20:20:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
-    20:20:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):87 -> a
-    20:20:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
-    21:21:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:77 -> a
+    14:15:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):82:83 -> a
+    14:15:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
+    16:17:boolean com.android.tools.r8.graph.DexType.isSynthesizedTypeAllowedDuplication():348:349 -> a
+    16:17:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):83 -> a
+    16:17:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
+    18:20:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:76 -> a
+    18:20:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):87 -> a
+    18:20:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
+    21:21:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    21:21:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
     21:21:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):87 -> a
     21:21:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
-    22:22:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
+    22:22:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:77 -> a
     22:22:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):87 -> a
     22:22:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
-    23:25:boolean com.android.tools.r8.utils.ProgramClassCollection.assertEqualClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):91:91 -> a
-    23:25:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):84 -> a
-    23:25:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
-    27:27:boolean com.android.tools.r8.utils.ProgramClassCollection.assertEqualClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):93:93 -> a
-    27:27:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):84 -> a
-    27:27:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
-    28:30:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:76 -> a
-    28:30:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):68 -> a
-    31:31:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    31:31:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
-    31:31:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):68 -> a
-    32:32:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:77 -> a
+    23:23:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
+    23:23:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):87 -> a
+    23:23:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
+    24:26:boolean com.android.tools.r8.utils.ProgramClassCollection.assertEqualClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):91:91 -> a
+    24:26:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):84 -> a
+    24:26:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
+    28:28:boolean com.android.tools.r8.utils.ProgramClassCollection.assertEqualClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):93:93 -> a
+    28:28:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):84 -> a
+    28:28:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):66 -> a
+    29:31:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:76 -> a
+    29:31:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):68 -> a
+    32:32:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    32:32:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
     32:32:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):68 -> a
-    33:33:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
+    33:33:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:77 -> a
     33:33:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):68 -> a
+    34:34:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    34:34:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
+    34:34:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):68 -> a
+    35:35:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:77 -> a
+    35:35:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):68 -> a
+    36:36:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
+    36:36:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):68 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():57:57 -> c
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":44,"2":45,"3":46}}
@@ -119984,7 +118855,7 @@
     45:45:java.lang.String toString():42:42 -> toString
     46:46:java.lang.String toString():42:42 -> toString
     43:43:java.lang.String toString():42:42 -> toString
-com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.DN:
+com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.uM:
     com.android.tools.r8.utils.ProgramMethodEquivalence INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -119995,17 +118866,16 @@
     4:4:int com.android.tools.r8.utils.ProgramMethodEquivalence.doHash(com.android.tools.r8.graph.ProgramMethod):27:27 -> a
     4:4:int doHash(java.lang.Object):10 -> a
     5:5:com.android.tools.r8.utils.ProgramMethodEquivalence get():17:17 -> a
-com.android.tools.r8.utils.ReflectionHelper -> com.android.tools.r8.internal.HS:
-com.android.tools.r8.utils.ReflectionHelper$1 -> com.android.tools.r8.internal.BS:
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveFieldOperation -> com.android.tools.r8.internal.CS:
+com.android.tools.r8.utils.ReflectionHelper -> com.android.tools.r8.internal.kR:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveFieldOperation -> com.android.tools.r8.internal.fR:
     1:1:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer,com.android.tools.r8.utils.ReflectionHelper$1):72:72 -> <init>
     2:2:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer):79:79 -> <init>
     1:5:java.lang.Object compute(java.lang.Object):84:88 -> a
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveMethodOperation -> com.android.tools.r8.internal.DS:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveMethodOperation -> com.android.tools.r8.internal.gR:
     1:1:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer,com.android.tools.r8.utils.ReflectionHelper$1):51:51 -> <init>
     2:2:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer):58:58 -> <init>
     1:6:java.lang.Object compute(java.lang.Object):63:68 -> a
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation -> com.android.tools.r8.internal.ES:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation -> com.android.tools.r8.internal.hR:
     java.util.function.Consumer modifier -> c
     com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation nextOperation -> d
     java.lang.Class classForDeclaration -> a
@@ -120013,7 +118883,7 @@
     1:1:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer,com.android.tools.r8.utils.ReflectionHelper$1):30:30 -> <init>
     2:6:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer):41:45 -> <init>
     java.lang.Object compute(java.lang.Object) -> a
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder -> com.android.tools.r8.internal.FS:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder -> com.android.tools.r8.internal.iR:
     com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder sequenceBuilder -> d
     boolean $assertionsDisabled -> e
     java.lang.String declaredMember -> a
@@ -120029,7 +118899,7 @@
     16:17:void lambda$build$0(java.lang.reflect.Field):153:154 -> a
     18:19:void lambda$build$1(java.lang.reflect.Method):164:165 -> a
     1:1:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder setSetAccessible(boolean):138:138 -> b
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder -> com.android.tools.r8.internal.GS:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder -> com.android.tools.r8.internal.jR:
     java.util.List reflectiveOperationBuilderList -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():92:92 -> <clinit>
@@ -120037,9 +118907,10 @@
     1:3:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder.add(java.lang.String,com.android.tools.r8.utils.ReflectionHelper$DeclaredType):105:107 -> a
     1:3:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder readField(java.lang.String):101 -> a
     4:7:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation build():112:115 -> a
-    1:3:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder.add(java.lang.String,com.android.tools.r8.utils.ReflectionHelper$DeclaredType):105:107 -> b
-    1:3:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder readMethod(java.lang.String):97 -> b
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.uT:
+    1:1:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder readMethod(java.lang.String):0:0 -> b
+    2:4:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder.add(java.lang.String,com.android.tools.r8.utils.ReflectionHelper$DeclaredType):105:107 -> b
+    2:4:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder readMethod(java.lang.String):97 -> b
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.WR:
     java.util.List diagnosticsLevelMapping -> b
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.utils.AbortException abort -> c
@@ -120061,19 +118932,19 @@
     1:1:void error(com.android.tools.r8.Diagnostic):109:109 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):91:91 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):100:100 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.rT:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.TR:
     1:1:void <init>():56:56 -> <init>
-com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.sT:
+com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.UR:
     int[] $SwitchMap$com$android$tools$r8$DiagnosticsLevel -> a
     1:1:void <clinit>():73:73 -> <clinit>
-com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.tT:
+com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.VR:
     com.android.tools.r8.DiagnosticsLevel from -> a
     com.android.tools.r8.DiagnosticsLevel to -> b
     java.lang.String diagnosticsClassName -> c
     1:4:void <init>(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.DiagnosticsLevel,java.lang.String):25:28 -> <init>
     1:13:com.android.tools.r8.DiagnosticsLevel map(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.Diagnostic):32:44 -> a
     14:14:com.android.tools.r8.DiagnosticsLevel map(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.Diagnostic):38:38 -> a
-com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.aV:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.sT:
     java.util.TreeMap internalTree -> a
     boolean allowIntervalOverwrites -> b
     int size -> c
@@ -120086,7 +118957,7 @@
     5:44:com.android.tools.r8.utils.SegmentTree add(int,int,java.lang.Object):36:75 -> a
     45:48:boolean lambda$add$0(int,int,com.android.tools.r8.utils.Box,java.lang.Integer):43:46 -> a
     49:49:int size():80:80 -> a
-com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.bV:
+com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.tT:
     int minor -> b
     int patch -> c
     int major -> a
@@ -120131,7 +119002,7 @@
     85:85:java.lang.String toString():82:82 -> toString
     86:86:java.lang.String toString():82:82 -> toString
     83:83:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.fV:
+com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.xT:
     1:1:java.util.Set newConcurrentHashSet(int):28:28 -> a
     2:3:java.util.HashSet newHashSet(java.lang.Object):32:33 -> a
     4:5:java.util.HashSet newHashSet(java.lang.Object[]):39:40 -> a
@@ -120144,14 +119015,14 @@
     1:1:java.util.Set newIdentityHashSet(int):85:85 -> b
     2:4:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSet(com.android.tools.r8.utils.ForEachable):95:97 -> b
     5:11:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSetExcludingNullItems(java.lang.Object[]):102:108 -> b
-com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.lW:
+com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.KU:
     java.util.List accepted -> b
     1:1:void <init>(com.android.tools.r8.StringConsumer):24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.StringConsumer):17:17 -> <init>
     1:1:void lambda$finished$0(com.android.tools.r8.DiagnosticsHandler,java.lang.String):35:35 -> a
     1:1:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):29:29 -> accept
     1:3:void finished(com.android.tools.r8.DiagnosticsHandler):34:36 -> finished
-com.android.tools.r8.utils.SourceFileTemplateProvider -> com.android.tools.r8.internal.pW:
+com.android.tools.r8.utils.SourceFileTemplateProvider -> com.android.tools.r8.internal.OU:
     java.util.Map HANDLERS -> c
     java.lang.String template -> a
     java.lang.String cachedValue -> b
@@ -120179,7 +119050,7 @@
     58:64:com.android.tools.r8.SourceFileProvider create(java.lang.String,com.android.tools.r8.DiagnosticsHandler):46:52 -> a
     70:70:void lambda$get$0(com.android.tools.r8.SourceFileEnvironment,java.lang.String,com.android.tools.r8.SourceFileProvider):68:68 -> a
     1:8:java.lang.String get(com.android.tools.r8.SourceFileEnvironment):64:71 -> get
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.tX:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.OV:
     1:2:byte[] StreamToByteArrayClose(java.io.InputStream):17:18 -> a
 com.android.tools.r8.utils.StringDiagnostic -> com.android.tools.r8.utils.StringDiagnostic:
     com.android.tools.r8.origin.Origin origin -> b
@@ -120193,7 +119064,7 @@
     1:1:java.lang.String getDiagnosticMessage():56:56 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():46:46 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():51:51 -> getPosition
-com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.eY:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.wW:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -120285,10 +119156,10 @@
     1:9:java.lang.String toASCIIString(java.lang.String):53:61 -> d
     1:9:java.lang.String trim(java.lang.String):296:304 -> e
     1:5:java.lang.String withNativeLineSeparator(java.lang.String):163:167 -> f
-com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.dY:
+com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.vW:
     int[] $SwitchMap$com$android$tools$r8$utils$StringUtils$BraceType -> a
     1:1:void <clinit>():32:32 -> <clinit>
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.eY$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.wW$a:
     com.android.tools.r8.utils.StringUtils$BraceType PARENS -> b
     com.android.tools.r8.utils.StringUtils$BraceType SQUARE -> c
     com.android.tools.r8.utils.StringUtils$BraceType[] $VALUES -> f
@@ -120298,10 +119169,10 @@
     5:5:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
     1:1:com.android.tools.r8.utils.StringUtils$BraceType[] values():25:25 -> a
-com.android.tools.r8.utils.SupplierUtils -> com.android.tools.r8.internal.zY:
+com.android.tools.r8.utils.SupplierUtils -> com.android.tools.r8.internal.RW:
     1:3:java.lang.Object lambda$memoize$1(com.android.tools.r8.utils.ThrowingSupplier):21:23 -> a
     1:1:java.util.function.Supplier memoize(com.android.tools.r8.utils.ThrowingSupplier):18:18 -> b
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.KY:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.cX:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -120314,7 +119185,7 @@
     1:1:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):31:31 -> a
     2:35:java.lang.String com.android.tools.r8.utils.SymbolGenerationUtils.numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[],boolean):43:76 -> a
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):31 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.KY$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.cX$a:
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> c
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> b
     1:2:void <clinit>():16:17 -> <clinit>
@@ -120356,33 +119227,33 @@
     2:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):175:175 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):182:182 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):176 -> b
-com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.kZ:
+com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.AX:
     void execute() -> a
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.lZ:
-com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.mZ:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.nZ:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.BX:
+com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.CX:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.DX:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.oZ:
-com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.pZ:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.rZ:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.EX:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.FX:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.HX:
     1:1:void <init>():9:9 -> <init>
     boolean hasNext() -> a
     1:2:void forEachRemaining(java.util.function.IntConsumer):12:13 -> a
     3:6:int nextIntComputeIfAbsent(com.android.tools.r8.utils.ThrowingIntSupplier):22:25 -> a
     int nextInt() -> b
-com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.sZ:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.IX:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.tZ:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.JX:
     1:1:void <init>():11:11 -> <init>
     boolean hasNext() -> a
     1:6:java.util.List take(int):25:30 -> a
     7:7:java.util.List take(int):28:28 -> a
     java.lang.Object next() -> b
-com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.uZ:
-com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.vZ:
+com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.KX:
+com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.LX:
     java.lang.Object apply(java.lang.Object,int) -> a
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.wZ:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.HZ:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.MX:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.XX:
     java.util.Stack stack -> b
     com.android.tools.r8.utils.Timing EMPTY -> d
     boolean $assertionsDisabled -> e
@@ -120428,20 +119299,19 @@
     35:35:java.lang.String access$600(long):25 -> a
     36:36:java.lang.String com.android.tools.r8.utils.Timing.prettySize(long):342:342 -> a
     36:36:java.lang.String access$600(long):25 -> a
-    37:40:void begin(java.lang.String):366:369 -> a
-    41:45:void com.android.tools.r8.utils.Timing$Node.restart():139:143 -> a
-    41:45:void begin(java.lang.String):370 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    46:49:void begin(java.lang.String):372:375 -> a
-    50:54:java.lang.Object time(java.lang.String,com.android.tools.r8.utils.ThrowingSupplier):388:392 -> a
-    55:59:java.lang.Object scope(java.lang.String,com.android.tools.r8.utils.Timing$TimingScope):420:424 -> a
-    60:65:java.util.Map com.android.tools.r8.utils.Timing.computeMemoryInformation():437:442 -> a
-    60:65:java.util.Map access$200():25 -> a
-    66:66:com.android.tools.r8.utils.Timing$MemInfo com.android.tools.r8.utils.Timing$MemInfo.fromTotalAndFree(long,long):111:111 -> a
-    66:66:java.util.Map com.android.tools.r8.utils.Timing.computeMemoryInformation():441 -> a
-    66:66:java.util.Map access$200():25 -> a
-    67:67:java.util.Map com.android.tools.r8.utils.Timing.computeMemoryInformation():439:439 -> a
+    37:41:void begin(java.lang.String):366:370 -> a
+    42:46:void com.android.tools.r8.utils.Timing$Node.restart():139:143 -> a
+    42:46:void begin(java.lang.String):370 -> a
+    47:50:void begin(java.lang.String):372:375 -> a
+    51:55:java.lang.Object time(java.lang.String,com.android.tools.r8.utils.ThrowingSupplier):388:392 -> a
+    56:60:java.lang.Object scope(java.lang.String,com.android.tools.r8.utils.Timing$TimingScope):420:424 -> a
+    61:66:java.util.Map com.android.tools.r8.utils.Timing.computeMemoryInformation():437:442 -> a
+    61:66:java.util.Map access$200():25 -> a
+    67:67:com.android.tools.r8.utils.Timing$MemInfo com.android.tools.r8.utils.Timing$MemInfo.fromTotalAndFree(long,long):111:111 -> a
+    67:67:java.util.Map com.android.tools.r8.utils.Timing.computeMemoryInformation():441 -> a
     67:67:java.util.Map access$200():25 -> a
+    68:68:java.util.Map com.android.tools.r8.utils.Timing.computeMemoryInformation():439:439 -> a
+    68:68:java.util.Map access$200():25 -> a
     1:1:java.util.Stack access$700(com.android.tools.r8.utils.Timing):25:25 -> b
     2:2:com.android.tools.r8.utils.Timing empty():73:73 -> b
     3:3:long com.android.tools.r8.utils.Timing.percentage(long,long):330:330 -> b
@@ -120450,28 +119320,26 @@
     2:2:void end():397:397 -> c
     3:7:void com.android.tools.r8.utils.Timing$Node.end():147:151 -> c
     3:7:void end():397 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:void end():398:398 -> c
-    1:3:void report():402:404 -> d
-    4:8:void com.android.tools.r8.utils.Timing$Node.end():147:151 -> d
-    4:8:void report():405 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:10:void report():406:407 -> d
-com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.AZ:
+    1:4:void report():402:405 -> d
+    5:9:void com.android.tools.r8.utils.Timing$Node.end():147:151 -> d
+    5:9:void report():405 -> d
+    10:11:void report():406:407 -> d
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.QX:
     1:1:void <init>(java.lang.String,boolean):30:30 -> <init>
     void begin(java.lang.String) -> a
     1:1:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):33:33 -> a
     2:2:java.lang.Object scope(java.lang.String,com.android.tools.r8.utils.Timing$TimingScope):63:63 -> a
     void end() -> c
     void report() -> d
-com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.zZ:
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.PX:
     1:1:void <init>(com.android.tools.r8.utils.Timing$1,java.lang.String,int,com.android.tools.r8.utils.Timing):33:33 -> <init>
     void add(java.util.Collection) -> a
     void end() -> a
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.BZ:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.RX:
     long used -> a
     1:2:void <init>(long):106:107 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.CZ:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.SX:
     java.util.Map children -> c
     long start_time -> e
     java.lang.String title -> a
@@ -120489,59 +119357,58 @@
     3:3:void report(int,com.android.tools.r8.utils.Timing$Node):170:170 -> a
     4:4:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
     4:4:void report(int,com.android.tools.r8.utils.Timing$Node):171 -> a
-    5:5:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
-    5:5:void report(int,com.android.tools.r8.utils.Timing$Node):171 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:void report(int,com.android.tools.r8.utils.Timing$Node):171:171 -> a
-    7:8:void com.android.tools.r8.utils.Timing$Node.printPrefix(int):204:205 -> a
-    7:8:void report(int,com.android.tools.r8.utils.Timing$Node):174 -> a
-    9:9:void report(int,com.android.tools.r8.utils.Timing$Node):175:175 -> a
-    10:10:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):165:165 -> a
-    10:10:void report(int,com.android.tools.r8.utils.Timing$Node):175 -> a
-    11:11:void report(int,com.android.tools.r8.utils.Timing$Node):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":44,"2":45,"3":46}}
-    44:44:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
-    44:44:void report(int,com.android.tools.r8.utils.Timing$Node):175 -> a
-    45:45:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
-    45:45:void report(int,com.android.tools.r8.utils.Timing$Node):175 -> a
+    5:5:void report(int,com.android.tools.r8.utils.Timing$Node):171:171 -> a
+    6:6:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
+    6:6:void report(int,com.android.tools.r8.utils.Timing$Node):171 -> a
+    7:7:void report(int,com.android.tools.r8.utils.Timing$Node):171:171 -> a
+    8:9:void com.android.tools.r8.utils.Timing$Node.printPrefix(int):204:205 -> a
+    8:9:void report(int,com.android.tools.r8.utils.Timing$Node):174 -> a
+    10:10:void report(int,com.android.tools.r8.utils.Timing$Node):175:175 -> a
+    11:11:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):165:165 -> a
+    11:11:void report(int,com.android.tools.r8.utils.Timing$Node):175 -> a
+    12:12:void report(int,com.android.tools.r8.utils.Timing$Node):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":46,"2":47,"3":48}}
     46:46:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
     46:46:void report(int,com.android.tools.r8.utils.Timing$Node):175 -> a
-    12:12:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
-    12:12:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166 -> a
-    12:12:void report(int,com.android.tools.r8.utils.Timing$Node):175 -> a
-    13:13:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
+    47:47:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
+    47:47:void report(int,com.android.tools.r8.utils.Timing$Node):175 -> a
+    48:48:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
+    48:48:void report(int,com.android.tools.r8.utils.Timing$Node):175 -> a
+    13:13:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
+    13:13:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166 -> a
     13:13:void report(int,com.android.tools.r8.utils.Timing$Node):175 -> a
-    14:23:void report(int,com.android.tools.r8.utils.Timing$Node):175:184 -> a
-    24:24:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
-    24:24:void report(int,com.android.tools.r8.utils.Timing$Node):185 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    25:25:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
-    25:25:void report(int,com.android.tools.r8.utils.Timing$Node):187 -> a
+    14:14:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
+    14:14:void report(int,com.android.tools.r8.utils.Timing$Node):175 -> a
+    15:25:void report(int,com.android.tools.r8.utils.Timing$Node):175:185 -> a
     26:26:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
-    26:26:void report(int,com.android.tools.r8.utils.Timing$Node):189 -> a
-    27:27:void report(int,com.android.tools.r8.utils.Timing$Node):189:189 -> a
-    28:29:void com.android.tools.r8.utils.Timing$Node.printPrefix(int):204:205 -> a
-    28:29:void report(int,com.android.tools.r8.utils.Timing$Node):190 -> a
-    30:30:void report(int,com.android.tools.r8.utils.Timing$Node):191:191 -> a
-    31:31:void report(int,com.android.tools.r8.utils.Timing$Node):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":47,"2":48,"3":49}}
-    47:47:void report(int,com.android.tools.r8.utils.Timing$Node):191:191 -> a
-    48:48:void report(int,com.android.tools.r8.utils.Timing$Node):191:191 -> a
+    26:26:void report(int,com.android.tools.r8.utils.Timing$Node):185 -> a
+    27:27:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
+    27:27:void report(int,com.android.tools.r8.utils.Timing$Node):187 -> a
+    28:28:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
+    28:28:void report(int,com.android.tools.r8.utils.Timing$Node):189 -> a
+    29:29:void report(int,com.android.tools.r8.utils.Timing$Node):189:189 -> a
+    30:31:void com.android.tools.r8.utils.Timing$Node.printPrefix(int):204:205 -> a
+    30:31:void report(int,com.android.tools.r8.utils.Timing$Node):190 -> a
+    32:32:void report(int,com.android.tools.r8.utils.Timing$Node):191:191 -> a
+    33:33:void report(int,com.android.tools.r8.utils.Timing$Node):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":49,"2":50,"3":51}}
     49:49:void report(int,com.android.tools.r8.utils.Timing$Node):191:191 -> a
-    32:32:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
-    32:32:void report(int,com.android.tools.r8.utils.Timing$Node):193 -> a
-    33:33:void report(int,com.android.tools.r8.utils.Timing$Node):193:193 -> a
-    34:34:java.lang.String com.android.tools.r8.utils.Timing.prettyTime(long):338:338 -> a
-    34:34:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):25 -> a
-    34:34:void report(int,com.android.tools.r8.utils.Timing$Node):195 -> a
-    35:35:void report(int,com.android.tools.r8.utils.Timing$Node):195:195 -> a
-    36:43:void report(int,com.android.tools.r8.utils.Timing$Node):191:198 -> a
-    50:50:void lambda$report$0(int,com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):198:198 -> a
-    51:63:void printMemory(int):210:222 -> a
-    64:64:long com.android.tools.r8.utils.Timing$MemInfo.usedDelta(com.android.tools.r8.utils.Timing$MemInfo):115:115 -> a
-    64:64:void printMemory(int):224 -> a
-    65:65:void printMemory(int):224:224 -> a
-    66:66:void printMemory(int):217:217 -> a
+    50:50:void report(int,com.android.tools.r8.utils.Timing$Node):191:191 -> a
+    51:51:void report(int,com.android.tools.r8.utils.Timing$Node):191:191 -> a
+    34:34:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
+    34:34:void report(int,com.android.tools.r8.utils.Timing$Node):193 -> a
+    35:35:void report(int,com.android.tools.r8.utils.Timing$Node):193:193 -> a
+    36:36:java.lang.String com.android.tools.r8.utils.Timing.prettyTime(long):338:338 -> a
+    36:36:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):25 -> a
+    36:36:void report(int,com.android.tools.r8.utils.Timing$Node):195 -> a
+    37:37:void report(int,com.android.tools.r8.utils.Timing$Node):195:195 -> a
+    38:45:void report(int,com.android.tools.r8.utils.Timing$Node):191:198 -> a
+    52:52:void lambda$report$0(int,com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):198:198 -> a
+    53:65:void printMemory(int):210:222 -> a
+    66:66:long com.android.tools.r8.utils.Timing$MemInfo.usedDelta(com.android.tools.r8.utils.Timing$MemInfo):115:115 -> a
+    66:66:void printMemory(int):224 -> a
+    67:67:void printMemory(int):224:224 -> a
+    68:68:void printMemory(int):217:217 -> a
     1:1:java.lang.String toString():161:161 -> toString
     2:2:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> toString
     2:2:java.lang.String toString():161 -> toString
@@ -120550,7 +119417,7 @@
     4:4:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):25 -> toString
     4:4:java.lang.String toString():161 -> toString
     5:5:java.lang.String toString():161:161 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.FZ:
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.VX:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.Timing$Node slowest -> d
     int taskCount -> c
@@ -120566,7 +119433,7 @@
     24:24:com.android.tools.r8.utils.Timing$Node lambda$add$0(boolean,java.lang.String):310:310 -> a
     25:26:void end():320:321 -> a
     1:1:int access$900(com.android.tools.r8.utils.Timing$TimingMerger):230:230 -> b
-com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.DZ:
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.TX:
     boolean $assertionsDisabled -> k
     int val$numberOfThreads -> i
     com.android.tools.r8.utils.Timing$TimingMerger this$0 -> j
@@ -120581,43 +119448,38 @@
     6:10:void report(int,com.android.tools.r8.utils.Timing$Node):245:249 -> a
     11:11:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
     11:11:void report(int,com.android.tools.r8.utils.Timing$Node):249 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:12:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
     12:12:void report(int,com.android.tools.r8.utils.Timing$Node):250 -> a
     13:14:void report(int,com.android.tools.r8.utils.Timing$Node):250:251 -> a
     15:15:void report(int,com.android.tools.r8.utils.Timing$Node):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":567,"2":568,"3":569}}
-    567:567:void report(int,com.android.tools.r8.utils.Timing$Node):251:251 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":568,"2":569,"3":570}}
     568:568:void report(int,com.android.tools.r8.utils.Timing$Node):251:251 -> a
     569:569:void report(int,com.android.tools.r8.utils.Timing$Node):251:251 -> a
+    570:570:void report(int,com.android.tools.r8.utils.Timing$Node):251:251 -> a
     266:273:void report(int,com.android.tools.r8.utils.Timing$Node):251:251 -> a
     281:288:void report(int,com.android.tools.r8.utils.Timing$Node):259:266 -> a
     289:290:void com.android.tools.r8.utils.Timing$Node.printPrefix(int):204:205 -> a
     289:290:void report(int,com.android.tools.r8.utils.Timing$Node):267 -> a
     291:291:void report(int,com.android.tools.r8.utils.Timing$Node):268:268 -> a
     292:292:void report(int,com.android.tools.r8.utils.Timing$Node):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":586,"2":587,"3":588}}
-    586:586:void report(int,com.android.tools.r8.utils.Timing$Node):268:268 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":587,"2":588,"3":589}}
     587:587:void report(int,com.android.tools.r8.utils.Timing$Node):268:268 -> a
     588:588:void report(int,com.android.tools.r8.utils.Timing$Node):268:268 -> a
+    589:589:void report(int,com.android.tools.r8.utils.Timing$Node):268:268 -> a
     560:560:void report(int,com.android.tools.r8.utils.Timing$Node):268:268 -> a
     561:561:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):165:165 -> a
     561:561:void report(int,com.android.tools.r8.utils.Timing$Node):268 -> a
-    562:562:void report(int,com.android.tools.r8.utils.Timing$Node):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":589,"2":590,"3":591}}
-    589:589:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
-    589:589:void report(int,com.android.tools.r8.utils.Timing$Node):268 -> a
-    590:590:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
-    590:590:void report(int,com.android.tools.r8.utils.Timing$Node):268 -> a
-    591:591:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
-    591:591:void report(int,com.android.tools.r8.utils.Timing$Node):268 -> a
-    563:563:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
-    563:563:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    562:562:void report(int,com.android.tools.r8.utils.Timing$Node):268:268 -> a
+    563:563:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
     563:563:void report(int,com.android.tools.r8.utils.Timing$Node):268 -> a
-    564:564:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
+    564:564:long com.android.tools.r8.utils.Timing$Node.duration():156:156 -> a
+    564:564:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166 -> a
     564:564:void report(int,com.android.tools.r8.utils.Timing$Node):268 -> a
-    565:566:void report(int,com.android.tools.r8.utils.Timing$Node):268:269 -> a
-    592:592:void lambda$report$0(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):264:264 -> a
+    565:565:java.lang.String com.android.tools.r8.utils.Timing$Node.toString(com.android.tools.r8.utils.Timing$Node):166:166 -> a
+    565:565:void report(int,com.android.tools.r8.utils.Timing$Node):268 -> a
+    566:567:void report(int,com.android.tools.r8.utils.Timing$Node):268:269 -> a
+    590:590:void lambda$report$0(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):264:264 -> a
     1:1:void lambda$report$1(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):269:269 -> b
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":277,"2":278,"3":279}}
@@ -120625,26 +119487,26 @@
     278:278:java.lang.String toString():275:275 -> toString
     279:279:java.lang.String toString():275:275 -> toString
     276:276:java.lang.String toString():275:275 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.EZ:
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.UX:
     com.android.tools.r8.utils.Timing$Node mergeTarget -> a
     com.android.tools.r8.utils.Timing$Node mergeSource -> b
     1:3:void <init>(com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):284:286 -> <init>
-com.android.tools.r8.utils.Timing$TimingScope -> com.android.tools.r8.internal.GZ:
+com.android.tools.r8.utils.Timing$TimingScope -> com.android.tools.r8.internal.WX:
     java.lang.Object apply() -> a
-com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.YZ:
+com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.oY:
     com.android.tools.r8.utils.TraversalContinuation BREAK -> c
     com.android.tools.r8.utils.TraversalContinuation CONTINUE -> b
     1:2:void <clinit>():9:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
     1:1:boolean shouldBreak():21:21 -> a
     1:1:boolean shouldContinue():25:25 -> b
-com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.d00:
+com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.tY:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.e00:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.uY:
     java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.f00:
+com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.vY:
     boolean test(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.l10:
+com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.BZ:
     boolean $assertionsDisabled -> b
     java.util.Comparator COMPARATOR -> a
     1:3:void <clinit>():19:21 -> <clinit>
@@ -120669,7 +119531,7 @@
     162:162:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):95:95 -> a
     163:186:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):93:116 -> a
     187:192:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):114:119 -> a
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.C20:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.R00:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
@@ -120697,7 +119559,7 @@
     1:1:java.lang.String getSha():57:57 -> b
     1:1:boolean isEngineering():66:66 -> c
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.s30:
+com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.E10:
     com.android.tools.r8.utils.Visibility PACKAGE_PRIVATE -> e
     com.android.tools.r8.utils.Visibility[] $VALUES -> f
     com.android.tools.r8.utils.Visibility PUBLIC -> b
@@ -120712,10 +119574,10 @@
     17:17:java.lang.String toString():41:41 -> toString
     18:18:java.lang.String toString():38:38 -> toString
     19:19:java.lang.String toString():35:35 -> toString
-com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.internal.r30:
+com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.internal.D10:
     int[] $SwitchMap$com$android$tools$r8$utils$Visibility -> a
     1:1:void <clinit>():33:33 -> <clinit>
-com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.L30:
+com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.W10:
     java.util.Deque workingList -> a
     java.util.Set seen -> b
     boolean $assertionsDisabled -> c
@@ -120729,19 +119591,20 @@
     6:6:void addAllIgnoringSeenSet(java.lang.Iterable):74:74 -> a
     7:7:void addIfNotSeen(java.lang.Iterable):78:78 -> a
     8:9:boolean addIfNotSeen(java.lang.Object):88:89 -> a
-    10:10:java.util.Set getMutableSeenSet():125:125 -> a
+    10:10:java.util.Set getMutableSeenSet():143:143 -> a
     1:1:void addIgnoringSeenSet(java.lang.Object):70:70 -> b
-    2:2:void markAsSeen(java.lang.Iterable):112:112 -> b
-    3:3:java.util.Set getSeenSet():121:121 -> b
+    2:2:void markAsSeen(java.lang.Iterable):124:124 -> b
+    3:3:java.util.Set getSeenSet():139:139 -> b
     1:2:com.android.tools.r8.utils.WorkList newEqualityWorkList(java.lang.Iterable):30:31 -> c
-    3:3:boolean hasNext():96:96 -> c
-    4:4:boolean isSeen(java.lang.Object):104:104 -> c
+    3:3:boolean hasNext():108:108 -> c
+    4:4:boolean isSeen(java.lang.Object):116:116 -> c
     1:1:com.android.tools.r8.utils.WorkList newEqualityWorkList():20:20 -> d
-    2:2:void markAsSeen(java.lang.Object):108:108 -> d
+    2:2:void markAsSeen(java.lang.Object):120:120 -> d
     1:2:com.android.tools.r8.utils.WorkList newEqualityWorkList(java.lang.Object):24:25 -> e
     3:3:com.android.tools.r8.utils.WorkList newIdentityWorkList():36:36 -> e
     1:2:com.android.tools.r8.utils.WorkList newIdentityWorkList(java.lang.Object):40:41 -> f
-    3:4:java.lang.Object next():116:117 -> f
+    3:4:java.lang.Object next():128:129 -> f
+    1:2:java.lang.Object removeSeen():133:134 -> g
 com.android.tools.r8.utils.ZipUtils -> com.android.tools.r8.utils.C:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -120813,10 +119676,10 @@
     18:18:com.android.tools.r8.utils.ZipUtils$ZipBuilder addFilesRelative(java.nio.file.Path,java.nio.file.Path[]):235:235 -> a
     19:22:com.android.tools.r8.utils.ZipUtils$ZipBuilder addBytes(java.lang.String,byte[]):239:242 -> a
     23:24:java.nio.file.Path build():247:248 -> a
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector -> com.android.tools.r8.internal.fF:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector -> com.android.tools.r8.internal.hE:
     1:31:com.android.tools.r8.utils.collections.ProgramMethodSet findAllMethodsAndOverridesThatMatches(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Collection,java.util.function.Predicate):36:66 -> a
     32:36:void lambda$findAllMethodsAndOverridesThatMatches$0(java.util.function.Predicate,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):42:46 -> a
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$InterfaceMethodToClassSiblingPropagator -> com.android.tools.r8.internal.dF:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$InterfaceMethodToClassSiblingPropagator -> com.android.tools.r8.internal.fE:
     com.android.tools.r8.utils.collections.ProgramMethodSet classRootMethods -> f
     java.util.Map interfaceMethodsOfInterest -> g
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):81:81 -> <init>
@@ -120829,12 +119692,11 @@
     4:8:void visit(com.android.tools.r8.graph.DexProgramClass):93:97 -> k
     9:9:void com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.forEachImmediateProgramSuperClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):86:86 -> k
     9:9:void visit(com.android.tools.r8.graph.DexProgramClass):97 -> k
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:19:void visit(com.android.tools.r8.graph.DexProgramClass):105:114 -> k
     20:20:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexClass):786:786 -> k
     20:20:void visit(com.android.tools.r8.graph.DexProgramClass):114 -> k
     21:32:void visit(com.android.tools.r8.graph.DexProgramClass):115:126 -> k
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$TopDownClassHierarchyPropagator -> com.android.tools.r8.internal.eF:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$TopDownClassHierarchyPropagator -> com.android.tools.r8.internal.gE:
     com.android.tools.r8.utils.collections.ProgramMethodSet result -> g
     java.util.Map methodsOfInterest -> f
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):164:164 -> <init>
@@ -120849,14 +119711,13 @@
     1:5:void visit(com.android.tools.r8.graph.DexProgramClass):181:185 -> k
     6:6:void com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.forEachImmediateProgramSuperClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):86:86 -> k
     6:6:void visit(com.android.tools.r8.graph.DexProgramClass):185 -> k
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void visit(com.android.tools.r8.graph.DexProgramClass):190:190 -> k
-com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.L4:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.I4:
     java.util.Set getKeys(java.lang.Object) -> a
-com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.M4:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.J4:
     java.lang.Object getRepresentativeValue(java.lang.Object) -> b
     java.lang.Object getRepresentativeKey(java.lang.Object) -> c
-com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.N4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.K4:
     java.util.Map backing -> b
     java.util.Map inverse -> c
     boolean $assertionsDisabled -> d
@@ -120884,10 +119745,10 @@
     1:1:java.util.Set keySet():87:87 -> keySet
     1:3:java.lang.Object put(java.lang.Object,java.lang.Object):139:141 -> put
     1:1:java.util.Set values():152:152 -> values
-com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.O4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.L4:
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
     java.util.Map getForwardMap() -> e
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.P4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.M4:
     boolean $assertionsDisabled -> f
     java.util.Map representatives -> e
     1:1:void <clinit>():13:13 -> <clinit>
@@ -120916,8 +119777,8 @@
     4:4:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):44:44 -> e
     4:4:java.lang.Object remove(java.lang.Object):99 -> e
     1:1:boolean hasExplicitRepresentativeKey(java.lang.Object):54:54 -> f
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.Q4:
-com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.R4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.N4:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.O4:
     java.util.Map backing -> b
     java.util.Map inverse -> c
     1:1:void <init>():21:21 -> <init>
@@ -120935,7 +119796,7 @@
     1:1:java.util.Set lambda$put$2(java.lang.Object):139:139 -> f
     1:1:void forEach(java.util.function.BiConsumer):47:47 -> forEach
     1:6:java.lang.Object removeValue(java.lang.Object):125:130 -> g
-com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.S4:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.P4:
     java.util.Map representatives -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():12:12 -> <clinit>
@@ -120946,7 +119807,7 @@
     1:2:java.lang.Object removeValue(java.lang.Object):64:65 -> g
     3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):59:59 -> g
     3:3:java.lang.Object removeValue(java.lang.Object):66 -> g
-com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.T4:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.Q4:
     com.android.tools.r8.com.google.common.collect.BiMap backing -> b
     1:1:void <init>():22:22 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.BiMap):25:26 -> <init>
@@ -120958,7 +119819,6 @@
     7:7:void putAll(com.android.tools.r8.utils.collections.BidirectionalManyToManyMap):149:149 -> a
     8:8:void com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.forEach(java.util.function.BiConsumer):51:51 -> a
     8:8:void putAll(com.android.tools.r8.utils.collections.BidirectionalManyToManyMap):149 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.get(java.lang.Object):76:76 -> b
     1:1:java.lang.Object getRepresentativeValue(java.lang.Object):113 -> b
     1:1:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.getKey(java.lang.Object):87:87 -> c
@@ -120982,14 +119842,14 @@
     1:1:java.util.Set com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.values():169:169 -> values
     1:1:java.util.Collection values():16 -> values
     2:2:java.util.Set values():169:169 -> values
-com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.U4:
-com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.sg:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.R4:
+com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.ag:
     com.android.tools.r8.utils.collections.DexClassAndMethodSet EMPTY -> e
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):22:22 -> <init>
     1:1:com.android.tools.r8.utils.collections.DexClassAndMethodSet create():32:32 -> b
     1:1:com.android.tools.r8.utils.collections.DexClassAndMethodSet empty():60:60 -> c
-com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.tg:
+com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.bg:
     java.util.function.Supplier backingFactory -> c
     java.util.Map backing -> b
     boolean $assertionsDisabled -> d
@@ -121017,7 +119877,7 @@
     1:1:boolean removeIf(java.util.function.Predicate):88:88 -> removeIf
     1:1:int size():92:92 -> size
     1:1:java.util.stream.Stream stream():96:96 -> stream
-com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.ah:
+com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.Ig:
     com.android.tools.r8.utils.collections.DexMethodSignatureSet EMPTY -> c
     java.util.Set backing -> b
     1:2:void <clinit>():22:23 -> <clinit>
@@ -121043,16 +119903,16 @@
     3:3:boolean contains(com.android.tools.r8.graph.DexClassAndMethod):106:106 -> b
     4:4:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethodSignature):94:94 -> b
     4:4:boolean contains(com.android.tools.r8.graph.DexClassAndMethod):106 -> b
-    5:5:java.util.Iterator com.android.tools.r8.utils.collections.DexMethodSignatureSet.iterator():130:130 -> b
-    5:5:boolean containsAnyOf(java.lang.Iterable):115 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:boolean containsAnyOf(java.lang.Iterable):115:115 -> b
-    7:7:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethodSignature):94:94 -> b
-    7:7:boolean containsAnyOf(java.lang.Iterable):116 -> b
-    8:8:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):143:143 -> b
-    9:9:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.remove(com.android.tools.r8.graph.DexMethodSignature):139:139 -> b
-    9:9:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):143 -> b
-    10:10:void removeAllMethods(java.lang.Iterable):152:152 -> b
+    5:5:boolean containsAnyOf(java.lang.Iterable):115:115 -> b
+    6:6:java.util.Iterator com.android.tools.r8.utils.collections.DexMethodSignatureSet.iterator():130:130 -> b
+    6:6:boolean containsAnyOf(java.lang.Iterable):115 -> b
+    7:7:boolean containsAnyOf(java.lang.Iterable):115:115 -> b
+    8:8:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethodSignature):94:94 -> b
+    8:8:boolean containsAnyOf(java.lang.Iterable):116 -> b
+    9:9:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):143:143 -> b
+    10:10:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.remove(com.android.tools.r8.graph.DexMethodSignature):139:139 -> b
+    10:10:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):143 -> b
+    11:11:void removeAllMethods(java.lang.Iterable):152:152 -> b
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet create(com.android.tools.r8.utils.collections.DexMethodSignatureSet):36:36 -> c
     2:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet empty():44:44 -> c
     1:1:void clear():85:85 -> clear
@@ -121066,7 +119926,7 @@
     1:1:int size():162:162 -> size
     1:1:java.lang.Object[] toArray():167:167 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):172:172 -> toArray
-com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.Kh:
+com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.uh:
     1:1:void <init>():15:15 -> <init>
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
     1:1:java.util.Set getKeys(java.lang.Object):92:92 -> a
@@ -121076,7 +119936,7 @@
     1:1:java.util.Map getForwardMap():15 -> e
     1:1:java.util.Set keySet():107:107 -> keySet
     1:1:java.util.Set values():112:112 -> values
-com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.tools.r8.internal.On:
+com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.tools.r8.internal.tn:
     java.util.Map backing -> b
     java.util.function.Function valueToKeyMapping -> c
     1:1:void <init>(java.util.function.Function):21:21 -> <init>
@@ -121096,7 +119956,7 @@
     1:1:int size():31:31 -> size
     1:1:java.lang.Object[] toArray():52:52 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):57:57 -> toArray
-com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.Yn:
+com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.Dn:
     boolean isClosed -> b
     1:1:void <init>(java.util.Collection):20:20 -> <init>
     2:2:void <init>(java.util.Collection):17:17 -> <init>
@@ -121120,7 +119980,7 @@
     1:1:boolean removeIf(java.util.function.Predicate):73:73 -> removeIf
     1:1:java.lang.Object removeLast():83:83 -> removeLast
     1:1:boolean removeLastOccurrence(java.lang.Object):78:78 -> removeLastOccurrence
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.eo:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.In:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1):17:17 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap):21:22 -> <init>
@@ -121190,13 +120050,12 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):17:17 -> tailMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.tailMap(java.lang.Integer):135:135 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):17 -> tailMap
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1 -> com.android.tools.r8.internal.co:
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.do:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.Hn:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> a
     1:3:void <init>():41:43 -> <init>
     1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder put(int,java.lang.Object):46:46 -> a
     2:2:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap build():51:51 -> a
-com.android.tools.r8.utils.collections.LongLivedClassSetBuilder -> com.android.tools.r8.internal.lD:
+com.android.tools.r8.utils.collections.LongLivedClassSetBuilder -> com.android.tools.r8.internal.tC:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):23:23 -> <init>
@@ -121217,7 +120076,7 @@
     87:87:java.util.Set build(com.android.tools.r8.graph.AppView):70:70 -> a
     88:88:java.util.Set build(com.android.tools.r8.graph.AppView):70:70 -> a
     85:85:java.util.Set build(com.android.tools.r8.graph.AppView):70:70 -> a
-com.android.tools.r8.utils.collections.LongLivedCollectionBuilder -> com.android.tools.r8.internal.mD:
+com.android.tools.r8.utils.collections.LongLivedCollectionBuilder -> com.android.tools.r8.internal.uC:
     java.util.function.IntFunction factoryForBuilder -> b
     java.lang.Object backing -> d
     boolean $assertionsDisabled -> e
@@ -121225,7 +120084,7 @@
     com.android.tools.r8.graph.GraphLens appliedGraphLens -> c
     1:1:void <clinit>():10:10 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):27:31 -> <init>
-com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder -> com.android.tools.r8.internal.nD:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder -> com.android.tools.r8.internal.vC:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):30:30 -> <init>
@@ -121252,7 +120111,7 @@
     32:32:com.android.tools.r8.utils.collections.ProgramMethodMap build(com.android.tools.r8.graph.AppView,java.util.function.Function):92 -> a
     33:34:com.android.tools.r8.utils.collections.ProgramMethodMap build(com.android.tools.r8.graph.AppView,java.util.function.Function):94:95 -> a
     35:40:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.function.Function,com.android.tools.r8.graph.DexMethod,java.lang.Object):97:102 -> a
-com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.oD:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.wC:
     java.util.function.IntFunction factoryForBuilder -> b
     java.util.Set methods -> d
     boolean $assertionsDisabled -> e
@@ -121314,11 +120173,11 @@
     1:13:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder rewrittenWithLens(com.android.tools.r8.graph.GraphLens):143:155 -> c
     1:4:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.GraphLens):180:183 -> d
     5:5:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.GraphLens):182:182 -> d
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.EG:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.BF:
     void put(java.lang.Iterable,java.lang.Object) -> a
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.FG:
-com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.GG:
-com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.AN:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.CF:
+com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.DF:
+com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.rM:
     java.util.Map backing -> b
     com.android.tools.r8.utils.collections.ProgramFieldSet EMPTY -> c
     boolean $assertionsDisabled -> d
@@ -121332,7 +120191,7 @@
     1:1:com.android.tools.r8.utils.collections.ProgramFieldSet empty():34:34 -> b
     2:2:boolean contains(com.android.tools.r8.graph.ProgramField):60:60 -> b
     1:1:java.util.Iterator iterator():73:73 -> iterator
-com.android.tools.r8.utils.collections.ProgramMemberMap -> com.android.tools.r8.internal.CN:
+com.android.tools.r8.utils.collections.ProgramMemberMap -> com.android.tools.r8.internal.tM:
     java.util.Map backing -> a
     1:2:void <init>(java.util.function.Supplier):20:21 -> <init>
     3:4:void <init>(java.util.Map):24:25 -> <init>
@@ -121344,13 +120203,14 @@
     6:6:boolean containsKey(com.android.tools.r8.graph.ProgramMember):41:41 -> a
     7:7:void forEach(java.util.function.BiConsumer):45:45 -> a
     8:8:void lambda$forEach$2(java.util.function.BiConsumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object):45:45 -> a
-    9:10:java.lang.Object put(com.android.tools.r8.graph.ProgramMember,java.lang.Object):61:62 -> a
-    11:11:java.lang.Object remove(com.android.tools.r8.graph.ProgramMember):66:66 -> a
-    12:12:boolean lambda$removeIf$3(java.util.function.BiPredicate,java.util.Map$Entry):70:70 -> a
-    13:13:void removeIf(java.util.function.BiPredicate):70:70 -> a
+    9:10:java.lang.Object getOrDefault(com.android.tools.r8.graph.ProgramMember,java.util.function.Supplier):57:58 -> a
+    11:12:java.lang.Object put(com.android.tools.r8.graph.ProgramMember,java.lang.Object):66:67 -> a
+    13:13:java.lang.Object remove(com.android.tools.r8.graph.ProgramMember):71:71 -> a
+    14:14:boolean lambda$removeIf$3(java.util.function.BiPredicate,java.util.Map$Entry):75:75 -> a
+    15:15:void removeIf(java.util.function.BiPredicate):75:75 -> a
     1:1:java.lang.Object get(com.android.tools.r8.graph.ProgramMember):49:49 -> b
     com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMember) -> c
-com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.EN:
+com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.vM:
     com.android.tools.r8.utils.collections.ProgramMethodMap EMPTY -> b
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):21:21 -> <init>
@@ -121362,7 +120222,7 @@
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMember):16 -> c
     3:3:com.android.tools.r8.utils.collections.ProgramMethodMap createConcurrent():37:37 -> c
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMap empty():42:42 -> d
-com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.FN:
+com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.wM:
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):22:23 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMultiset createConcurrent():27:27 -> a
@@ -121375,7 +120235,7 @@
     7:7:boolean lambda$removeIf$1(java.util.function.Predicate,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):47:47 -> a
     8:8:boolean removeIf(java.util.function.Predicate):47:47 -> a
     1:1:int size():51:51 -> b
-com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.GN:
+com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.xM:
     com.android.tools.r8.utils.collections.ProgramMethodSet EMPTY -> e
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):26:26 -> <init>
@@ -121384,34 +120244,33 @@
     3:3:void addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):74:74 -> a
     4:5:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):82:83 -> a
     6:6:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):85:85 -> a
-    7:7:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):370:370 -> a
+    7:7:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):374:374 -> a
     7:7:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):85 -> a
-    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    8:8:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):370 -> a
+    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
+    8:8:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):374 -> a
     8:8:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):85 -> a
-    9:10:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):371:372 -> a
+    9:10:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):375:376 -> a
     9:10:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):85 -> a
     11:11:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):87:87 -> a
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create():36:36 -> b
-    2:2:com.android.tools.r8.utils.collections.ProgramMethodSet create(com.android.tools.r8.utils.collections.ProgramMethodSet):56:56 -> b
-    3:3:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):74:74 -> b
-    3:3:com.android.tools.r8.utils.collections.ProgramMethodSet create(com.android.tools.r8.utils.collections.ProgramMethodSet):57 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2:3:com.android.tools.r8.utils.collections.ProgramMethodSet create(com.android.tools.r8.utils.collections.ProgramMethodSet):56:57 -> b
+    4:4:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):74:74 -> b
+    4:4:com.android.tools.r8.utils.collections.ProgramMethodSet create(com.android.tools.r8.utils.collections.ProgramMethodSet):57 -> b
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createConcurrent():62:62 -> c
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createLinked():66:66 -> d
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet empty():70:70 -> e
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create(int):40:40 -> i
-com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.iW:
+com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.HU:
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):29:29 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):23:23 -> a
     2:2:void lambda$rewrittenWithLens$3(java.util.function.Consumer,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):61:61 -> a
-    3:3:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):370:370 -> a
+    3:3:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):374:374 -> a
     3:3:void lambda$rewrittenWithLens$3(java.util.function.Consumer,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):61 -> a
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    4:4:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):370 -> a
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):344:344 -> a
+    4:4:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):374 -> a
     4:4:void lambda$rewrittenWithLens$3(java.util.function.Consumer,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):61 -> a
-    5:6:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):371:372 -> a
+    5:6:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.GraphLens.mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):375:376 -> a
     5:6:void lambda$rewrittenWithLens$3(java.util.function.Consumer,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):61 -> a
     7:7:void lambda$rewrittenWithLens$3(java.util.function.Consumer,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):61:61 -> a
     8:8:void lambda$rewrittenWithLens$4(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):61:61 -> a
@@ -121423,7 +120282,47 @@
     1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet create():33:33 -> f
     1:1:java.util.SortedMap lambda$create$1():44:44 -> g
     1:1:java.util.SortedMap lambda$static$0():26:26 -> h
-com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.yc:
+com.android.tools.r8.utils.dfs.DFSStack -> com.android.tools.r8.internal.Yd:
+    java.util.Deque stack -> a
+    java.util.Set stackSet -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:3:void <init>(java.util.Deque,java.util.Set):18:20 -> <init>
+    1:1:com.android.tools.r8.utils.dfs.DFSStack createIdentityStack():24:24 -> a
+    2:2:boolean contains(java.lang.Object):28:28 -> a
+    3:3:void handle(com.android.tools.r8.utils.dfs.DFSWorklistItem):42:42 -> a
+    4:4:boolean com.android.tools.r8.utils.dfs.DFSWorklistItem.isNewlyVisited():0:0 -> a
+    4:4:void handle(com.android.tools.r8.utils.dfs.DFSWorklistItem):42 -> a
+    5:5:java.lang.Object com.android.tools.r8.utils.dfs.DFSWorklistItem.getValue():16:16 -> a
+    5:5:void handle(com.android.tools.r8.utils.dfs.DFSWorklistItem):43 -> a
+    6:8:void com.android.tools.r8.utils.dfs.DFSStack.push(java.lang.Object):58:60 -> a
+    6:8:void handle(com.android.tools.r8.utils.dfs.DFSWorklistItem):43 -> a
+    9:9:void handle(com.android.tools.r8.utils.dfs.DFSWorklistItem):45:45 -> a
+    10:10:boolean com.android.tools.r8.utils.dfs.DFSWorklistItem.isFullyVisited():0:0 -> a
+    10:10:void handle(com.android.tools.r8.utils.dfs.DFSWorklistItem):45 -> a
+    11:11:void handle(com.android.tools.r8.utils.dfs.DFSWorklistItem):45:45 -> a
+    12:12:java.lang.Object com.android.tools.r8.utils.dfs.DFSWorklistItem.getValue():16:16 -> a
+    12:12:void handle(com.android.tools.r8.utils.dfs.DFSWorklistItem):46 -> a
+    13:16:void com.android.tools.r8.utils.dfs.DFSStack.pop(java.lang.Object):51:54 -> a
+    13:16:void handle(com.android.tools.r8.utils.dfs.DFSWorklistItem):46 -> a
+    1:5:java.util.Deque getCycleStartingAt(java.lang.Object):32:36 -> b
+    6:8:void com.android.tools.r8.utils.dfs.DFSStack.recoverStack(java.util.Deque):64:66 -> b
+    6:8:java.util.Deque getCycleStartingAt(java.lang.Object):37 -> b
+com.android.tools.r8.utils.dfs.DFSWorklistItem -> com.android.tools.r8.internal.be:
+    java.lang.Object value -> a
+    1:2:void <init>(java.lang.Object):11:12 -> <init>
+    com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem asNewlyVisited() -> a
+    1:1:java.lang.Object getValue():16:16 -> b
+com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem -> com.android.tools.r8.internal.Zd:
+    1:1:void <init>(java.lang.Object):55:55 -> <init>
+com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem -> com.android.tools.r8.internal.ae:
+    1:1:void <init>(java.lang.Object):34:34 -> <init>
+    com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem asNewlyVisited() -> a
+    1:1:com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem toFullyVisited():48:48 -> c
+    2:2:java.lang.Object com.android.tools.r8.utils.dfs.DFSWorklistItem.getValue():16:16 -> c
+    2:2:com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem toFullyVisited():48 -> c
+    3:3:com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem toFullyVisited():48:48 -> c
+com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.dc:
     1:1:void <init>():18:18 -> <init>
     int visit(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping) -> a
     int visitBool(boolean,boolean) -> a
@@ -121438,7 +120337,7 @@
     1:1:int visitItemCollection(java.util.Collection,java.util.Collection):40:40 -> a
     2:2:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):48:48 -> a
     3:3:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):52:52 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorBase -> com.android.tools.r8.internal.Bc:
+com.android.tools.r8.utils.structural.CompareToVisitorBase -> com.android.tools.r8.internal.fc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -121459,8 +120358,7 @@
     16:16:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):79 -> a
     17:21:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):80:84 -> a
     22:24:int visit(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):97:99 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorBase$1 -> com.android.tools.r8.internal.zc:
-com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.Ac:
+com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.ec:
     com.android.tools.r8.utils.structural.CompareToVisitorBase parent -> a
     java.lang.Object item1 -> b
     boolean $assertionsDisabled -> e
@@ -121530,7 +120428,7 @@
     12:12:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):102 -> i
     13:13:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):186:186 -> i
     13:13:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):102 -> i
-com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens -> com.android.tools.r8.internal.Cc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens -> com.android.tools.r8.internal.gc:
     com.android.tools.r8.naming.NamingLens namingLens -> b
     1:2:void <init>(com.android.tools.r8.naming.NamingLens):29:30 -> <init>
     1:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):38:41 -> a
@@ -121552,40 +120450,40 @@
     15:15:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
     15:15:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):69 -> a
     16:16:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):73:73 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.Dc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.hc:
     java.util.function.ToIntFunction stringTable -> c
     1:2:void <init>(com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction):16:17 -> <init>
     1:1:int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):25:25 -> a
     2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
     2:2:int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):25 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.Ec:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.ic:
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:2:void <init>(com.android.tools.r8.utils.structural.RepresentativeMap):26:27 -> <init>
     1:3:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):35:37 -> a
     4:4:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
     4:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):37 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.Fc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.jc:
     java.util.function.ToIntFunction typeTable -> d
     1:2:void <init>(com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction,java.util.function.ToIntFunction):19:20 -> <init>
     1:1:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):28:28 -> a
     2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
     2:2:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):28 -> a
-com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.Te:
+com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.ye:
     com.android.tools.r8.graph.DexType lambda$run$1(com.android.tools.r8.graph.DexType) -> a
     1:1:int run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):21:21 -> a
     2:3:int com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence.run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):20:21 -> a
     2:3:int run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):21 -> a
-com.android.tools.r8.utils.structural.DefaultHashingVisitor -> com.android.tools.r8.internal.We:
+com.android.tools.r8.utils.structural.DefaultHashingVisitor -> com.android.tools.r8.internal.Ae:
     com.android.tools.r8.graph.DexType lambda$run$1(com.android.tools.r8.graph.DexType) -> a
     1:1:void run(java.lang.Object,com.android.tools.r8.utils.structural.HasherWrapper,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):21:21 -> a
-com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.Xi:
+com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.Gi:
     1:1:void <clinit>():6:6 -> <clinit>
     boolean isEqualTo(java.lang.Object) -> a
     1:8:boolean equalsImpl(com.android.tools.r8.utils.structural.Equatable,java.lang.Object):47:54 -> a
-com.android.tools.r8.utils.structural.Equatable$1 -> com.android.tools.r8.internal.Wi:
+com.android.tools.r8.utils.structural.Equatable$1 -> com.android.tools.r8.internal.Fi:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
-com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.Fm:
+com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.im:
     int $r8$clinit -> d
     java.lang.Object item -> a
     int hashCode -> b
@@ -121614,7 +120512,7 @@
     3:5:com.android.tools.r8.utils.structural.StructuralSpecification withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):25 -> b
     1:1:com.android.tools.r8.utils.structural.HashCodeVisitor com.android.tools.r8.utils.structural.HashCodeVisitor.withShortArray(java.util.function.Function):89:89 -> i
     1:1:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):25 -> i
-com.android.tools.r8.utils.structural.HasherWrapper -> com.android.tools.r8.internal.Lm:
+com.android.tools.r8.utils.structural.HasherWrapper -> com.android.tools.r8.internal.om:
     java.lang.Object hash() -> a
     void putBoolean(boolean) -> a
     void putBytes(byte[]) -> a
@@ -121624,7 +120522,7 @@
     void putLong(long) -> a
     java.lang.String hashCodeAsString() -> b
     1:1:com.android.tools.r8.utils.structural.HasherWrapper sha256Hasher():33:33 -> c
-com.android.tools.r8.utils.structural.HasherWrapper$HasherWrapped -> com.android.tools.r8.internal.Km:
+com.android.tools.r8.utils.structural.HasherWrapper$HasherWrapped -> com.android.tools.r8.internal.nm:
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.hash.Hasher):44:45 -> <init>
     1:1:void putBoolean(boolean):50:50 -> a
@@ -121635,7 +120533,7 @@
     6:6:void putBytes(byte[]):75:75 -> a
     7:7:java.lang.Object hash():81:81 -> a
     1:1:java.lang.String hashCodeAsString():86:86 -> b
-com.android.tools.r8.utils.structural.HashingVisitor -> com.android.tools.r8.internal.Pm:
+com.android.tools.r8.utils.structural.HashingVisitor -> com.android.tools.r8.internal.sm:
     1:1:void <init>():16:16 -> <init>
     void visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping) -> a
     void visitBool(boolean) -> a
@@ -121650,7 +120548,7 @@
     2:2:void visitDexField(com.android.tools.r8.graph.DexField):44:44 -> a
     3:3:void visitDexMethod(com.android.tools.r8.graph.DexMethod):48:48 -> a
     4:4:void visitDexReference(com.android.tools.r8.graph.DexReference):52:52 -> a
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.Sm:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.um:
     com.android.tools.r8.utils.structural.HasherWrapper hash -> a
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:3:void <init>(com.android.tools.r8.utils.structural.HasherWrapper,com.android.tools.r8.utils.structural.RepresentativeMap):34:36 -> <init>
@@ -121664,8 +120562,7 @@
     8:8:void visitDexType(com.android.tools.r8.graph.DexType):71:71 -> a
     9:9:void visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):76:76 -> a
     10:11:void visitItemIterator(java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):81:82 -> a
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$1 -> com.android.tools.r8.internal.Qm:
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.Rm:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.tm:
     java.lang.Object item -> b
     com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence parent -> a
     boolean $assertionsDisabled -> c
@@ -121691,7 +120588,7 @@
     5:5:com.android.tools.r8.utils.structural.StructuralSpecification withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):86 -> b
     1:3:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withShortArray(java.util.function.Function):143:145 -> i
     1:3:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):86 -> i
-com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.nL:
+com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.jK:
     1:1:void <clinit>():7:7 -> <clinit>
     1:2:boolean isEqualTo(java.lang.Object):16:17 -> a
     3:3:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
@@ -121702,13 +120599,13 @@
     2:2:boolean isLessThan(java.lang.Object):49:49 -> c
     1:1:boolean isGreaterThanOrEqualTo(java.lang.Object):61:61 -> d
     1:1:boolean isLessThanOrEqualTo(java.lang.Object):53:53 -> e
-com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.mL:
+com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.iK:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
-com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.vT:
+com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.XR:
     com.android.tools.r8.graph.DexType getRepresentative(com.android.tools.r8.graph.DexType) -> a
-com.android.tools.r8.utils.structural.StructuralAcceptor -> com.android.tools.r8.internal.nY:
-com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.pY:
+com.android.tools.r8.utils.structural.StructuralAcceptor -> com.android.tools.r8.internal.FW:
+com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.HW:
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:int compareTo(com.android.tools.r8.utils.structural.StructuralItem):28:28 -> a
     2:2:int compareWithTypeEquivalenceTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.RepresentativeMap):39:39 -> a
@@ -121720,13 +120617,13 @@
     8:8:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):76:76 -> a
     1:1:int compareTo(java.lang.Object):7:7 -> compareTo
     com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping() -> n
-com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.oY:
+com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.GW:
     int acceptCompareTo(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor) -> a
-com.android.tools.r8.utils.structural.StructuralItem$HashingAccept -> com.android.tools.r8.internal.pY$a:
+com.android.tools.r8.utils.structural.StructuralItem$HashingAccept -> com.android.tools.r8.internal.HW$a:
     void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor) -> a
-com.android.tools.r8.utils.structural.StructuralMapping -> com.android.tools.r8.internal.qY:
+com.android.tools.r8.utils.structural.StructuralMapping -> com.android.tools.r8.internal.IW:
     void apply(com.android.tools.r8.utils.structural.StructuralSpecification) -> a
-com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.rY:
+com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.JW:
     1:1:void <init>():18:18 -> <init>
     boolean lambda$withCustomItem$0(java.lang.Object) -> a
     com.android.tools.r8.utils.structural.StructuralSpecification self() -> a
@@ -121756,21 +120653,26 @@
     1:1:com.android.tools.r8.utils.structural.StructuralSpecification withItemIterator(java.util.function.Function):83:83 -> g
     1:1:com.android.tools.r8.utils.structural.StructuralSpecification withNullableItem(java.util.function.Function):73:73 -> h
     com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function) -> i
-com.android.tools.r8.verticalclassmerging.EmptyInterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.Sh:
+com.android.tools.r8.verticalclassmerging.EmptyInterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.Ch:
     1:1:void <init>():16:16 -> <init>
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
-    void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void processWorklist() -> a
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.bu:
-    1:1:void <init>():39:39 -> <init>
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.vt:
+    1:1:void <init>():40:40 -> <init>
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
-    void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void processWorklist() -> a
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl -> com.android.tools.r8.internal.du:
+    1:2:com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):47:48 -> a
+    3:3:boolean com.android.tools.r8.graph.GraphLens.isVerticalClassMergerLens():0:0 -> a
+    3:3:com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):51 -> a
+    4:6:com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):52:54 -> a
+    7:7:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):48:48 -> a
+    8:8:boolean com.android.tools.r8.graph.GraphLens.isVerticalClassMergerLens():0:0 -> a
+    8:8:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):48 -> a
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl -> com.android.tools.r8.internal.xt:
     java.util.Map worklist -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.IRCode code -> b
@@ -121781,7 +120683,6 @@
     1:10:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):58:67 -> a
     11:11:int com.android.tools.r8.graph.DexMethod.getNumberOfArguments(boolean):82:82 -> a
     11:11:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):67 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:17:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):74:79 -> a
     18:18:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
     18:18:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):80 -> a
@@ -121789,53 +120690,48 @@
     21:23:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):92:94 -> a
     24:24:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
     24:24:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):94 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:28:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):95:98 -> a
     29:29:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
     29:29:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):97 -> a
     30:31:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):99:100 -> a
-    32:35:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):111:114 -> a
-    36:36:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
-    36:36:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):115 -> a
-    37:38:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):116:117 -> a
-    39:41:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):128:130 -> a
-    42:42:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
-    42:42:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):130 -> a
-    43:46:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):131:134 -> a
-    47:47:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):132:132 -> a
-    48:71:void processWorklist():142:165 -> a
-    72:76:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):192:196 -> a
-    72:76:void processWorklist():167 -> a
-    77:77:com.android.tools.r8.ir.code.CheckCast$Builder com.android.tools.r8.ir.code.CheckCast.builder():50:50 -> a
-    77:77:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):196 -> a
-    77:77:void processWorklist():167 -> a
-    78:80:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):197:199 -> a
-    78:80:void processWorklist():167 -> a
-    81:81:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    81:81:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199 -> a
-    81:81:void processWorklist():167 -> a
-    82:82:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    82:82:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    82:82:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199 -> a
-    82:82:void processWorklist():167 -> a
-    83:98:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199:214 -> a
-    83:98:void processWorklist():167 -> a
-    99:101:void addWorklistItem(com.android.tools.r8.ir.code.Instruction,int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):180:182 -> a
-    102:112:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):241:251 -> a
-    113:117:boolean com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.isOperandRewrittenWithLens(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,boolean):223:227 -> a
-    113:117:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):256 -> a
-    118:122:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):257:261 -> a
-    123:123:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    123:123:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):261 -> a
-    124:124:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    124:124:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    124:124:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):261 -> a
-    125:125:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):263:263 -> a
-    126:126:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):262:262 -> a
-    127:127:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):252:252 -> a
-    128:128:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):247:247 -> a
-    129:129:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):242:242 -> a
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl$WorklistItem -> com.android.tools.r8.internal.cu:
+    32:34:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):128:130 -> a
+    35:35:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
+    35:35:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):130 -> a
+    36:39:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):131:134 -> a
+    40:40:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):132:132 -> a
+    41:64:void processWorklist():142:165 -> a
+    65:69:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):192:196 -> a
+    65:69:void processWorklist():167 -> a
+    70:70:com.android.tools.r8.ir.code.CheckCast$Builder com.android.tools.r8.ir.code.CheckCast.builder():50:50 -> a
+    70:70:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):196 -> a
+    70:70:void processWorklist():167 -> a
+    71:73:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):197:199 -> a
+    71:73:void processWorklist():167 -> a
+    74:74:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    74:74:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199 -> a
+    74:74:void processWorklist():167 -> a
+    75:75:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    75:75:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    75:75:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199 -> a
+    75:75:void processWorklist():167 -> a
+    76:91:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199:214 -> a
+    76:91:void processWorklist():167 -> a
+    92:94:void addWorklistItem(com.android.tools.r8.ir.code.Instruction,int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):180:182 -> a
+    95:105:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):241:251 -> a
+    106:110:boolean com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.isOperandRewrittenWithLens(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,boolean):223:227 -> a
+    106:110:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):256 -> a
+    111:115:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):257:261 -> a
+    116:116:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    116:116:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):261 -> a
+    117:117:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    117:117:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    117:117:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):261 -> a
+    118:118:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):263:263 -> a
+    119:119:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):262:262 -> a
+    120:120:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):252:252 -> a
+    121:121:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):247:247 -> a
+    122:122:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):242:242 -> a
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl$WorklistItem -> com.android.tools.r8.internal.wt:
     com.android.tools.r8.graph.DexType rewrittenType -> c
     com.android.tools.r8.graph.DexType originalType -> b
     int operandIndex -> a